File tree Expand file tree Collapse file tree 3 files changed +6
-12
lines changed Expand file tree Collapse file tree 3 files changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -3491,7 +3491,7 @@ INVALID_FREQ_ERR_MSG = "Invalid frequency: {0}"
3491
3491
_offset_map = {}
3492
3492
3493
3493
3494
- cpdef base_and_stride (str freqstr):
3494
+ cdef _base_and_stride (str freqstr):
3495
3495
"""
3496
3496
Return base freq and stride info from string representation
3497
3497
@@ -3502,7 +3502,7 @@ cpdef base_and_stride(str freqstr):
3502
3502
3503
3503
Examples
3504
3504
--------
3505
- _freq_and_stride ('5Min') -> 'Min', 5
3505
+ _base_and_stride ('5Min') -> 'Min', 5
3506
3506
"""
3507
3507
groups = opattern.match(freqstr)
3508
3508
@@ -3606,7 +3606,7 @@ cpdef to_offset(freq):
3606
3606
stride = freq[1 ]
3607
3607
if isinstance (stride, str ):
3608
3608
name, stride = stride, name
3609
- name, _ = base_and_stride (name)
3609
+ name, _ = _base_and_stride (name)
3610
3610
delta = _get_offset(name) * stride
3611
3611
3612
3612
elif isinstance (freq, timedelta):
Original file line number Diff line number Diff line change 12
12
conversion ,
13
13
fields ,
14
14
iNaT ,
15
- offsets as liboffsets ,
16
15
resolution as libresolution ,
17
16
timezones ,
18
17
to_offset ,
@@ -1106,8 +1105,7 @@ def to_period(self, freq=None):
1106
1105
1107
1106
# https://github.com/pandas-dev/pandas/issues/33358
1108
1107
if res is None :
1109
- base , stride = liboffsets .base_and_stride (freq )
1110
- res = f"{ stride } { base } "
1108
+ res = freq
1111
1109
1112
1110
freq = res
1113
1111
Original file line number Diff line number Diff line change 7
7
8
8
from pandas ._libs .tslibs import Period , to_offset
9
9
from pandas ._libs .tslibs .frequencies import FreqGroup
10
- from pandas ._libs .tslibs .offsets import base_and_stride
11
10
from pandas ._typing import FrameOrSeriesUnion
12
11
13
12
from pandas .core .dtypes .generic import (
@@ -167,12 +166,9 @@ def _get_ax_freq(ax):
167
166
168
167
169
168
def _get_period_alias (freq ) -> Optional [str ]:
170
- if isinstance (freq , DateOffset ):
171
- freq = freq .rule_code
172
- else :
173
- freq = base_and_stride (freq )[0 ]
169
+ freqstr = to_offset (freq ).rule_code
174
170
175
- freq = get_period_alias (freq )
171
+ freq = get_period_alias (freqstr )
176
172
return freq
177
173
178
174
You can’t perform that action at this time.
0 commit comments