Skip to content

Commit 2b07ab0

Browse files
committed
CLN: remove unneeded try... except
1 parent 2a64630 commit 2b07ab0

File tree

1 file changed

+23
-25
lines changed

1 file changed

+23
-25
lines changed

pandas/core/indexing.py

+23-25
Original file line numberDiff line numberDiff line change
@@ -1132,33 +1132,31 @@ def _get_listlike_indexer(self, key, axis, raise_missing=False):
11321132
"""
11331133
o = self.obj
11341134
ax = o._get_axis(axis)
1135-
try:
1136-
# Have the index compute an indexer or return None
1137-
# if it cannot handle:
1138-
indexer, keyarr = ax._convert_listlike_indexer(key,
1139-
kind=self.name)
1140-
# We only act on all found values:
1141-
if indexer is not None and (indexer != -1).all():
1142-
self._validate_read_indexer(key, indexer, axis,
1143-
raise_missing=raise_missing)
1144-
return ax[indexer], indexer
1145-
1146-
if ax.is_unique:
1147-
# If we are trying to get actual keys from empty Series, we
1148-
# patiently wait for a KeyError later on - otherwise, convert
1149-
if len(ax) or not len(key):
1150-
key = self._convert_for_reindex(key, axis)
1151-
indexer = ax.get_indexer_for(key)
1152-
keyarr = ax.reindex(keyarr)[0]
1153-
else:
1154-
keyarr, indexer, new_indexer = ax._reindex_non_unique(keyarr)
11551135

1156-
self._validate_read_indexer(keyarr, indexer,
1157-
o._get_axis_number(axis),
1136+
# Have the index compute an indexer or return None
1137+
# if it cannot handle:
1138+
indexer, keyarr = ax._convert_listlike_indexer(key,
1139+
kind=self.name)
1140+
# We only act on all found values:
1141+
if indexer is not None and (indexer != -1).all():
1142+
self._validate_read_indexer(key, indexer, axis,
11581143
raise_missing=raise_missing)
1159-
return keyarr, indexer
1160-
except (KeyError, IndexingError) as detail:
1161-
raise self._exception(detail)
1144+
return ax[indexer], indexer
1145+
1146+
if ax.is_unique:
1147+
# If we are trying to get actual keys from empty Series, we
1148+
# patiently wait for a KeyError later on - otherwise, convert
1149+
if len(ax) or not len(key):
1150+
key = self._convert_for_reindex(key, axis)
1151+
indexer = ax.get_indexer_for(key)
1152+
keyarr = ax.reindex(keyarr)[0]
1153+
else:
1154+
keyarr, indexer, new_indexer = ax._reindex_non_unique(keyarr)
1155+
1156+
self._validate_read_indexer(keyarr, indexer,
1157+
o._get_axis_number(axis),
1158+
raise_missing=raise_missing)
1159+
return keyarr, indexer
11621160

11631161
def _getitem_iterable(self, key, axis=None):
11641162
"""

0 commit comments

Comments
 (0)