From dd33da16d6c60b2f18f331c27703a4ebbd6c4e8b Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Fri, 27 Mar 2020 18:29:44 -0700 Subject: [PATCH] CLN: remove ABCGeneric --- pandas/core/dtypes/generic.py | 8 -------- pandas/core/dtypes/missing.py | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pandas/core/dtypes/generic.py b/pandas/core/dtypes/generic.py index 2e83e6b32a51b..7f98ca3d402bc 100644 --- a/pandas/core/dtypes/generic.py +++ b/pandas/core/dtypes/generic.py @@ -71,11 +71,3 @@ def _check(cls, inst) -> bool: ("extension", "categorical", "periodarray", "datetimearray", "timedeltaarray"), ) ABCPandasArray = create_pandas_abc_type("ABCPandasArray", "_typ", ("npy_extension",)) - - -class _ABCGeneric(type): - def __instancecheck__(cls, inst) -> bool: - return hasattr(inst, "_data") - - -ABCGeneric = _ABCGeneric("ABCGeneric", tuple(), {}) diff --git a/pandas/core/dtypes/missing.py b/pandas/core/dtypes/missing.py index 581067b65b3bf..309c9f03ba6ed 100644 --- a/pandas/core/dtypes/missing.py +++ b/pandas/core/dtypes/missing.py @@ -33,9 +33,9 @@ pandas_dtype, ) from pandas.core.dtypes.generic import ( + ABCDataFrame, ABCDatetimeArray, ABCExtensionArray, - ABCGeneric, ABCIndexClass, ABCMultiIndex, ABCSeries, @@ -151,7 +151,7 @@ def _isna_new(obj): ), ): return _isna_ndarraylike(obj) - elif isinstance(obj, ABCGeneric): + elif isinstance(obj, ABCDataFrame): return obj._constructor(obj._data.isna(func=isna)) elif isinstance(obj, list): return _isna_ndarraylike(np.asarray(obj, dtype=object)) @@ -182,7 +182,7 @@ def _isna_old(obj): return False elif isinstance(obj, (ABCSeries, np.ndarray, ABCIndexClass, ABCExtensionArray)): return _isna_ndarraylike_old(obj) - elif isinstance(obj, ABCGeneric): + elif isinstance(obj, ABCDataFrame): return obj._constructor(obj._data.isna(func=_isna_old)) elif isinstance(obj, list): return _isna_ndarraylike_old(np.asarray(obj, dtype=object))