From 106419fed9663e58cdaded1c88dfcc374143c298 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 15 Aug 2021 21:30:15 -0700 Subject: [PATCH 1/2] REF: Move BaseIndexers and indexer.py functions into it's own directory --- pandas/api/indexers/__init__.py | 4 ++-- pandas/core/algorithms.py | 2 +- pandas/core/arrays/_mixins.py | 2 +- pandas/core/arrays/categorical.py | 2 +- pandas/core/arrays/datetimelike.py | 2 +- pandas/core/arrays/interval.py | 2 +- pandas/core/arrays/masked.py | 2 +- pandas/core/arrays/sparse/array.py | 2 +- pandas/core/arrays/string_.py | 2 +- pandas/core/arrays/string_arrow.py | 2 +- pandas/core/frame.py | 2 +- pandas/core/generic.py | 2 +- pandas/core/indexers/__init__.py | 0 .../core/{window/indexers.py => indexers/objects.py} | 0 pandas/core/{indexers.py => indexers/utils.py} | 0 pandas/core/indexes/base.py | 2 +- pandas/core/indexes/extension.py | 2 +- pandas/core/indexes/interval.py | 2 +- pandas/core/indexing.py | 2 +- pandas/core/internals/array_manager.py | 2 +- pandas/core/internals/blocks.py | 2 +- pandas/core/internals/managers.py | 2 +- pandas/core/series.py | 2 +- pandas/core/window/ewm.py | 10 +++++----- pandas/core/window/expanding.py | 10 +++++----- pandas/core/window/rolling.py | 12 ++++++------ pandas/tests/extension/decimal/array.py | 2 +- pandas/tests/indexing/test_indexers.py | 4 ++-- pandas/tests/window/test_base_indexer.py | 2 +- 29 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 pandas/core/indexers/__init__.py rename pandas/core/{window/indexers.py => indexers/objects.py} (100%) rename pandas/core/{indexers.py => indexers/utils.py} (100%) diff --git a/pandas/api/indexers/__init__.py b/pandas/api/indexers/__init__.py index 7dc824b691a01..2bbd54e4ce155 100644 --- a/pandas/api/indexers/__init__.py +++ b/pandas/api/indexers/__init__.py @@ -2,12 +2,12 @@ Public API for Rolling Window Indexers. """ -from pandas.core.indexers import check_array_indexer -from pandas.core.window.indexers import ( +from pandas.core.indexers.objects import ( BaseIndexer, FixedForwardWindowIndexer, VariableOffsetWindowIndexer, ) +from pandas.core.indexers.utils import check_array_indexer __all__ = [ "check_array_indexer", diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index 4f9dd61b8e0da..71bc7f0594754 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -78,7 +78,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers import validate_indices +from pandas.core.indexers.utils import validate_indices if TYPE_CHECKING: diff --git a/pandas/core/arrays/_mixins.py b/pandas/core/arrays/_mixins.py index 0e8097cf1fc78..450af7c49cc1f 100644 --- a/pandas/core/arrays/_mixins.py +++ b/pandas/core/arrays/_mixins.py @@ -38,7 +38,7 @@ from pandas.core.array_algos.transforms import shift from pandas.core.arrays.base import ExtensionArray from pandas.core.construction import extract_array -from pandas.core.indexers import check_array_indexer +from pandas.core.indexers.utils import check_array_indexer from pandas.core.sorting import nargminmax NDArrayBackedExtensionArrayT = TypeVar( diff --git a/pandas/core/arrays/categorical.py b/pandas/core/arrays/categorical.py index 1686d69bfcb61..7dbaae72caf87 100644 --- a/pandas/core/arrays/categorical.py +++ b/pandas/core/arrays/categorical.py @@ -107,7 +107,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers import deprecate_ndim_indexing +from pandas.core.indexers.utils import deprecate_ndim_indexing from pandas.core.ops.common import unpack_zerodim_and_defer from pandas.core.sorting import nargsort from pandas.core.strings.object_array import ObjectStringArrayMixin diff --git a/pandas/core/arrays/datetimelike.py b/pandas/core/arrays/datetimelike.py index 8b5bda4629506..8f0d328ed6f5b 100644 --- a/pandas/core/arrays/datetimelike.py +++ b/pandas/core/arrays/datetimelike.py @@ -109,7 +109,7 @@ array as pd_array, extract_array, ) -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( check_array_indexer, check_setitem_lengths, ) diff --git a/pandas/core/arrays/interval.py b/pandas/core/arrays/interval.py index 41998218acd7d..1ec0837463dbd 100644 --- a/pandas/core/arrays/interval.py +++ b/pandas/core/arrays/interval.py @@ -81,7 +81,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers import check_array_indexer +from pandas.core.indexers.utils import check_array_indexer from pandas.core.indexes.base import ensure_index from pandas.core.ops import ( invalid_comparison, diff --git a/pandas/core/arrays/masked.py b/pandas/core/arrays/masked.py index 1d78a74db98f0..8efa84b7ab271 100644 --- a/pandas/core/arrays/masked.py +++ b/pandas/core/arrays/masked.py @@ -55,7 +55,7 @@ from pandas.core.array_algos import masked_reductions from pandas.core.arraylike import OpsMixin from pandas.core.arrays import ExtensionArray -from pandas.core.indexers import check_array_indexer +from pandas.core.indexers.utils import check_array_indexer if TYPE_CHECKING: from pandas import Series diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index b1cfcbd69a30b..b7144766aeed7 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -70,7 +70,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers import check_array_indexer +from pandas.core.indexers.utils import check_array_indexer from pandas.core.missing import interpolate_2d from pandas.core.nanops import check_below_min_count import pandas.core.ops as ops diff --git a/pandas/core/arrays/string_.py b/pandas/core/arrays/string_.py index 8d150c8f6ad3d..2ff2d80199e9a 100644 --- a/pandas/core/arrays/string_.py +++ b/pandas/core/arrays/string_.py @@ -47,7 +47,7 @@ from pandas.core.arrays.floating import FloatingDtype from pandas.core.arrays.integer import _IntegerDtype from pandas.core.construction import extract_array -from pandas.core.indexers import check_array_indexer +from pandas.core.indexers.utils import check_array_indexer from pandas.core.missing import isna if TYPE_CHECKING: diff --git a/pandas/core/arrays/string_arrow.py b/pandas/core/arrays/string_arrow.py index ab8599f0f05ba..27ea14e96820f 100644 --- a/pandas/core/arrays/string_arrow.py +++ b/pandas/core/arrays/string_arrow.py @@ -51,7 +51,7 @@ BaseStringArray, StringDtype, ) -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( check_array_indexer, validate_indices, ) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 823de2133f0b3..dffa304e146c7 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -159,7 +159,7 @@ NDFrame, _shared_docs, ) -from pandas.core.indexers import check_key_length +from pandas.core.indexers.utils import check_key_length from pandas.core.indexes import base as ibase from pandas.core.indexes.api import ( DatetimeIndex, diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 860d4f6a5dcc2..89fde53ac22b7 100644 --- a/pandas/core/generic.py +++ b/pandas/core/generic.py @@ -164,9 +164,9 @@ from pandas._libs.tslibs import BaseOffset from pandas.core.frame import DataFrame + from pandas.core.indexers.objects import BaseIndexer from pandas.core.resample import Resampler from pandas.core.series import Series - from pandas.core.window.indexers import BaseIndexer # goal is to be able to define the docs close to function, while still being # able to share diff --git a/pandas/core/indexers/__init__.py b/pandas/core/indexers/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pandas/core/window/indexers.py b/pandas/core/indexers/objects.py similarity index 100% rename from pandas/core/window/indexers.py rename to pandas/core/indexers/objects.py diff --git a/pandas/core/indexers.py b/pandas/core/indexers/utils.py similarity index 100% rename from pandas/core/indexers.py rename to pandas/core/indexers/utils.py diff --git a/pandas/core/indexes/base.py b/pandas/core/indexes/base.py index b67bb2cd3cf37..6d525d30d20b2 100644 --- a/pandas/core/indexes/base.py +++ b/pandas/core/indexes/base.py @@ -144,7 +144,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers import deprecate_ndim_indexing +from pandas.core.indexers.utils import deprecate_ndim_indexing from pandas.core.indexes.frozen import FrozenList from pandas.core.ops import get_op_result_name from pandas.core.ops.invalid import make_invalid_op diff --git a/pandas/core/indexes/extension.py b/pandas/core/indexes/extension.py index 1458ff1cdaa51..97fe64dd55283 100644 --- a/pandas/core/indexes/extension.py +++ b/pandas/core/indexes/extension.py @@ -37,7 +37,7 @@ TimedeltaArray, ) from pandas.core.arrays._mixins import NDArrayBackedExtensionArray -from pandas.core.indexers import deprecate_ndim_indexing +from pandas.core.indexers.utils import deprecate_ndim_indexing from pandas.core.indexes.base import Index from pandas.core.ops import get_op_result_name diff --git a/pandas/core/indexes/interval.py b/pandas/core/indexes/interval.py index c401ad0c1e0d5..66751cee6af38 100644 --- a/pandas/core/indexes/interval.py +++ b/pandas/core/indexes/interval.py @@ -68,7 +68,7 @@ _interval_shared_docs, ) import pandas.core.common as com -from pandas.core.indexers import is_valid_positional_slice +from pandas.core.indexers.utils import is_valid_positional_slice import pandas.core.indexes.base as ibase from pandas.core.indexes.base import ( Index, diff --git a/pandas/core/indexing.py b/pandas/core/indexing.py index ad5f878628931..ada3fd1412c10 100644 --- a/pandas/core/indexing.py +++ b/pandas/core/indexing.py @@ -47,7 +47,7 @@ array as pd_array, extract_array, ) -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( check_array_indexer, is_empty_indexer, is_exact_shape_match, diff --git a/pandas/core/internals/array_manager.py b/pandas/core/internals/array_manager.py index 157e90d6e8b0a..3a8e312cc191d 100644 --- a/pandas/core/internals/array_manager.py +++ b/pandas/core/internals/array_manager.py @@ -68,7 +68,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( maybe_convert_indices, validate_indices, ) diff --git a/pandas/core/internals/blocks.py b/pandas/core/internals/blocks.py index 953ccedaa5222..2693bc983cf28 100644 --- a/pandas/core/internals/blocks.py +++ b/pandas/core/internals/blocks.py @@ -106,7 +106,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( check_setitem_lengths, is_empty_indexer, is_exact_shape_match, diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py index c71c3c3912812..ce9c2eb743117 100644 --- a/pandas/core/internals/managers.py +++ b/pandas/core/internals/managers.py @@ -54,7 +54,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers import maybe_convert_indices +from pandas.core.indexers.utils import maybe_convert_indices from pandas.core.indexes.api import ( Float64Index, Index, diff --git a/pandas/core/series.py b/pandas/core/series.py index 7766a7ea362eb..b6587fdf77875 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -110,7 +110,7 @@ sanitize_array, ) from pandas.core.generic import NDFrame -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( deprecate_ndim_indexing, unpack_1tuple, ) diff --git a/pandas/core/window/ewm.py b/pandas/core/window/ewm.py index ee99692b85432..67a32f8a676ce 100644 --- a/pandas/core/window/ewm.py +++ b/pandas/core/window/ewm.py @@ -26,6 +26,11 @@ from pandas.core.dtypes.missing import isna import pandas.core.common as common # noqa: PDF018 +from pandas.core.indexers.objects import ( + BaseIndexer, + ExponentialMovingWindowIndexer, + GroupbyIndexer, +) from pandas.core.util.numba_ import maybe_use_numba from pandas.core.window.common import zsqrt from pandas.core.window.doc import ( @@ -39,11 +44,6 @@ template_see_also, window_agg_numba_parameters, ) -from pandas.core.window.indexers import ( - BaseIndexer, - ExponentialMovingWindowIndexer, - GroupbyIndexer, -) from pandas.core.window.numba_ import ( generate_ewma_numba_table_func, generate_numba_ewma_func, diff --git a/pandas/core/window/expanding.py b/pandas/core/window/expanding.py index eedb6930bad66..36a6399df7dbc 100644 --- a/pandas/core/window/expanding.py +++ b/pandas/core/window/expanding.py @@ -18,6 +18,11 @@ from pandas.compat.numpy import function as nv from pandas.util._decorators import doc +from pandas.core.indexers.objects import ( + BaseIndexer, + ExpandingIndexer, + GroupbyIndexer, +) from pandas.core.window.doc import ( _shared_docs, args_compat, @@ -30,11 +35,6 @@ window_agg_numba_parameters, window_apply_parameters, ) -from pandas.core.window.indexers import ( - BaseIndexer, - ExpandingIndexer, - GroupbyIndexer, -) from pandas.core.window.rolling import ( BaseWindowGroupby, RollingAndExpandingMixin, diff --git a/pandas/core/window/rolling.py b/pandas/core/window/rolling.py index d4c0eb946505d..637b7c705d73c 100644 --- a/pandas/core/window/rolling.py +++ b/pandas/core/window/rolling.py @@ -55,6 +55,12 @@ SelectionMixin, ) import pandas.core.common as com +from pandas.core.indexers.objects import ( + BaseIndexer, + FixedWindowIndexer, + GroupbyIndexer, + VariableWindowIndexer, +) from pandas.core.indexes.api import ( DatetimeIndex, Index, @@ -85,12 +91,6 @@ window_agg_numba_parameters, window_apply_parameters, ) -from pandas.core.window.indexers import ( - BaseIndexer, - FixedWindowIndexer, - GroupbyIndexer, - VariableWindowIndexer, -) from pandas.core.window.numba_ import ( generate_manual_numpy_nan_agg_with_axis, generate_numba_apply_func, diff --git a/pandas/tests/extension/decimal/array.py b/pandas/tests/extension/decimal/array.py index fe7ebe4f4fb51..57bf698f0222a 100644 --- a/pandas/tests/extension/decimal/array.py +++ b/pandas/tests/extension/decimal/array.py @@ -30,7 +30,7 @@ ExtensionArray, ExtensionScalarOpsMixin, ) -from pandas.core.indexers import check_array_indexer +from pandas.core.indexers.utils import check_array_indexer @register_extension_dtype diff --git a/pandas/tests/indexing/test_indexers.py b/pandas/tests/indexing/test_indexers.py index 45dcaf95ffdd0..0292f0c6fdbdd 100644 --- a/pandas/tests/indexing/test_indexers.py +++ b/pandas/tests/indexing/test_indexers.py @@ -1,8 +1,8 @@ -# Tests aimed at pandas.core.indexers +# Tests aimed at pandas.core.indexers.utils import numpy as np import pytest -from pandas.core.indexers import ( +from pandas.core.indexers.utils import ( is_scalar_indexer, length_of_indexer, validate_indices, diff --git a/pandas/tests/window/test_base_indexer.py b/pandas/tests/window/test_base_indexer.py index 06867e80ee711..89c4b0cfdb4aa 100644 --- a/pandas/tests/window/test_base_indexer.py +++ b/pandas/tests/window/test_base_indexer.py @@ -11,7 +11,7 @@ BaseIndexer, FixedForwardWindowIndexer, ) -from pandas.core.window.indexers import ( +from pandas.core.indexers.objects import ( ExpandingIndexer, VariableOffsetWindowIndexer, ) From 759d82273fa4ed0e158313ba855b4fcf68c0d5f7 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 17 Aug 2021 22:19:46 -0700 Subject: [PATCH 2/2] import utils in __init__.py --- pandas/api/indexers/__init__.py | 2 +- pandas/core/algorithms.py | 2 +- pandas/core/arrays/_mixins.py | 2 +- pandas/core/arrays/categorical.py | 2 +- pandas/core/arrays/datetimelike.py | 2 +- pandas/core/arrays/interval.py | 2 +- pandas/core/arrays/masked.py | 2 +- pandas/core/arrays/sparse/array.py | 2 +- pandas/core/arrays/string_.py | 2 +- pandas/core/arrays/string_arrow.py | 2 +- pandas/core/frame.py | 2 +- pandas/core/indexers/__init__.py | 31 +++++++++++++++++++++++++ pandas/core/indexes/base.py | 2 +- pandas/core/indexes/extension.py | 2 +- pandas/core/indexes/interval.py | 2 +- pandas/core/indexing.py | 2 +- pandas/core/internals/array_manager.py | 2 +- pandas/core/internals/blocks.py | 2 +- pandas/core/internals/managers.py | 2 +- pandas/core/series.py | 2 +- pandas/tests/extension/decimal/array.py | 2 +- pandas/tests/indexing/test_indexers.py | 4 ++-- 22 files changed, 53 insertions(+), 22 deletions(-) diff --git a/pandas/api/indexers/__init__.py b/pandas/api/indexers/__init__.py index 2bbd54e4ce155..78357f11dc3b7 100644 --- a/pandas/api/indexers/__init__.py +++ b/pandas/api/indexers/__init__.py @@ -2,12 +2,12 @@ Public API for Rolling Window Indexers. """ +from pandas.core.indexers import check_array_indexer from pandas.core.indexers.objects import ( BaseIndexer, FixedForwardWindowIndexer, VariableOffsetWindowIndexer, ) -from pandas.core.indexers.utils import check_array_indexer __all__ = [ "check_array_indexer", diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py index 71bc7f0594754..4f9dd61b8e0da 100644 --- a/pandas/core/algorithms.py +++ b/pandas/core/algorithms.py @@ -78,7 +78,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers.utils import validate_indices +from pandas.core.indexers import validate_indices if TYPE_CHECKING: diff --git a/pandas/core/arrays/_mixins.py b/pandas/core/arrays/_mixins.py index 450af7c49cc1f..0e8097cf1fc78 100644 --- a/pandas/core/arrays/_mixins.py +++ b/pandas/core/arrays/_mixins.py @@ -38,7 +38,7 @@ from pandas.core.array_algos.transforms import shift from pandas.core.arrays.base import ExtensionArray from pandas.core.construction import extract_array -from pandas.core.indexers.utils import check_array_indexer +from pandas.core.indexers import check_array_indexer from pandas.core.sorting import nargminmax NDArrayBackedExtensionArrayT = TypeVar( diff --git a/pandas/core/arrays/categorical.py b/pandas/core/arrays/categorical.py index 7dbaae72caf87..1686d69bfcb61 100644 --- a/pandas/core/arrays/categorical.py +++ b/pandas/core/arrays/categorical.py @@ -107,7 +107,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers.utils import deprecate_ndim_indexing +from pandas.core.indexers import deprecate_ndim_indexing from pandas.core.ops.common import unpack_zerodim_and_defer from pandas.core.sorting import nargsort from pandas.core.strings.object_array import ObjectStringArrayMixin diff --git a/pandas/core/arrays/datetimelike.py b/pandas/core/arrays/datetimelike.py index 8f0d328ed6f5b..8b5bda4629506 100644 --- a/pandas/core/arrays/datetimelike.py +++ b/pandas/core/arrays/datetimelike.py @@ -109,7 +109,7 @@ array as pd_array, extract_array, ) -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( check_array_indexer, check_setitem_lengths, ) diff --git a/pandas/core/arrays/interval.py b/pandas/core/arrays/interval.py index 1ec0837463dbd..41998218acd7d 100644 --- a/pandas/core/arrays/interval.py +++ b/pandas/core/arrays/interval.py @@ -81,7 +81,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers.utils import check_array_indexer +from pandas.core.indexers import check_array_indexer from pandas.core.indexes.base import ensure_index from pandas.core.ops import ( invalid_comparison, diff --git a/pandas/core/arrays/masked.py b/pandas/core/arrays/masked.py index 8efa84b7ab271..1d78a74db98f0 100644 --- a/pandas/core/arrays/masked.py +++ b/pandas/core/arrays/masked.py @@ -55,7 +55,7 @@ from pandas.core.array_algos import masked_reductions from pandas.core.arraylike import OpsMixin from pandas.core.arrays import ExtensionArray -from pandas.core.indexers.utils import check_array_indexer +from pandas.core.indexers import check_array_indexer if TYPE_CHECKING: from pandas import Series diff --git a/pandas/core/arrays/sparse/array.py b/pandas/core/arrays/sparse/array.py index b7144766aeed7..b1cfcbd69a30b 100644 --- a/pandas/core/arrays/sparse/array.py +++ b/pandas/core/arrays/sparse/array.py @@ -70,7 +70,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers.utils import check_array_indexer +from pandas.core.indexers import check_array_indexer from pandas.core.missing import interpolate_2d from pandas.core.nanops import check_below_min_count import pandas.core.ops as ops diff --git a/pandas/core/arrays/string_.py b/pandas/core/arrays/string_.py index 2ff2d80199e9a..8d150c8f6ad3d 100644 --- a/pandas/core/arrays/string_.py +++ b/pandas/core/arrays/string_.py @@ -47,7 +47,7 @@ from pandas.core.arrays.floating import FloatingDtype from pandas.core.arrays.integer import _IntegerDtype from pandas.core.construction import extract_array -from pandas.core.indexers.utils import check_array_indexer +from pandas.core.indexers import check_array_indexer from pandas.core.missing import isna if TYPE_CHECKING: diff --git a/pandas/core/arrays/string_arrow.py b/pandas/core/arrays/string_arrow.py index 27ea14e96820f..ab8599f0f05ba 100644 --- a/pandas/core/arrays/string_arrow.py +++ b/pandas/core/arrays/string_arrow.py @@ -51,7 +51,7 @@ BaseStringArray, StringDtype, ) -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( check_array_indexer, validate_indices, ) diff --git a/pandas/core/frame.py b/pandas/core/frame.py index dffa304e146c7..823de2133f0b3 100644 --- a/pandas/core/frame.py +++ b/pandas/core/frame.py @@ -159,7 +159,7 @@ NDFrame, _shared_docs, ) -from pandas.core.indexers.utils import check_key_length +from pandas.core.indexers import check_key_length from pandas.core.indexes import base as ibase from pandas.core.indexes.api import ( DatetimeIndex, diff --git a/pandas/core/indexers/__init__.py b/pandas/core/indexers/__init__.py index e69de29bb2d1d..1558b03162d22 100644 --- a/pandas/core/indexers/__init__.py +++ b/pandas/core/indexers/__init__.py @@ -0,0 +1,31 @@ +from pandas.core.indexers.utils import ( + check_array_indexer, + check_key_length, + check_setitem_lengths, + deprecate_ndim_indexing, + is_empty_indexer, + is_exact_shape_match, + is_list_like_indexer, + is_scalar_indexer, + is_valid_positional_slice, + length_of_indexer, + maybe_convert_indices, + unpack_1tuple, + validate_indices, +) + +__all__ = [ + "is_valid_positional_slice", + "is_list_like_indexer", + "is_scalar_indexer", + "is_empty_indexer", + "check_setitem_lengths", + "validate_indices", + "maybe_convert_indices", + "is_exact_shape_match", + "length_of_indexer", + "deprecate_ndim_indexing", + "unpack_1tuple", + "check_key_length", + "check_array_indexer", +] diff --git a/pandas/core/indexes/base.py b/pandas/core/indexes/base.py index 6d525d30d20b2..b67bb2cd3cf37 100644 --- a/pandas/core/indexes/base.py +++ b/pandas/core/indexes/base.py @@ -144,7 +144,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers.utils import deprecate_ndim_indexing +from pandas.core.indexers import deprecate_ndim_indexing from pandas.core.indexes.frozen import FrozenList from pandas.core.ops import get_op_result_name from pandas.core.ops.invalid import make_invalid_op diff --git a/pandas/core/indexes/extension.py b/pandas/core/indexes/extension.py index 97fe64dd55283..1458ff1cdaa51 100644 --- a/pandas/core/indexes/extension.py +++ b/pandas/core/indexes/extension.py @@ -37,7 +37,7 @@ TimedeltaArray, ) from pandas.core.arrays._mixins import NDArrayBackedExtensionArray -from pandas.core.indexers.utils import deprecate_ndim_indexing +from pandas.core.indexers import deprecate_ndim_indexing from pandas.core.indexes.base import Index from pandas.core.ops import get_op_result_name diff --git a/pandas/core/indexes/interval.py b/pandas/core/indexes/interval.py index 66751cee6af38..c401ad0c1e0d5 100644 --- a/pandas/core/indexes/interval.py +++ b/pandas/core/indexes/interval.py @@ -68,7 +68,7 @@ _interval_shared_docs, ) import pandas.core.common as com -from pandas.core.indexers.utils import is_valid_positional_slice +from pandas.core.indexers import is_valid_positional_slice import pandas.core.indexes.base as ibase from pandas.core.indexes.base import ( Index, diff --git a/pandas/core/indexing.py b/pandas/core/indexing.py index ada3fd1412c10..ad5f878628931 100644 --- a/pandas/core/indexing.py +++ b/pandas/core/indexing.py @@ -47,7 +47,7 @@ array as pd_array, extract_array, ) -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( check_array_indexer, is_empty_indexer, is_exact_shape_match, diff --git a/pandas/core/internals/array_manager.py b/pandas/core/internals/array_manager.py index 3a8e312cc191d..157e90d6e8b0a 100644 --- a/pandas/core/internals/array_manager.py +++ b/pandas/core/internals/array_manager.py @@ -68,7 +68,7 @@ extract_array, sanitize_array, ) -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( maybe_convert_indices, validate_indices, ) diff --git a/pandas/core/internals/blocks.py b/pandas/core/internals/blocks.py index 2693bc983cf28..953ccedaa5222 100644 --- a/pandas/core/internals/blocks.py +++ b/pandas/core/internals/blocks.py @@ -106,7 +106,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( check_setitem_lengths, is_empty_indexer, is_exact_shape_match, diff --git a/pandas/core/internals/managers.py b/pandas/core/internals/managers.py index ce9c2eb743117..c71c3c3912812 100644 --- a/pandas/core/internals/managers.py +++ b/pandas/core/internals/managers.py @@ -54,7 +54,7 @@ ensure_wrapped_if_datetimelike, extract_array, ) -from pandas.core.indexers.utils import maybe_convert_indices +from pandas.core.indexers import maybe_convert_indices from pandas.core.indexes.api import ( Float64Index, Index, diff --git a/pandas/core/series.py b/pandas/core/series.py index b6587fdf77875..7766a7ea362eb 100644 --- a/pandas/core/series.py +++ b/pandas/core/series.py @@ -110,7 +110,7 @@ sanitize_array, ) from pandas.core.generic import NDFrame -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( deprecate_ndim_indexing, unpack_1tuple, ) diff --git a/pandas/tests/extension/decimal/array.py b/pandas/tests/extension/decimal/array.py index 57bf698f0222a..fe7ebe4f4fb51 100644 --- a/pandas/tests/extension/decimal/array.py +++ b/pandas/tests/extension/decimal/array.py @@ -30,7 +30,7 @@ ExtensionArray, ExtensionScalarOpsMixin, ) -from pandas.core.indexers.utils import check_array_indexer +from pandas.core.indexers import check_array_indexer @register_extension_dtype diff --git a/pandas/tests/indexing/test_indexers.py b/pandas/tests/indexing/test_indexers.py index 0292f0c6fdbdd..45dcaf95ffdd0 100644 --- a/pandas/tests/indexing/test_indexers.py +++ b/pandas/tests/indexing/test_indexers.py @@ -1,8 +1,8 @@ -# Tests aimed at pandas.core.indexers.utils +# Tests aimed at pandas.core.indexers import numpy as np import pytest -from pandas.core.indexers.utils import ( +from pandas.core.indexers import ( is_scalar_indexer, length_of_indexer, validate_indices,