Skip to content

Commit f312cd9

Browse files
authored
REF: simplify is_scalar_indexer (#44234)
1 parent 19f06d9 commit f312cd9

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

pandas/core/indexers/utils.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ def is_scalar_indexer(indexer, ndim: int) -> bool:
100100
# GH37748: allow indexer to be an integer for Series
101101
return True
102102
if isinstance(indexer, tuple) and len(indexer) == ndim:
103-
return all(
104-
is_integer(x) or (isinstance(x, np.ndarray) and x.ndim == len(x) == 1)
105-
for x in indexer
106-
)
103+
return all(is_integer(x) for x in indexer)
107104
return False
108105

109106

pandas/tests/indexing/test_indexers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ def test_is_scalar_indexer():
2222
assert not is_scalar_indexer(indexer[0], 2)
2323

2424
indexer = (np.array([2]), 1)
25-
assert is_scalar_indexer(indexer, 2)
25+
assert not is_scalar_indexer(indexer, 2)
2626

2727
indexer = (np.array([2]), np.array([3]))
28-
assert is_scalar_indexer(indexer, 2)
28+
assert not is_scalar_indexer(indexer, 2)
2929

3030
indexer = (np.array([2]), np.array([3, 4]))
3131
assert not is_scalar_indexer(indexer, 2)

0 commit comments

Comments
 (0)