Skip to content

CLN: unnecessary ABCClasses #32891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions pandas/core/arrays/interval.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
ABCDatetimeIndex,
ABCExtensionArray,
ABCIndexClass,
ABCInterval,
ABCIntervalIndex,
ABCPeriodIndex,
ABCSeries,
Expand Down Expand Up @@ -529,7 +528,7 @@ def __setitem__(self, key, value):
value_left, value_right = value, value

# scalar interval
elif is_interval_dtype(value) or isinstance(value, ABCInterval):
elif is_interval_dtype(value) or isinstance(value, Interval):
self._check_closed_matches(value, name="value")
value_left, value_right = value.left, value.right

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

if not isinstance(value, ABCInterval):
if not isinstance(value, Interval):
msg = (
"'IntervalArray.fillna' only supports filling with a "
f"scalar 'pandas.Interval'. Got a '{type(value).__name__}' instead."
Expand Down
3 changes: 1 addition & 2 deletions pandas/core/dtypes/generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,11 @@ def _check(cls, inst) -> bool:
"ABCTimedeltaArray", "_typ", ("timedeltaarray")
)
ABCPeriodArray = create_pandas_abc_type("ABCPeriodArray", "_typ", ("periodarray",))
ABCPeriod = create_pandas_abc_type("ABCPeriod", "_typ", ("period",))
ABCDateOffset = create_pandas_abc_type("ABCDateOffset", "_typ", ("dateoffset",))
ABCInterval = create_pandas_abc_type("ABCInterval", "_typ", ("interval",))
ABCExtensionArray = create_pandas_abc_type(
"ABCExtensionArray",
"_typ",
# Note: IntervalArray and SparseArray are included bc they have _typ="extension"
("extension", "categorical", "periodarray", "datetimearray", "timedeltaarray"),
)
ABCPandasArray = create_pandas_abc_type("ABCPandasArray", "_typ", ("npy_extension",))
Expand Down
3 changes: 0 additions & 3 deletions pandas/tests/dtypes/test_generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,10 @@ def test_abc_types(self):
assert isinstance(self.df, gt.ABCDataFrame)
assert isinstance(self.sparse_array, gt.ABCSparseArray)
assert isinstance(self.categorical, gt.ABCCategorical)
assert isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCPeriod)

assert isinstance(pd.DateOffset(), gt.ABCDateOffset)
assert isinstance(pd.Period("2012", freq="A-DEC").freq, gt.ABCDateOffset)
assert not isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCDateOffset)
assert isinstance(pd.Interval(0, 1.5), gt.ABCInterval)
assert not isinstance(pd.Period("2012", freq="A-DEC"), gt.ABCInterval)

assert isinstance(self.datetime_array, gt.ABCDatetimeArray)
assert not isinstance(self.datetime_index, gt.ABCDatetimeArray)
Expand Down
14 changes: 10 additions & 4 deletions pandas/tests/indexes/datetimes/test_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
import numpy as np
import pytest

from pandas.core.dtypes.generic import ABCDateOffset

import pandas as pd
from pandas import DatetimeIndex, Index, Series, Timestamp, bdate_range, date_range
from pandas import (
DateOffset,
DatetimeIndex,
Index,
Series,
Timestamp,
bdate_range,
date_range,
)
import pandas._testing as tm

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

# can reset to None
idx._data.freq = None
Expand Down
6 changes: 2 additions & 4 deletions pandas/tests/indexes/timedeltas/test_ops.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@
import numpy as np
import pytest

from pandas.core.dtypes.generic import ABCDateOffset

import pandas as pd
from pandas import Series, TimedeltaIndex, timedelta_range
import pandas._testing as tm

from pandas.tseries.offsets import Day, Hour
from pandas.tseries.offsets import DateOffset, Day, Hour


class TestTimedeltaIndexOps:
Expand Down Expand Up @@ -263,7 +261,7 @@ def test_freq_setter(self, values, freq):
# can set to an offset, converting from string if necessary
idx._data.freq = freq
assert idx.freq == freq
assert isinstance(idx.freq, ABCDateOffset)
assert isinstance(idx.freq, DateOffset)

# can reset to None
idx._data.freq = None
Expand Down