Skip to content

Commit 0837b9b

Browse files
committed
BUG: attempt at fixing pandas-dev#21574 - breaks several tests
1 parent 1033e8b commit 0837b9b

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

pandas/core/indexing.py

+4-6
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ def _get_label(self, label, axis=None):
139139
# but will fail when the index is not present
140140
# see GH5667
141141
return self.obj._xs(label, axis=axis)
142-
elif isinstance(label, tuple) and isinstance(label[axis], slice):
143-
raise IndexingError('no slices here, handle elsewhere')
144142

145143
return self.obj._xs(label, axis=axis)
146144

@@ -976,11 +974,11 @@ def _getitem_lowerdim(self, tup):
976974
if self._is_nested_tuple_indexer(tup):
977975
return self._getitem_nested_tuple(tup)
978976

979-
# we maybe be using a tuple to represent multiple dimensions here
977+
# A tuple is maybe a valid label (e.g. in a MultiIndex)
980978
ax0 = self.obj._get_axis(0)
981979
# ...but iloc should handle the tuple as simple integer-location
982-
# instead of checking it as multiindex representation (GH 13797)
983-
if isinstance(ax0, MultiIndex) and self.name != 'iloc':
980+
# instead (GH 13797)
981+
if self.name != 'iloc':
984982
result = self._handle_lowerdim_multi_index_axis0(tup)
985983
if result is not None:
986984
return result
@@ -1877,7 +1875,7 @@ def _getitem_axis(self, key, axis=None):
18771875
return self._get_slice_axis(key, axis=axis)
18781876
elif com.is_bool_indexer(key):
18791877
return self._getbool_axis(key, axis=axis)
1880-
elif is_list_like_indexer(key):
1878+
elif is_list_like_indexer(key) and not isinstance(key, tuple):
18811879

18821880
# convert various list-like indexers
18831881
# to a list of keys

0 commit comments

Comments
 (0)