Add logic to deal with ABCIndexClass being renamed to ABCIndex

CODAIT · Jul 3, 2021 · 4fcfbb4 · 4fcfbb4
1 parent e414fcd
commit 4fcfbb4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/text_extensions_for_pandas/array/span.py b/text_extensions_for_pandas/array/span.py
@@ -30,7 +30,14 @@
 from memoized_property import memoized_property
 # noinspection PyProtectedMember
 from pandas.api.types import is_bool_dtype
-from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
+from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries
+try:
+ from pandas.core.dtypes.generic import ABCIndexClass
+except ImportError:
+ # ABCIndexClass changed to ABCIndex in Pandas 1.3
+ # noinspection PyUnresolvedReferences
+ from pandas.core.dtypes.generic import ABCIndex
+ ABCIndexClass = ABCIndex
 from pandas.core.indexers import check_array_indexer
 
 # Internal imports

diff --git a/text_extensions_for_pandas/array/tensor.py b/text_extensions_for_pandas/array/tensor.py
@@ -29,7 +29,14 @@
 import numpy as np
 import pandas as pd
 from pandas.compat import set_function_name
-from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
+from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries
+try:
+ from pandas.core.dtypes.generic import ABCIndexClass
+except ImportError:
+ # ABCIndexClass changed to ABCIndex in Pandas 1.3
+ # noinspection PyUnresolvedReferences
+ from pandas.core.dtypes.generic import ABCIndex
+ ABCIndexClass = ABCIndex
 from pandas.core.indexers import check_array_indexer, validate_indices
 
 """ Begin Patching of ExtensionArrayFormatter """

diff --git a/text_extensions_for_pandas/array/token_span.py b/text_extensions_for_pandas/array/token_span.py
@@ -29,7 +29,15 @@
 from memoized_property import memoized_property
 # noinspection PyProtectedMember
 from pandas.api.types import is_bool_dtype
-from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
+from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries
+try:
+ from pandas.core.dtypes.generic import ABCIndexClass
+except ImportError:
+ # ABCIndexClass changed to ABCIndex in Pandas 1.3
+ # noinspection PyUnresolvedReferences
+ from pandas.core.dtypes.generic import ABCIndex
+ ABCIndexClass = ABCIndex
+
 from pandas.core.indexers import check_array_indexer
 
 from text_extensions_for_pandas.array.span import (