From 9eceae3a10b0e7a3e77d1017abfad4309b3bb04b Mon Sep 17 00:00:00 2001 From: Brock Date: Fri, 29 Oct 2021 13:52:25 -0700 Subject: [PATCH] REF: simplify is_scalar_indexer --- pandas/core/indexers/utils.py | 5 +---- pandas/tests/indexing/test_indexers.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pandas/core/indexers/utils.py b/pandas/core/indexers/utils.py index cf9be5eb95eb4..fe003281fb82e 100644 --- a/pandas/core/indexers/utils.py +++ b/pandas/core/indexers/utils.py @@ -100,10 +100,7 @@ def is_scalar_indexer(indexer, ndim: int) -> bool: # GH37748: allow indexer to be an integer for Series return True if isinstance(indexer, tuple) and len(indexer) == ndim: - return all( - is_integer(x) or (isinstance(x, np.ndarray) and x.ndim == len(x) == 1) - for x in indexer - ) + return all(is_integer(x) for x in indexer) return False diff --git a/pandas/tests/indexing/test_indexers.py b/pandas/tests/indexing/test_indexers.py index 45dcaf95ffdd0..ddc5c039160d5 100644 --- a/pandas/tests/indexing/test_indexers.py +++ b/pandas/tests/indexing/test_indexers.py @@ -22,10 +22,10 @@ def test_is_scalar_indexer(): assert not is_scalar_indexer(indexer[0], 2) indexer = (np.array([2]), 1) - assert is_scalar_indexer(indexer, 2) + assert not is_scalar_indexer(indexer, 2) indexer = (np.array([2]), np.array([3])) - assert is_scalar_indexer(indexer, 2) + assert not is_scalar_indexer(indexer, 2) indexer = (np.array([2]), np.array([3, 4])) assert not is_scalar_indexer(indexer, 2)