Skip to content

Commit 2522339

Browse files
jbrockmendelPuneethaPai
authored andcommitted
CLN: remove get_base_alias (pandas-dev#34243)
1 parent 290988f commit 2522339

File tree

4 files changed

+16
-33
lines changed

4 files changed

+16
-33
lines changed

pandas/_libs/tslibs/frequencies.pxd

-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@ cdef dict attrname_to_abbrevs
33
cpdef str get_rule_month(object source, str default=*)
44

55
cpdef get_freq_code(freqstr)
6-
cpdef str get_base_alias(freqstr)
76
cpdef int get_to_timestamp_base(int base)
87
cpdef str get_freq_str(base, mult=*)

pandas/_libs/tslibs/frequencies.pyx

-15
Original file line numberDiff line numberDiff line change
@@ -298,21 +298,6 @@ cpdef str get_freq_str(base, mult=1):
298298
return str(mult) + code
299299

300300

301-
cpdef str get_base_alias(freqstr):
302-
"""
303-
Returns the base frequency alias, e.g., '5D' -> 'D'
304-
305-
Parameters
306-
----------
307-
freqstr : str
308-
309-
Returns
310-
-------
311-
base_alias : str
312-
"""
313-
return base_and_stride(freqstr)[0]
314-
315-
316301
cpdef int get_to_timestamp_base(int base):
317302
"""
318303
Return frequency code group used for base of to_timestamp against

pandas/core/arrays/period.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ def _addsub_int_array(
665665
res_values[self._isnan] = iNaT
666666
return type(self)(res_values, freq=self.freq)
667667

668-
def _add_offset(self, other):
668+
def _add_offset(self, other: DateOffset):
669669
assert not isinstance(other, Tick)
670670

671671
if other.base != self.freq.base:

pandas/plotting/_matplotlib/timeseries.py

+15-16
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
# TODO: Use the fact that axis can have units to simplify the process
22

33
import functools
4+
from typing import Optional
45

56
import numpy as np
67

78
from pandas._libs.tslibs.frequencies import (
89
FreqGroup,
9-
get_base_alias,
10+
base_and_stride,
1011
get_freq_code,
1112
is_subperiod,
1213
is_superperiod,
@@ -165,6 +166,16 @@ def _get_ax_freq(ax):
165166
return ax_freq
166167

167168

169+
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]
174+
175+
freq = frequencies.get_period_alias(freq)
176+
return freq
177+
178+
168179
def _get_freq(ax, series):
169180
# get frequency from data
170181
freq = getattr(series.index, "freq", None)
@@ -178,12 +189,7 @@ def _get_freq(ax, series):
178189
freq = ax_freq
179190

180191
# get the period frequency
181-
if isinstance(freq, DateOffset):
182-
freq = freq.rule_code
183-
else:
184-
freq = get_base_alias(freq)
185-
186-
freq = frequencies.get_period_alias(freq)
192+
freq = get_period_alias(freq)
187193
return freq, ax_freq
188194

189195

@@ -200,11 +206,7 @@ def _use_dynamic_x(ax, data):
200206
if freq is None:
201207
return False
202208

203-
if isinstance(freq, DateOffset):
204-
freq = freq.rule_code
205-
else:
206-
freq = get_base_alias(freq)
207-
freq = frequencies.get_period_alias(freq)
209+
freq = get_period_alias(freq)
208210

209211
if freq is None:
210212
return False
@@ -238,17 +240,14 @@ def _maybe_convert_index(ax, data):
238240

239241
if freq is None:
240242
freq = getattr(data.index, "inferred_freq", None)
241-
if isinstance(freq, DateOffset):
242-
freq = freq.rule_code
243243

244244
if freq is None:
245245
freq = _get_ax_freq(ax)
246246

247247
if freq is None:
248248
raise ValueError("Could not get frequency alias for plotting")
249249

250-
freq = get_base_alias(freq)
251-
freq = frequencies.get_period_alias(freq)
250+
freq = get_period_alias(freq)
252251

253252
if isinstance(data.index, ABCDatetimeIndex):
254253
data = data.tz_localize(None).to_period(freq=freq)

0 commit comments

Comments
 (0)