Skip to content

Commit fc6ada5

Browse files
authored
CLN: unnecessary ABCClasses (#32891)
1 parent 00ae98d commit fc6ada5

File tree

5 files changed

+15
-16
lines changed

5 files changed

+15
-16
lines changed

pandas/core/arrays/interval.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
ABCDatetimeIndex,
3030
ABCExtensionArray,
3131
ABCIndexClass,
32-
ABCInterval,
3332
ABCIntervalIndex,
3433
ABCPeriodIndex,
3534
ABCSeries,
@@ -529,7 +528,7 @@ def __setitem__(self, key, value):
529528
value_left, value_right = value, value
530529

531530
# scalar interval
532-
elif is_interval_dtype(value) or isinstance(value, ABCInterval):
531+
elif is_interval_dtype(value) or isinstance(value, Interval):
533532
self._check_closed_matches(value, name="value")
534533
value_left, value_right = value.left, value.right
535534

@@ -642,7 +641,7 @@ def fillna(self, value=None, method=None, limit=None):
642641
if limit is not None:
643642
raise TypeError("limit is not supported for IntervalArray.")
644643

645-
if not isinstance(value, ABCInterval):
644+
if not isinstance(value, Interval):
646645
msg = (
647646
"'IntervalArray.fillna' only supports filling with a "
648647
f"scalar 'pandas.Interval'. Got a '{type(value).__name__}' instead."

pandas/core/dtypes/generic.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,11 @@ def _check(cls, inst) -> bool:
6363
"ABCTimedeltaArray", "_typ", ("timedeltaarray")
6464
)
6565
ABCPeriodArray = create_pandas_abc_type("ABCPeriodArray", "_typ", ("periodarray",))
66-
ABCPeriod = create_pandas_abc_type("ABCPeriod", "_typ", ("period",))
6766
ABCDateOffset = create_pandas_abc_type("ABCDateOffset", "_typ", ("dateoffset",))
68-
ABCInterval = create_pandas_abc_type("ABCInterval", "_typ", ("interval",))
6967
ABCExtensionArray = create_pandas_abc_type(
7068
"ABCExtensionArray",
7169
"_typ",
70+
# Note: IntervalArray and SparseArray are included bc they have _typ="extension"
7271
("extension", "categorical", "periodarray", "datetimearray", "timedeltaarray"),
7372
)
7473
ABCPandasArray = create_pandas_abc_type("ABCPandasArray", "_typ", ("npy_extension",))

pandas/tests/dtypes/test_generic.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,10 @@ def test_abc_types(self):
3737
assert isinstance(self.df, gt.ABCDataFrame)
3838
assert isinstance(self.sparse_array, gt.ABCSparseArray)
3939
assert isinstance(self.categorical, gt.ABCCategorical)
40-
assert isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCPeriod)
4140

4241
assert isinstance(pd.DateOffset(), gt.ABCDateOffset)
4342
assert isinstance(pd.Period("2012", freq="A-DEC").freq, gt.ABCDateOffset)
4443
assert not isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCDateOffset)
45-
assert isinstance(pd.Interval(0, 1.5), gt.ABCInterval)
46-
assert not isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCInterval)
4744

4845
assert isinstance(self.datetime_array, gt.ABCDatetimeArray)
4946
assert not isinstance(self.datetime_index, gt.ABCDatetimeArray)

pandas/tests/indexes/datetimes/test_ops.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
import numpy as np
55
import pytest
66

7-
from pandas.core.dtypes.generic import ABCDateOffset
8-
97
import pandas as pd
10-
from pandas import DatetimeIndex, Index, Series, Timestamp, bdate_range, date_range
8+
from pandas import (
9+
DateOffset,
10+
DatetimeIndex,
11+
Index,
12+
Series,
13+
Timestamp,
14+
bdate_range,
15+
date_range,
16+
)
1117
import pandas._testing as tm
1218

1319
from pandas.tseries.offsets import BDay, BMonthEnd, CDay, Day, Hour
@@ -394,7 +400,7 @@ def test_freq_setter(self, values, freq, tz):
394400
# can set to an offset, converting from string if necessary
395401
idx._data.freq = freq
396402
assert idx.freq == freq
397-
assert isinstance(idx.freq, ABCDateOffset)
403+
assert isinstance(idx.freq, DateOffset)
398404

399405
# can reset to None
400406
idx._data.freq = None

pandas/tests/indexes/timedeltas/test_ops.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import numpy as np
44
import pytest
55

6-
from pandas.core.dtypes.generic import ABCDateOffset
7-
86
import pandas as pd
97
from pandas import Series, TimedeltaIndex, timedelta_range
108
import pandas._testing as tm
119

12-
from pandas.tseries.offsets import Day, Hour
10+
from pandas.tseries.offsets import DateOffset, Day, Hour
1311

1412

1513
class TestTimedeltaIndexOps:
@@ -263,7 +261,7 @@ def test_freq_setter(self, values, freq):
263261
# can set to an offset, converting from string if necessary
264262
idx._data.freq = freq
265263
assert idx.freq == freq
266-
assert isinstance(idx.freq, ABCDateOffset)
264+
assert isinstance(idx.freq, DateOffset)
267265

268266
# can reset to None
269267
idx._data.freq = None

0 commit comments

Comments
 (0)