Skip to content

Commit 5151f29

Browse files
jbrockmendelKevin D Smith
authored and
Kevin D Smith
committed
CLN: remove unnecessary _convert_index_indexer (pandas-dev#36394)
1 parent a535f79 commit 5151f29

File tree

4 files changed

+7
-31
lines changed

4 files changed

+7
-31
lines changed

pandas/core/indexes/base.py

+1-16
Original file line numberDiff line numberDiff line change
@@ -3252,7 +3252,7 @@ def _convert_listlike_indexer(self, keyarr):
32523252
Return tuple-safe keys.
32533253
"""
32543254
if isinstance(keyarr, Index):
3255-
keyarr = self._convert_index_indexer(keyarr)
3255+
pass
32563256
else:
32573257
keyarr = self._convert_arr_indexer(keyarr)
32583258

@@ -3275,21 +3275,6 @@ def _convert_arr_indexer(self, keyarr):
32753275
keyarr = com.asarray_tuplesafe(keyarr)
32763276
return keyarr
32773277

3278-
def _convert_index_indexer(self, keyarr):
3279-
"""
3280-
Convert an Index indexer to the appropriate dtype.
3281-
3282-
Parameters
3283-
----------
3284-
keyarr : Index (or sub-class)
3285-
Indexer to convert.
3286-
3287-
Returns
3288-
-------
3289-
converted_keyarr : Index (or sub-class)
3290-
"""
3291-
return keyarr
3292-
32933278
def _convert_list_indexer(self, keyarr):
32943279
"""
32953280
Convert a list-like indexer to the appropriate dtype.

pandas/core/indexes/category.py

-4
Original file line numberDiff line numberDiff line change
@@ -583,10 +583,6 @@ def _convert_arr_indexer(self, keyarr):
583583

584584
return self._shallow_copy(keyarr)
585585

586-
@doc(Index._convert_index_indexer)
587-
def _convert_index_indexer(self, keyarr):
588-
return self._shallow_copy(keyarr)
589-
590586
@doc(Index._maybe_cast_slice_bound)
591587
def _maybe_cast_slice_bound(self, label, side, kind):
592588
if kind == "loc":

pandas/core/indexes/numeric.py

-9
Original file line numberDiff line numberDiff line change
@@ -308,15 +308,6 @@ def _convert_arr_indexer(self, keyarr):
308308

309309
return com.asarray_tuplesafe(keyarr, dtype=dtype)
310310

311-
@doc(Index._convert_index_indexer)
312-
def _convert_index_indexer(self, keyarr):
313-
# Cast the indexer to uint64 if possible so
314-
# that the values returned from indexing are
315-
# also uint64.
316-
if keyarr.is_integer():
317-
return keyarr.astype(np.uint64)
318-
return keyarr
319-
320311
# ----------------------------------------------------------------
321312

322313
@classmethod

pandas/tests/indexes/test_numeric.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,11 @@ def test_range_float_union_dtype():
631631
tm.assert_index_equal(result, expected)
632632

633633

634-
def test_uint_index_does_not_convert_to_float64():
634+
@pytest.mark.parametrize(
635+
"box",
636+
[list, lambda x: np.array(x, dtype=object), lambda x: pd.Index(x, dtype=object)],
637+
)
638+
def test_uint_index_does_not_convert_to_float64(box):
635639
# https://github.com/pandas-dev/pandas/issues/28279
636640
# https://github.com/pandas-dev/pandas/issues/28023
637641
series = pd.Series(
@@ -646,7 +650,7 @@ def test_uint_index_does_not_convert_to_float64():
646650
],
647651
)
648652

649-
result = series.loc[[7606741985629028552, 17876870360202815256]]
653+
result = series.loc[box([7606741985629028552, 17876870360202815256])]
650654

651655
expected = UInt64Index(
652656
[7606741985629028552, 17876870360202815256, 17876870360202815256],

0 commit comments

Comments
 (0)