ENH: implement Timedelta.__mod__ and __divmod__ #19755
Conversation
jorisvandenbossche
changed the title
doc/source/whatsnew/v0.23.0.txt
Outdated
| @@ -571,6 +585,7 @@ Other API Changes | |||
| - Set operations (union, difference...) on :class:`IntervalIndex` with incompatible index types will now raise a ``TypeError`` rather than a ``ValueError`` (:issue:`19329`) | |||
| - :class:`DateOffset` objects render more simply, e.g. "<DateOffset: days=1>" instead of "<DateOffset: kwds={'days': 1}>" (:issue:`19403`) | |||
| - :func:`pandas.merge` provides a more informative error message when trying to merge on timezone-aware and timezone-naive columns (:issue:`15800`) | |||
| - :func:`Timedelta.__mod__`, :func:`Timedelta.__divmod__` now accept timedelta-like and numeric arguments instead of raising ``TypeError`` (:issue:`19365`) | |||
There was a problem hiding this comment.
This is the same as above? Isn't it enough to mention it once?
There was a problem hiding this comment.
This is an attempt to follow the instructions in #19365, some of which were unclear. I'm open to suggestions.
There was a problem hiding this comment.
My suggestion would be to just remove this one, but I don't know the reason for the previous instruction
There was a problem hiding this comment.
@JRBACK is there consensus on this suggestion?
There was a problem hiding this comment.
oh i guess I wasn't clear. if you make a sub-section then no reason to repeat things, so kill this entry as it dupes the sub-section.
| @@ -254,6 +254,186 @@ def test_rfloordiv(self): | |||
| with pytest.raises(TypeError): | |||
| ser // td | |||
|
|
|||
| def test_td_mod_timedeltalike(self): | |||
There was a problem hiding this comment.
Like test_rfloordiv above, I think you can leave out the _td_ in all test names (the class name already makes clear it is about Timedelta)
Codecov Report
@@ Coverage Diff @@
## master #19755 +/- ##
=======================================
Coverage 91.6% 91.6%
=======================================
Files 150 150
Lines 48864 48864
=======================================
Hits 44763 44763
Misses 4101 4101
Continue to review full report at Codecov.
|
| # divmod against a timedelta-like returns a pair (int, Timedelta) | ||
| divmod(datetime.timedelta(hours=2), pd.Timedelta(minutes=11)) | ||
|
|
||
| # divmod against a numeric returns a pair (Timedelta, Timedelta) |
doc/source/whatsnew/v0.23.0.txt
Outdated
| @@ -571,6 +585,7 @@ Other API Changes | |||
| - Set operations (union, difference...) on :class:`IntervalIndex` with incompatible index types will now raise a ``TypeError`` rather than a ``ValueError`` (:issue:`19329`) | |||
| - :class:`DateOffset` objects render more simply, e.g. "<DateOffset: days=1>" instead of "<DateOffset: kwds={'days': 1}>" (:issue:`19403`) | |||
| - :func:`pandas.merge` provides a more informative error message when trying to merge on timezone-aware and timezone-naive columns (:issue:`15800`) | |||
| - :func:`Timedelta.__mod__`, :func:`Timedelta.__divmod__` now accept timedelta-like and numeric arguments instead of raising ``TypeError`` (:issue:`19365`) | |||
There was a problem hiding this comment.
oh i guess I wasn't clear. if you make a sub-section then no reason to repeat things, so kill this entry as it dupes the sub-section.
| td = Timedelta(days=2, hours=6) | ||
|
|
||
| result = divmod(td, 53 * 3600 * 1e9) | ||
| assert result[0] == Timedelta(1, unit='ns') |
There was a problem hiding this comment.
slightly OT: we have test_nat.py so either should add this there, or have here, or maybe both.
|
lgtm ping on green. |
|
Ping |
|
thanks! |
This implements exclusively the
__mod__, __rmod__, __divmod__, __rdivmod__parts of #19365, does not implement any of the bugfixes or tests that got rolled into that PR. Several tests are xfailed for now, will be fixed after #19738. These tests will be rebased/moved to test_arithmetic after #19752.git diff upstream/master -u -- "*.py" | flake8 --diff