Skip to content

Commit 7630f38

Browse files
authored
CLN: remove usages of base_and_stride (#34700)
1 parent a9cb17a commit 7630f38

File tree

3 files changed

+6
-12
lines changed

3 files changed

+6
-12
lines changed

pandas/_libs/tslibs/offsets.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3491,7 +3491,7 @@ INVALID_FREQ_ERR_MSG = "Invalid frequency: {0}"
34913491
_offset_map = {}
34923492

34933493

3494-
cpdef base_and_stride(str freqstr):
3494+
cdef _base_and_stride(str freqstr):
34953495
"""
34963496
Return base freq and stride info from string representation
34973497
@@ -3502,7 +3502,7 @@ cpdef base_and_stride(str freqstr):
35023502
35033503
Examples
35043504
--------
3505-
_freq_and_stride('5Min') -> 'Min', 5
3505+
_base_and_stride('5Min') -> 'Min', 5
35063506
"""
35073507
groups = opattern.match(freqstr)
35083508

@@ -3606,7 +3606,7 @@ cpdef to_offset(freq):
36063606
stride = freq[1]
36073607
if isinstance(stride, str):
36083608
name, stride = stride, name
3609-
name, _ = base_and_stride(name)
3609+
name, _ = _base_and_stride(name)
36103610
delta = _get_offset(name) * stride
36113611

36123612
elif isinstance(freq, timedelta):

pandas/core/arrays/datetimes.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
conversion,
1313
fields,
1414
iNaT,
15-
offsets as liboffsets,
1615
resolution as libresolution,
1716
timezones,
1817
to_offset,
@@ -1106,8 +1105,7 @@ def to_period(self, freq=None):
11061105

11071106
# https://github.com/pandas-dev/pandas/issues/33358
11081107
if res is None:
1109-
base, stride = liboffsets.base_and_stride(freq)
1110-
res = f"{stride}{base}"
1108+
res = freq
11111109

11121110
freq = res
11131111

pandas/plotting/_matplotlib/timeseries.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
from pandas._libs.tslibs import Period, to_offset
99
from pandas._libs.tslibs.frequencies import FreqGroup
10-
from pandas._libs.tslibs.offsets import base_and_stride
1110
from pandas._typing import FrameOrSeriesUnion
1211

1312
from pandas.core.dtypes.generic import (
@@ -167,12 +166,9 @@ def _get_ax_freq(ax):
167166

168167

169168
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
174170

175-
freq = get_period_alias(freq)
171+
freq = get_period_alias(freqstr)
176172
return freq
177173

178174

0 commit comments

Comments
 (0)