diff --git a/pandas/core/indexes/base.py b/pandas/core/indexes/base.py index 74c6abeb0ad12..626f3dc86556a 100644 --- a/pandas/core/indexes/base.py +++ b/pandas/core/indexes/base.py @@ -141,12 +141,10 @@ class Index(IndexOpsMixin, PandasObject): _join_precedence = 1 # Cython methods - _arrmap = libalgos.arrmap_object _left_indexer_unique = libjoin.left_join_indexer_unique_object _left_indexer = libjoin.left_join_indexer_object _inner_indexer = libjoin.inner_join_indexer_object _outer_indexer = libjoin.outer_join_indexer_object - _box_scalars = False _typ = 'index' _data = None @@ -155,9 +153,6 @@ class Index(IndexOpsMixin, PandasObject): asi8 = None _comparables = ['name'] _attributes = ['name'] - _allow_index_ops = True - _allow_datetime_index_ops = False - _allow_period_index_ops = False _is_numeric_dtype = False _can_hold_na = True diff --git a/pandas/core/indexes/datetimes.py b/pandas/core/indexes/datetimes.py index afc86a51c02b4..8dd41c022d163 100644 --- a/pandas/core/indexes/datetimes.py +++ b/pandas/core/indexes/datetimes.py @@ -282,7 +282,6 @@ def _join_i8_wrapper(joinf, **kwargs): _left_indexer = _join_i8_wrapper(libjoin.left_join_indexer_int64) _left_indexer_unique = _join_i8_wrapper( libjoin.left_join_indexer_unique_int64, with_indexers=False) - _arrmap = None @classmethod def _add_comparison_methods(cls): diff --git a/pandas/core/indexes/interval.py b/pandas/core/indexes/interval.py index 232770e582763..3bf783b5a2faa 100644 --- a/pandas/core/indexes/interval.py +++ b/pandas/core/indexes/interval.py @@ -207,7 +207,6 @@ class IntervalIndex(IntervalMixin, Index): _typ = 'intervalindex' _comparables = ['name'] _attributes = ['name', 'closed'] - _allow_index_ops = True # we would like our indexing holder to defer to us _defer_to_indexing = True diff --git a/pandas/core/indexes/numeric.py b/pandas/core/indexes/numeric.py index 5e6ebb7588ab9..b02aee0495d8c 100644 --- a/pandas/core/indexes/numeric.py +++ b/pandas/core/indexes/numeric.py @@ -1,6 +1,6 @@ import numpy as np from pandas._libs import (index as libindex, - algos as libalgos, join as libjoin) + join as libjoin) from pandas.core.dtypes.common import ( is_dtype_equal, pandas_dtype, @@ -158,7 +158,6 @@ class Int64Index(NumericIndex): __doc__ = _num_index_shared_docs['class_descr'] % _int64_descr_args _typ = 'int64index' - _arrmap = libalgos.arrmap_int64 _left_indexer_unique = libjoin.left_join_indexer_unique_int64 _left_indexer = libjoin.left_join_indexer_int64 _inner_indexer = libjoin.inner_join_indexer_int64 @@ -217,7 +216,6 @@ class UInt64Index(NumericIndex): __doc__ = _num_index_shared_docs['class_descr'] % _uint64_descr_args _typ = 'uint64index' - _arrmap = libalgos.arrmap_uint64 _left_indexer_unique = libjoin.left_join_indexer_unique_uint64 _left_indexer = libjoin.left_join_indexer_uint64 _inner_indexer = libjoin.inner_join_indexer_uint64 @@ -296,7 +294,6 @@ class Float64Index(NumericIndex): _typ = 'float64index' _engine_type = libindex.Float64Engine - _arrmap = libalgos.arrmap_float64 _left_indexer_unique = libjoin.left_join_indexer_unique_float64 _left_indexer = libjoin.left_join_indexer_float64 _inner_indexer = libjoin.inner_join_indexer_float64 diff --git a/pandas/core/indexes/period.py b/pandas/core/indexes/period.py index 8b35b1a231551..1f8542ed5ee60 100644 --- a/pandas/core/indexes/period.py +++ b/pandas/core/indexes/period.py @@ -204,7 +204,6 @@ class PeriodIndex(DatelikeOps, DatetimeIndexOpsMixin, Int64Index): DatetimeIndex : Index with datetime64 data TimedeltaIndex : Index of timedelta64 data """ - _box_scalars = True _typ = 'periodindex' _attributes = ['name', 'freq'] diff --git a/pandas/core/indexes/timedeltas.py b/pandas/core/indexes/timedeltas.py index b88ee88210cfe..4b543262fc485 100644 --- a/pandas/core/indexes/timedeltas.py +++ b/pandas/core/indexes/timedeltas.py @@ -170,7 +170,6 @@ def _join_i8_wrapper(joinf, **kwargs): _left_indexer = _join_i8_wrapper(libjoin.left_join_indexer_int64) _left_indexer_unique = _join_i8_wrapper( libjoin.left_join_indexer_unique_int64, with_indexers=False) - _arrmap = None # define my properties & methods for delegation _other_ops = [] diff --git a/pandas/core/series.py b/pandas/core/series.py index a14eb69d86377..78b4c3a70a519 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -144,7 +144,6 @@ class Series(base.IndexOpsMixin, generic.NDFrame): _deprecations = generic.NDFrame._deprecations | frozenset( ['asobject', 'sortlevel', 'reshape', 'get_value', 'set_value', 'from_csv', 'valid']) - _allow_index_ops = True def __init__(self, data=None, index=None, dtype=None, name=None, copy=False, fastpath=False): diff --git a/pandas/tests/test_base.py b/pandas/tests/test_base.py index c468908db5449..df2547fc7b0da 100644 --- a/pandas/tests/test_base.py +++ b/pandas/tests/test_base.py @@ -265,8 +265,8 @@ class TestIndexOps(Ops): def setup_method(self, method): super(TestIndexOps, self).setup_method(method) - self.is_valid_objs = [o for o in self.objs if o._allow_index_ops] - self.not_valid_objs = [o for o in self.objs if not o._allow_index_ops] + self.is_valid_objs = self.objs + self.not_valid_objs = [] def test_none_comparison(self):