-
-
Notifications
You must be signed in to change notification settings - Fork 18.5k
BUG: datetime64 - Timestamp incorrectly raising TypeError #28286
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
4 commits
Select commit
Hold shift + click to select a range
80e86a6
BUG: datetime64 - Timestamp incorrectly raising TypeErrro
jbrockmendel 00b46d7
update GH ref
jbrockmendel 0cf9d24
update test for tzaware case
jbrockmendel 77dea2e
Merge branch 'master' of https://github.com/pandas-dev/pandas into dt…
jbrockmendel 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,6 +66,20 @@ def test_delta_preserve_nanos(self): | |
result = val + timedelta(1) | ||
assert result.nanosecond == val.nanosecond | ||
|
||
def test_rsub_dtscalars(self, tz_naive_fixture): | ||
# In particular, check that datetime64 - Timestamp works GH#28286 | ||
td = Timedelta(1235345642000) | ||
ts = Timestamp.now(tz_naive_fixture) | ||
other = ts + td | ||
|
||
assert other - ts == td | ||
assert other.to_pydatetime() - ts == td | ||
if tz_naive_fixture is None: | ||
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. What should happen if this is not None? Should there be a test for this? 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. should raise bc of tzawareness compat, will update test to include that |
||
assert other.to_datetime64() - ts == td | ||
else: | ||
with pytest.raises(TypeError, match="subtraction must have"): | ||
other.to_datetime64() - ts | ||
|
||
def test_timestamp_sub_datetime(self): | ||
dt = datetime(2013, 10, 12) | ||
ts = Timestamp(datetime(2013, 10, 13)) | ||
|
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.
Is anything above this line not tested elsewhere? Just was a little counter intuitive to read as I thought this PR was only about datetime64 obects
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.
trying to follow the pattern in these tests of testing all datetime-like scalars in the same place
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.
Makes sense