Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BUG: Raise KeyError when indexing a Series with MultiIndex #26155

Merged
merged 17 commits into from
Apr 26, 2019
Merged

BUG: Raise KeyError when indexing a Series with MultiIndex #26155

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1cb75f9
'BUG14885'
ryanreh99 Apr 19, 2019
ff3a81f
Added KeyError Exception for MultiIndexes
ryanreh99 Apr 19, 2019
0369704
added KeyError and Exception blocks
ryanreh99 Apr 19, 2019
2fdacb5
removed unused import statement
ryanreh99 Apr 20, 2019
2c1b85b
shifted KeyError check position
ryanreh99 Apr 20, 2019
0f85550
added tests and fixed if statement
ryanreh99 Apr 20, 2019
51a1a3c
undo testcase change
ryanreh99 Apr 20, 2019
0ee36cd
import statements - linting
ryanreh99 Apr 20, 2019
5e06afe
Added whatsnew note and a DataFrame TestCase
ryanreh99 Apr 21, 2019
32404c5
Merge branch 'master' into my-first-branch
ryanreh99 Apr 21, 2019
467e1e7
removed blank line
ryanreh99 Apr 21, 2019
c7ce861
created new test_function
ryanreh99 Apr 22, 2019
b6ede73
edited whats new
ryanreh99 Apr 22, 2019
ac544af
add full stop
ryanreh99 Apr 23, 2019
de63fbe
minor changes
ryanreh99 Apr 23, 2019
b95ae88
more fixes
ryanreh99 Apr 24, 2019
2309e14
typo
ryanreh99 Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions pandas/core/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,12 @@ def _handle_lowerdim_multi_index_axis0(self, tup):
except TypeError:
# slices are unhashable
pass
except KeyError as ek:
# raise KeyError if number of indexers match
# else IndexingError will be raised
if (len(tup) == len(self.obj.index._levels)
ryanreh99 marked this conversation as resolved.
Show resolved Hide resolved
and len(tup) > self.obj.ndim):
raise ek
except Exception as e1:
if isinstance(tup[0], (slice, Index)):
raise IndexingError("Handle elsewhere")
ryanreh99 marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
3 changes: 1 addition & 2 deletions pandas/tests/indexing/multiindex/test_getitem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
import pytest

from pandas import DataFrame, Index, MultiIndex, Series
from pandas.core.indexing import IndexingError
from pandas.util import testing as tm

# ----------------------------------------------------------------------------
Expand Down Expand Up @@ -85,7 +84,7 @@ def test_series_getitem_returns_scalar(
@pytest.mark.parametrize('indexer,expected_error,expected_error_msg', [
(lambda s: s.__getitem__((2000, 3, 4)), KeyError, r"^356L?$"),
(lambda s: s[(2000, 3, 4)], KeyError, r"^356L?$"),
(lambda s: s.loc[(2000, 3, 4)], IndexingError, 'Too many indexers'),
(lambda s: s.loc[(2000, 3, 4)], KeyError, r"^356L?$"),
(lambda s: s.__getitem__(len(s)), IndexError, 'index out of bounds'),
(lambda s: s[len(s)], IndexError, 'index out of bounds'),
(lambda s: s.iloc[len(s)], IndexError,
Expand Down
9 changes: 9 additions & 0 deletions pandas/tests/indexing/multiindex/test_loc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import pandas as pd
from pandas import DataFrame, Index, MultiIndex, Series
from pandas.core.indexing import IndexingError
from pandas.util import testing as tm


Expand Down Expand Up @@ -130,6 +131,14 @@ def test_loc_multiindex(self):
with pytest.raises(KeyError, match=r"^2L?$"):
mi_int.ix[2]

s = Series(range(8), index=MultiIndex.from_product(
ryanreh99 marked this conversation as resolved.
Show resolved Hide resolved
[['a', 'b'], ['c', 'd'], ['e', 'f']]))

with pytest.raises(KeyError, match=r"^\('a', 'd', 'g'\)$"):
s.loc['a', 'd', 'g']
with pytest.raises(IndexingError, match='Too many indexers'):
s.loc['a', 'd', 'g', 'j']

def test_loc_multiindex_indexer_none(self):

# GH6788
Expand Down