Skip to content
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

Making to_datetime('today') and Timestamp('today') consistent #19937

Merged
merged 6 commits into from
Mar 1, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.23.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,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`)
- ``Categorical.fillna`` now validates its ``value`` and ``method`` keyword arguments. It now raises when both or none are specified, matching the behavior of :meth:`Series.fillna` (:issue:`19682`)
- Making `to_datetime('today')` and `Timestamp('today')` consistent with one another (:issue:`19935`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

say pd.to_datetime('today') is now consistent with pd.Timestamp('today'), this will return the local datetime.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also add that pd.to_datetime previously returned a .normalized() datetime value.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, added that

- :func:`Series.str.replace` now takes an optional `regex` keyword which, when set to ``False``, uses literal string replacement rather than regex replacement (:issue:`16808`)

.. _whatsnew_0230.deprecations:
Expand Down
4 changes: 2 additions & 2 deletions pandas/_libs/tslib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -755,8 +755,8 @@ cdef inline bint _parse_today_now(str val, int64_t* iresult):
iresult[0] = Timestamp.utcnow().value
return True
elif val == 'today':
# Note: this is *not* the same as Timestamp('today')
iresult[0] = Timestamp.now().normalize().value
# Now this is consistent with Timestamp('today')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove the comment

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done 👍

iresult[0] = Timestamp.today().value
return True
return False

Expand Down
19 changes: 13 additions & 6 deletions pandas/tests/indexes/datetimes/test_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,27 +224,34 @@ def test_to_datetime_today(self):
# this both of these timezones _and_ UTC will all be in the same day,
# so this test will not detect the regression introduced in #18666.
with tm.set_timezone('Pacific/Auckland'): # 12-13 hours ahead of UTC
nptoday = np.datetime64('today').astype('datetime64[ns]')
nptoday = np.datetime64('today')\
.astype('datetime64[ns]').astype(np.int64)
pdtoday = pd.to_datetime('today')
pdtoday2 = pd.to_datetime(['today'])[0]

tstoday = pd.Timestamp('today')
tstoday2 = pd.Timestamp.today()

# These should all be equal with infinite perf; this gives
# a generous margin of 10 seconds
assert abs(pdtoday.value - nptoday.astype(np.int64)) < 1e10
assert abs(pdtoday2.value - nptoday.astype(np.int64)) < 1e10
assert abs(pdtoday.normalize().value - nptoday) < 1e10
assert abs(pdtoday2.normalize().value - nptoday) < 1e10
assert abs(pdtoday.value - tstoday.value) < 1e10
assert abs(pdtoday.value - tstoday2.value) < 1e10

assert pdtoday.tzinfo is None
assert pdtoday2.tzinfo is None

with tm.set_timezone('US/Samoa'): # 11 hours behind UTC
nptoday = np.datetime64('today').astype('datetime64[ns]')
nptoday = np.datetime64('today')\
.astype('datetime64[ns]').astype(np.int64)
pdtoday = pd.to_datetime('today')
pdtoday2 = pd.to_datetime(['today'])[0]

# These should all be equal with infinite perf; this gives
# a generous margin of 10 seconds
assert abs(pdtoday.value - nptoday.astype(np.int64)) < 1e10
assert abs(pdtoday2.value - nptoday.astype(np.int64)) < 1e10
assert abs(pdtoday.normalize().value - nptoday) < 1e10
assert abs(pdtoday2.normalize().value - nptoday) < 1e10

assert pdtoday.tzinfo is None
assert pdtoday2.tzinfo is None
Expand Down