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.

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

Jump to bottom

REF: avoid use of to_perioddelta #34539

Merged
merged 5 commits into from
Jun 3, 2020
Merged

REF: avoid use of to_perioddelta #34539

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
01943cd
REF: return ndarray from to_perioddelta; use it less
jbrockmendel Jun 2, 2020
a434429
reorder import
jbrockmendel Jun 2, 2020
7208426
lint fixup
jbrockmendel Jun 2, 2020
877e99a
Merge branch 'master' of https://github.com/pandas-dev/pandas into re…
jbrockmendel Jun 3, 2020
17edf6e
partial revert
jbrockmendel Jun 3, 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
25 changes: 12 additions & 13 deletions pandas/_libs/tslibs/offsets.pyx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ from pandas._libs.tslibs.base cimport ABCTimestamp
from pandas._libs.tslibs.ccalendar import (
MONTH_ALIASES, MONTH_TO_CAL_NUM, weekday_to_int, int_to_weekday,
)
from pandas._libs.tslibs.ccalendar cimport get_days_in_month, dayofweek
from pandas._libs.tslibs.ccalendar cimport DAY_NANOS, get_days_in_month, dayofweek
from pandas._libs.tslibs.conversion cimport (
convert_datetime_to_tsobject,
localize_pydatetime,
Expand Down Expand Up @@ -1067,11 +1067,7 @@ cdef class RelativeDeltaOffset(BaseOffset):

weeks = kwds.get("weeks", 0) * self.n
if weeks:
# integer addition on PeriodIndex is deprecated,
# so we directly use _time_shift instead
asper = index.to_period("W")
shifted = asper._time_shift(weeks)
index = shifted.to_timestamp() + index.to_perioddelta("W")
index = index + timedelta(days=7 * weeks)

timedelta_kwds = {
k: v
Expand Down Expand Up @@ -1383,7 +1379,9 @@ cdef class BusinessDay(BusinessMixin):

@apply_index_wraps
def apply_index(self, dtindex):
time = dtindex.to_perioddelta("D")
i8other = dtindex.asi8
time = (i8other % DAY_NANOS).view("timedelta64[ns]")

# to_period rolls forward to next BDay; track and
# reduce n where it does when rolling forward
asper = dtindex.to_period("B")
Expand Down Expand Up @@ -2276,6 +2274,7 @@ cdef class SemiMonthOffset(SingleConstructorOffset):
from pandas import Timedelta

dti = dtindex
i8other = dtindex.asi8
days_from_start = dtindex.to_perioddelta("M").asi8
delta = Timedelta(days=self.day_of_month - 1).value

Expand All @@ -2289,7 +2288,7 @@ cdef class SemiMonthOffset(SingleConstructorOffset):
roll = self._get_roll(dtindex, before_day_of_month, after_day_of_month)

# isolate the time since it will be striped away one the next line
time = dtindex.to_perioddelta("D")
time = (i8other % DAY_NANOS).view("timedelta64[ns]")

# apply the correct number of months

Expand Down Expand Up @@ -2506,10 +2505,9 @@ cdef class Week(SingleConstructorOffset):
if self.weekday is None:
# integer addition on PeriodIndex is deprecated,
# so we use _time_shift directly
asper = dtindex.to_period("W")

shifted = asper._time_shift(self.n)
return shifted.to_timestamp() + dtindex.to_perioddelta("W")
td = timedelta(days=7 * self.n)
td64 = np.timedelta64(td, "ns")
return dtindex + td64
else:
return self._end_apply_index(dtindex)

Expand All @@ -2529,7 +2527,8 @@ cdef class Week(SingleConstructorOffset):
from pandas import Timedelta
from .frequencies import get_freq_code # TODO: avoid circular import

off = dtindex.to_perioddelta("D")
i8other = dtindex.asi8
off = (i8other % DAY_NANOS).view("timedelta64")

base, mult = get_freq_code(self.freqstr)
base_period = dtindex.to_period(base)
Expand Down