-
-
Notifications
You must be signed in to change notification settings - Fork 18.4k
BUG: Fix _binop for operators for serials which has more than one returns (divmod/rdivmod). #25588
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
db2c641
Fix _binop for operators which has more than one returns (divmod).
sighingnow 87d1636
Do __finalize__ in _construct_result and refactor previous solution.
sighingnow 81e87bc
Merge branch 'master' into fix-25557
sighingnow e15cf72
Revise the doc, refactor test case and remove the incorrect `if` cond…
sighingnow 5d40c93
Merge branch 'master' into fix-25557
sighingnow bce25c9
Merge remote-tracking branch 'origin/master' into fix-25557
sighingnow 3bde353
Fix.
sighingnow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -741,6 +741,21 @@ def test_op_duplicate_index(self): | |
expected = pd.Series([11, 12, np.nan], index=[1, 1, 2]) | ||
assert_series_equal(result, expected) | ||
|
||
def test_divmod(self): | ||
# GH25557 | ||
a = Series([1, 1, 1, np.nan], index=['a', 'b', 'c', 'd']) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add the GitHub issue number as a comment. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will do. |
||
b = Series([2, np.nan, 1, np.nan], index=['a', 'b', 'd', 'e']) | ||
|
||
result = a.divmod(b) | ||
expected = divmod(a, b) | ||
assert_series_equal(result[0], expected[0]) | ||
assert_series_equal(result[1], expected[1]) | ||
|
||
result = a.rdivmod(b) | ||
expected = divmod(b, a) | ||
assert_series_equal(result[0], expected[0]) | ||
assert_series_equal(result[1], expected[1]) | ||
|
||
|
||
class TestSeriesUnaryOps(object): | ||
# __neg__, __pos__, __inv__ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
you could just return on each statement
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Previous review comment suggested me to use
_construct_divmod_result
.