Skip to content

Commit 34959a2

Browse files
authored
CLN: remove ABCDateOffset (#33958)
1 parent a3477c7 commit 34959a2

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

pandas/core/dtypes/dtypes.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121

2222
from pandas._libs.interval import Interval
2323
from pandas._libs.tslibs import NaT, Period, Timestamp, timezones
24+
from pandas._libs.tslibs.offsets import BaseOffset
2425
from pandas._typing import DtypeObj, Ordered
2526

2627
from pandas.core.dtypes.base import ExtensionDtype
27-
from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCDateOffset, ABCIndexClass
28+
from pandas.core.dtypes.generic import ABCCategoricalIndex, ABCIndexClass
2829
from pandas.core.dtypes.inference import is_bool, is_list_like
2930

3031
if TYPE_CHECKING:
@@ -893,7 +894,7 @@ def __new__(cls, freq=None):
893894
u._freq = None
894895
return u
895896

896-
if not isinstance(freq, ABCDateOffset):
897+
if not isinstance(freq, BaseOffset):
897898
freq = cls._parse_dtype_strict(freq)
898899

899900
try:
@@ -935,7 +936,7 @@ def construct_from_string(cls, string: str_type) -> "PeriodDtype":
935936
if (
936937
isinstance(string, str)
937938
and (string.startswith("period[") or string.startswith("Period["))
938-
or isinstance(string, ABCDateOffset)
939+
or isinstance(string, BaseOffset)
939940
):
940941
# do not parse string like U as period[U]
941942
# avoid tuple to be regarded as freq

pandas/core/dtypes/generic.py

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ def _check(cls, inst) -> bool:
6363
"ABCTimedeltaArray", "_typ", ("timedeltaarray")
6464
)
6565
ABCPeriodArray = create_pandas_abc_type("ABCPeriodArray", "_typ", ("periodarray",))
66-
ABCDateOffset = create_pandas_abc_type("ABCDateOffset", "_typ", ("dateoffset",))
6766
ABCExtensionArray = create_pandas_abc_type(
6867
"ABCExtensionArray",
6968
"_typ",

pandas/core/window/rolling.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
)
2929
from pandas.core.dtypes.generic import (
3030
ABCDataFrame,
31-
ABCDateOffset,
3231
ABCDatetimeIndex,
3332
ABCPeriodIndex,
3433
ABCSeries,
@@ -57,6 +56,8 @@
5756
)
5857
from pandas.core.window.numba_ import generate_numba_apply_func
5958

59+
from pandas.tseries.offsets import DateOffset
60+
6061

6162
class _Window(PandasObject, ShallowMixin, SelectionMixin):
6263
_attributes: List[str] = [
@@ -1838,7 +1839,7 @@ def validate(self):
18381839

18391840
# we allow rolling on a datetimelike index
18401841
if (self.obj.empty or self.is_datetimelike) and isinstance(
1841-
self.window, (str, ABCDateOffset, timedelta)
1842+
self.window, (str, DateOffset, timedelta)
18421843
):
18431844

18441845
self._validate_monotonic()

pandas/tests/dtypes/test_generic.py

-4
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ def test_abc_types(self):
3838
assert isinstance(self.sparse_array, gt.ABCSparseArray)
3939
assert isinstance(self.categorical, gt.ABCCategorical)
4040

41-
assert isinstance(pd.DateOffset(), gt.ABCDateOffset)
42-
assert isinstance(pd.Period("2012", freq="A-DEC").freq, gt.ABCDateOffset)
43-
assert not isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCDateOffset)
44-
4541
assert isinstance(self.datetime_array, gt.ABCDatetimeArray)
4642
assert not isinstance(self.datetime_index, gt.ABCDatetimeArray)
4743

0 commit comments

Comments
 (0)