BUG: fix timedelta floordiv with scalar float #44466
Merged
Conversation
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
jorisvandenbossche
added
Bug
Numeric Operations
| @@ -1987,6 +1987,20 @@ def test_td64arr_div_numeric_scalar(self, box_with_array, two): | |||
| with pytest.raises(TypeError, match="Cannot divide"): | |||
| two / tdser | |||
|
|
|||
| @pytest.mark.parametrize("two", [2, 2.0, np.array(2), np.array(2.0)]) | |||
| def test_td64arr_floordiv_numeric_scalar(self, box_with_array, two): | |||
There was a problem hiding this comment.
We have versions above of this test for multiplication and division, so adding one for floordiv as well
jreback
requested changes
Nov 15, 2021
pandas/core/arrays/timedeltas.py
Outdated
| @@ -635,7 +635,7 @@ def __rtruediv__(self, other): | |||
|
|
|||
| @unpack_zerodim_and_defer("__floordiv__") | |||
| def __floordiv__(self, other): | |||
|
|
|||
| # breakpoint() | |||
|
Hmm, so apparently it already passes on all numpy versions we test. OK, will clean-up then :) |
jreback
approved these changes
Nov 15, 2021
| @@ -651,8 +651,7 @@ def __floordiv__(self, other): | |||
|
|
|||
| # at this point we should only have numeric scalars; anything | |||
| # else will raise | |||
| result = self.asi8 // other | |||
| np.putmask(result, self._isnan, iNaT) | |||
| result = self._ndarray / other | |||
There was a problem hiding this comment.
why is this using div instead of floordiv?
There was a problem hiding this comment.
Because I was stupid .. :), and because the test I added (or any other test we already have) actually don't catch this because only use such data that it is the same for div or floordiv ..
jorisvandenbossche
added a commit
to jorisvandenbossche/pandas
that referenced
this pull request
Nov 15, 2021
jorisvandenbossche
added a commit
to jorisvandenbossche/pandas
that referenced
this pull request
Nov 15, 2021
jorisvandenbossche
added a commit
that referenced
this pull request
Nov 18, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Discovered while trying to fix test failures in #40482. Currently normal division with a float scalar works, but floordiv doesn't (returns garbage):
It's only the scalar case; dividing with eg float array already works:
I suppose the current code uses the workaround of
asi8and casting back to timedelta, because numpy didn't support floordiv in the past (didn't check which version started to implement this, will see what CI says)