REGR: fixing Timestamp/Series subtraction, resolves #6648 #6657
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
|
this looks fine. can you do a quick perf check? |
|
Perf test is clean. |
| return datetime.__sub__(self, other) | ||
| if is_timedelta64_object(other) or is_integer_object(other) \ | ||
| or isinstance(other, timedelta) or hasattr(other, 'delta'): | ||
| neg_other = -other |
There was a problem hiding this comment.
instead of isinstance use is_timedelta_object
what has a delta attribute?
There was a problem hiding this comment.
actually the isinstance is ok
There was a problem hiding this comment.
Yeah, I am just trying to copy the instance checks already in the __add__ code.
jreback
added a commit
that referenced
this pull request
Mar 18, 2014
REGR: fixing Timestamp/Series subtraction, resolves #6648
|
thanks! |
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.
closes #6648.
Admittedly the conditional in
__sub__is a little gross now.I didn't add release notes as this is really just patching up a yet-to-be released item, but please let me know if I should.
Also, the test only runs on numpy >= 1.7, is that okay?