@@ -1132,33 +1132,31 @@ def _get_listlike_indexer(self, key, axis, raise_missing=False):
1132
1132
"""
1133
1133
o = self .obj
1134
1134
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 )
1155
1135
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 ,
1158
1143
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
1162
1160
1163
1161
def _getitem_iterable (self , key , axis = None ):
1164
1162
"""
0 commit comments