Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions doc/source/whatsnew/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,10 @@ Datetimelike
- Bug in :meth:`to_datetime` reports incorrect index in case of any failure scenario. (:issue:`58298`)
- Bug in :meth:`to_datetime` with ``format="ISO8601"`` and ``utc=True`` where naive timestamps incorrectly inherited timezone offset from previous timestamps in a series. (:issue:`61389`)
- Bug in :meth:`to_datetime` wrongly converts when ``arg`` is a ``np.datetime64`` object with unit of ``ps``. (:issue:`60341`)
- Bug in subtracting a :class:`Timestamp` from a :class:`DatetimeIndex` with
Copy link
Member

Choose a reason for hiding this comment

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

the note isn't necessary bc the bug is not present in a released version

``freq="D"`` dropping the frequency and causing subsequent
:meth:`TimedeltaIndex.shift` calls to raise ``NullFrequencyError``
(:issue:`62094`)
- Bug in constructing arrays with :class:`ArrowDtype` with ``timestamp`` type incorrectly allowing ``Decimal("NaN")`` (:issue:`61773`)
- Bug in constructing arrays with a timezone-aware :class:`ArrowDtype` from timezone-naive datetime objects incorrectly treating those as UTC times instead of wall times like :class:`DatetimeTZDtype` (:issue:`61775`)
- Bug in setting scalar values with mismatched resolution into arrays with non-nanosecond ``datetime64``, ``timedelta64`` or :class:`DatetimeTZDtype` incorrectly truncating those scalars (:issue:`56410`)
Expand Down
12 changes: 12 additions & 0 deletions pandas/core/arrays/datetimelike.py
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,18 @@ def _get_arithmetic_result_freq(self, other) -> BaseOffset | None:
# e.g. TestTimedelta64ArithmeticUnsorted::test_timedelta
# Day is unambiguously 24h
return self.freq
elif (
lib.is_np_dtype(self.dtype, "M")
and isinstance(self.freq, Day)
and isinstance(other, Timestamp)
):
self = cast("DatetimeArray", self)
if (self.tz is None or timezones.is_utc(self.tz)) and (
Copy link
Member

Choose a reason for hiding this comment

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

self.tz is None is implied by lib.is_np_dtype(self.dtype, "M") check above

other.tz is None or timezones.is_utc(other.tz)
Copy link
Member

Choose a reason for hiding this comment

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

other.tz will always be None here

):
# e.g. issue gh-62094: subtracting a Timestamp from a DTI
# with Day freq retains that freq
return self.freq

return None

Expand Down
7 changes: 7 additions & 0 deletions pandas/tests/indexes/timedeltas/methods/test_shift.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,10 @@ def test_shift_no_freq(self):
tdi = TimedeltaIndex(["1 days 01:00:00", "2 days 01:00:00"], freq=None)
with pytest.raises(NullFrequencyError, match="Cannot shift with no freq"):
tdi.shift(2)

def test_shift_after_dti_sub_timestamp(self):
Copy link
Member

Choose a reason for hiding this comment

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

instead of testing this, test the subtraction op directly in tests.indexes.datetimes.test_arithmetic

dti = pd.date_range("1/1/2021", "1/5/2021")
tdi = dti - pd.Timestamp("1/3/2019")
result = tdi.shift(1)
expected = tdi + pd.Timedelta(days=1)
tm.assert_index_equal(result, expected)
Loading