cleanup order of operations kludges #19895
Merged
Conversation
This file contains 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
jreback
requested changes
Feb 25, 2018
pandas/core/indexes/datetimes.py
Outdated
| @@ -864,11 +864,18 @@ def _add_datelike(self, other): | |||
| def _sub_datelike(self, other): | |||
| # subtract a datetime from myself, yielding a TimedeltaIndex | |||
| from pandas import TimedeltaIndex | |||
|
|
|||
| if isinstance(other, np.ndarray): | |||
There was a problem hiding this comment.
why don't you do this in 873, and just always wrap it
pandas/core/indexes/timedeltas.py
Outdated
| @@ -416,9 +414,15 @@ def _evaluate_with_timedelta_like(self, other, op): | |||
| def _add_datelike(self, other): | |||
| # adding a timedeltaindex to a datetimelike | |||
| from pandas import Timestamp, DatetimeIndex | |||
| if isinstance(other, np.ndarray): | |||
| @@ -792,7 +792,7 @@ def test_addition_ops(self): | |||
| pytest.raises(ValueError, lambda: tdi[0:1] + dti) | |||
|
|
|||
| # random indexes | |||
| pytest.raises(TypeError, lambda: tdi + Int64Index([1, 2, 3])) | |||
There was a problem hiding this comment.
not sure if it counts as api change or bugfix. The error currently being raises is incorrect.
Codecov Report
@@ Coverage Diff @@
## master #19895 +/- ##
==========================================
- Coverage 91.67% 91.66% -0.01%
==========================================
Files 150 150
Lines 48936 48930 -6
==========================================
- Hits 44860 44853 -7
- Misses 4076 4077 +1
Continue to review full report at Codecov.
|
jreback
approved these changes
Feb 26, 2018
|
thanks! |
harisbal
pushed a commit
to harisbal/pandas
that referenced
this pull request
Feb 28, 2018
Merged
3 tasks
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.
DatetimeIndexOpsMixin has an unfortunate kludge where it checks if
selfis aTimedeltaIndexand if so dispatches to a reversed operation. This then makes subsequent checks less straightforward than they could/should be. This fixes that.This is in preparation for separating out DatetimeArray/TimedeltaArray/PeriodArray, so this uses formatting on error messages to be class-agnostic.