BUG: Fix Timestamp('now') and Timestamp.now unit inconsistency
#56281
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
mroeschke
requested changes
Dec 1, 2023
pandas/_libs/tslibs/conversion.pyx
Outdated
| @@ -646,7 +646,7 @@ cdef _TSObject convert_str_to_tsobject(str ts, tzinfo tz, | |||
| reso = get_supported_reso(out_bestunit) | |||
| return convert_datetime_to_tsobject(dt, tz, nanos=nanos, reso=reso) | |||
|
|
|||
| return convert_datetime_to_tsobject(dt, tz) | |||
| return convert_datetime_to_tsobject(dt, tz, nanos=0, reso=NPY_FR_us) | |||
There was a problem hiding this comment.
This general case probably cannot be hardcoded
There was a problem hiding this comment.
Looks like the only cases left to handle here are 'now' and 'today', all other cases have returned.
I think we could combine these two cases and then return, to make the code more clear.
pandas/pandas/_libs/tslibs/conversion.pyx
Lines 597 to 605 in d6fdbee
mroeschke
reviewed
Dec 4, 2023
mroeschke
reviewed
Dec 4, 2023
| @@ -464,6 +464,20 @@ def test_constructor_str_infer_reso(self): | |||
| ts = Timestamp("2020-01-01 00+00:00") | |||
| assert ts.unit == "s" | |||
|
|
|||
| def test_now_today_unit(self): | |||
| # GH#55879 | |||
| ts_now_from_method = Timestamp.now() | |||
There was a problem hiding this comment.
Can you use pytest.mark.parametrize?
mroeschke
reviewed
Dec 4, 2023
mroeschke
added
the
Non-Nano
Co-authored-by: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com>
jbrockmendel
reviewed
Dec 6, 2023
pandas/_libs/tslibs/conversion.pyx
Outdated
| @@ -594,15 +594,12 @@ cdef _TSObject convert_str_to_tsobject(str ts, tzinfo tz, | |||
| obj.value = NPY_NAT | |||
| obj.tzinfo = tz | |||
| return obj | |||
| elif ts == "now": | |||
| elif ts in ("now", "today"): | |||
There was a problem hiding this comment.
i think ATM we don't use a tuple here for perf reasons. unless something has changed, cython constructs a tuple object
There was a problem hiding this comment.
I see. Changed back in the new commit.
mroeschke
approved these changes
Dec 7, 2023
|
Thanks @yuanx749 |
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.
This fix make
Timestamp('now')andTimestamp('today')return a Timestamp with unit 'us', the same asTimestamp.now()andTimestamp.today().doc/source/whatsnew/vX.X.X.rstfile if fixing a bug or adding a new feature.