Skip to content

CLN: require td64 in TimeDeltaBlock #37018

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.

Sign up for GitHub

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 2 commits into from
Oct 10, 2020
Merged

CLN: require td64 in TimeDeltaBlock #37018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00e5f17
CLN: require td64 in TimedeltaBlock
jbrockmendel Oct 10, 2020
bae5a1c
Merge branch 'master' of https://github.com/pandas-dev/pandas into cl…
jbrockmendel Oct 10, 2020
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
6 changes: 5 additions & 1 deletion pandas/core/internals/blocks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2377,7 +2377,11 @@ class TimeDeltaBlock(DatetimeLikeBlockMixin, IntBlock):

def _maybe_coerce_values(self, values):
if values.dtype != TD64NS_DTYPE:
# e.g. non-nano or int64
# non-nano we will convert to nano
if values.dtype.kind != "m":
# caller is responsible for ensuring timedelta64 dtype
raise TypeError(values.dtype) # pragma: no cover

values = TimedeltaArray._from_sequence(values)._data
if isinstance(values, TimedeltaArray):
values = values._data
Expand Down
6 changes: 3 additions & 3 deletions pandas/core/missing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,9 +573,9 @@ def interpolate_2d(
if ndim == 1:
result = result[0]

if orig_values.dtype.kind == "M":
# convert float back to datetime64
result = result.astype(orig_values.dtype)
if orig_values.dtype.kind in ["m", "M"]:
# convert float back to datetime64/timedelta64
result = result.view(orig_values.dtype)

return result

Expand Down