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.

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

BUG: Fix strange behaviour of Series.iloc on MultiIndex Series (#17148) #17291

Merged
merged 4 commits into from
Aug 22, 2017
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.21.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,7 @@ Indexing
- Fixes ``DataFrame.loc`` for setting with alignment and tz-aware ``DatetimeIndex`` (:issue:`16889`)
- Avoids ``IndexError`` when passing an Index or Series to ``.iloc`` with older numpy (:issue:`17193`)
- Allow unicode empty strings as placeholders in multilevel columns in Python 2 (:issue:`17099`)
- Bug in :func:`Series.iloc` when used with inplace addition or assignment and an int indexer on a ``MultiIndex`` ``Series`` causing the wrong indexes to be read from and written to (:issue:`17148`)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its a bug in .iloc not restricted to Series


I/O
^^^
Expand Down
3 changes: 2 additions & 1 deletion pandas/core/indexing.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ def _get_setitem_indexer(self, key):
return self._convert_tuple(key, is_setter=True)

axis = self.obj._get_axis(0)
if isinstance(axis, MultiIndex):

if isinstance(axis, MultiIndex) and not is_integer(key):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use self.name != 'iloc', and use a tests that fails this (IOW a MultiIndex with an integer first level that does not match the positions)

try:
return axis.get_loc(key)
except Exception:
Expand Down
34 changes: 34 additions & 0 deletions pandas/tests/indexing/test_iloc.py
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,40 @@ def test_iloc_setitem(self):
expected = Series([0, 1, 0], index=[4, 5, 6])
tm.assert_series_equal(s, expected)

def test_iloc_setitem_int_multiindex_series(self):
# GH17148
def check_scenario(data, indexes, values, expected_k):
df = pd.DataFrame(
data=data,
columns=['i', 'j', 'k'])
df.set_index(['i', 'j'], inplace=True)

series = df.k.copy()
for i, v in zip(indexes, values):
series.iloc[i] += v

df.k = expected_k
expected = df.k.copy()
tm.assert_series_equal(series, expected)

check_scenario(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

parametrize this test

data=[[1, 22, 5], [1, 33, 6]],
indexes=[0, -1, 1],
values=[2, 3, 1],
expected_k=[7, 10])

check_scenario(
data=[[1, 3, 7], [2, 4, 8]],
indexes=[0, -1, 1],
values=[1, 1, 10],
expected_k=[8, 19])

check_scenario(
data=[[1, 11, 4], [2, 22, 5], [3, 33, 6]],
indexes=[0, -1, 1],
values=[4, 7, 10],
expected_k=[8, 15, 13])

def test_iloc_setitem_list(self):

# setitem with an iloc list
Expand Down