REF: De-duplicate pieces of datetimelike arithmetic #23166
Conversation
|
Hello @jbrockmendel! Thanks for submitting the PR.
|
| @@ -246,27 +246,6 @@ def _maybe_mask_results(self, result, fill_value=None, convert=None): | |||
| result[self._isnan] = fill_value | |||
| return result | |||
|
|
|||
| def _nat_new(self, box=True): | |||
There was a problem hiding this comment.
Only used once outside of tests; less verbose to do inline.
| raise TypeError("{cls} subtraction must have the same " | ||
| "timezones or no timezones" | ||
| .format(cls=type(self).__name__)) | ||
|
|
There was a problem hiding this comment.
The casting and timezone checking used to be done inside the calling function. Cleaner to do it here.
| new_values = self._add_delta_tdi(delta) | ||
| else: | ||
| new_values = self.astype('O') + delta |
| if isinstance(delta, (Tick, timedelta, np.timedelta64)): | ||
| new_values = self._add_delta_td(delta) | ||
| elif is_timedelta64_dtype(delta): | ||
| if not isinstance(delta, TimedeltaArrayMixin): | ||
| delta = TimedeltaArrayMixin(delta) |
There was a problem hiding this comment.
do this inside add_delta_dti
pandas/core/arrays/datetimes.py
Outdated
| if self.tz is not None and self.tz is not utc: | ||
| result = result.tz_convert(self.tz) | ||
| return result | ||
| return type(self)(new_values, tz=self.tz, freq='infer') |
There was a problem hiding this comment.
Is the more complicated construction above necessary for some reason? AFAICT these are equivalent.
| @@ -445,48 +442,6 @@ def _time_shift(self, n): | |||
| values[self._isnan] = iNaT | |||
| return self._shallow_copy(values=values) | |||
|
|
|||
| def _maybe_convert_timedelta(self, other): | |||
There was a problem hiding this comment.
Since #23031 this is no longer used by the Array class; moved back to the Index class.
git diff upstream/master -u -- "*.py" | flake8 --diff