Skip to content

Commit 98bced9

Browse files
committed
COMPAT: 32-bit compat for testing of indexers
xref #16826
1 parent 500cd0f commit 98bced9

File tree

3 files changed

+16
-13
lines changed

3 files changed

+16
-13
lines changed

pandas/core/indexes/category.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,6 @@ def get_indexer(self, target, method=None, limit=None, tolerance=None):
497497
codes = self.categories.get_indexer(target)
498498

499499
indexer, _ = self._engine.get_indexer_non_unique(codes)
500-
501500
return _ensure_platform_int(indexer)
502501

503502
@Appender(_index_shared_docs['get_indexer_non_unique'] % _index_doc_kwargs)
@@ -508,7 +507,8 @@ def get_indexer_non_unique(self, target):
508507
target = target.categories
509508

510509
codes = self.categories.get_indexer(target)
511-
return self._engine.get_indexer_non_unique(codes)
510+
indexer, missing = self._engine.get_indexer_non_unique(codes)
511+
return _ensure_platform_int(indexer), missing
512512

513513
@Appender(_index_shared_docs['_convert_scalar_indexer'])
514514
def _convert_scalar_indexer(self, key, kind=None):

pandas/tests/indexes/common.py

+14
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,20 @@ def test_reindex_base(self):
132132
with tm.assert_raises_regex(ValueError, 'Invalid fill method'):
133133
idx.get_indexer(idx, method='invalid')
134134

135+
def test_get_indexer_consistency(self):
136+
# See GH 16819
137+
for name, index in self.indices.items():
138+
if isinstance(index, IntervalIndex):
139+
continue
140+
141+
indexer = index.get_indexer(index[0:2])
142+
assert isinstance(indexer, np.ndarray)
143+
assert indexer.dtype == np.intp
144+
145+
indexer, _ = index.get_indexer_non_unique(index[0:2])
146+
assert isinstance(indexer, np.ndarray)
147+
assert indexer.dtype == np.intp
148+
135149
def test_ndarray_compat_properties(self):
136150
idx = self.create_index()
137151
assert idx.T.equals(idx)

pandas/tests/indexes/test_base.py

-11
Original file line numberDiff line numberDiff line change
@@ -1131,17 +1131,6 @@ def test_get_indexer_strings(self):
11311131
with pytest.raises(TypeError):
11321132
idx.get_indexer(['a', 'b', 'c', 'd'], method='pad', tolerance=2)
11331133

1134-
def test_get_indexer_consistency(self):
1135-
# See GH 16819
1136-
for name, index in self.indices.items():
1137-
indexer = index.get_indexer(index[0:2])
1138-
assert isinstance(indexer, np.ndarray)
1139-
assert indexer.dtype == np.intp
1140-
1141-
indexer, _ = index.get_indexer_non_unique(index[0:2])
1142-
assert isinstance(indexer, np.ndarray)
1143-
assert indexer.dtype == np.intp
1144-
11451134
def test_get_loc(self):
11461135
idx = pd.Index([0, 1, 2])
11471136
all_methods = [None, 'pad', 'backfill', 'nearest']

0 commit comments

Comments
 (0)