Skip to content

Fix regression for loc and __setitem__ when one-dimensional tuple was given for MultiIndex #37787

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

Merged
merged 8 commits into from
Nov 14, 2020
Merged

Fix regression for loc and __setitem__ when one-dimensional tuple was given for MultiIndex #37787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8ccfd5a
Fix regression for loc and __setitem__ when one-dimensional tuple was…
phofl Nov 12, 2020
8113cf4
Use fixture to parametrize test
phofl Nov 12, 2020
5944255
Move whatsnew and remove pass
phofl Nov 13, 2020
3ac69ff
Merge branch 'master' of https://github.com/pandas-dev/pandas into 37711
phofl Nov 13, 2020
e3f90be
Add new test
phofl Nov 13, 2020
2f8c6ed
Run black
phofl Nov 13, 2020
cc15da3
FIx typo
phofl Nov 14, 2020
f8c86f5
Merge branch 'master' of https://github.com/pandas-dev/pandas into 37711
phofl Nov 14, 2020
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/v1.1.5.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Fixed regressions
~~~~~~~~~~~~~~~~~
- Regression in addition of a timedelta-like scalar to a :class:`DatetimeIndex` raising incorrectly (:issue:`37295`)
- Fixed regression in :meth:`Series.groupby` raising when the :class:`Index` of the :class:`Series` had a tuple as its name (:issue:`37755`)
- Fixed regression in :meth:`DataFrame.loc` and :meth:`Series.loc` for ``__setitem__`` when one-dimensional tuple was given to select from :class:`MultiIndex` (:issue:`37711`)
-

.. ---------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions pandas/core/indexing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,9 @@ def _ensure_listlike_indexer(self, key, axis=None, value=None):
if self.ndim != 2:
return

if isinstance(key, tuple):
if isinstance(key, tuple) and not isinstance(self.obj.index, ABCMultiIndex):
# key may be a tuple if we are .loc
# in that case, set key to the column part of key
# if index is not a MultiIndex, set key to column part
key = key[column_axis]
axis = column_axis

Expand Down
17 changes: 17 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 @@ -288,6 +288,23 @@ def convert_nested_indexer(indexer_type, keys):

tm.assert_series_equal(result, expected)

def test_multiindex_loc_one_dimensional_tuple(self, frame_or_series):
Copy link
Contributor

Choose a reason for hiding this comment

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

can you parameterize over all of the selectors in the OP e.g. obj.loc[('a',), :] if its a DataFrame

Copy link
Member Author

Choose a reason for hiding this comment

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

Added tests for df, I think one of the cases mentioned there should raise and not work

# GH#37711
mi = MultiIndex.from_tuples([("a", "A"), ("b", "A")])
obj = frame_or_series([1, 2], index=mi)
obj.loc[("a",)] = 0
expected = frame_or_series([0, 2], index=mi)
tm.assert_equal(obj, expected)

@pytest.mark.parametrize("indexer", [("a",), ("a")])
def test_multiindex_one_dimensional_tuple_columns(self, indexer):
# GH#37711
mi = MultiIndex.from_tuples([("a", "A"), ("b", "A")])
obj = DataFrame([1, 2], index=mi)
obj.loc[indexer, :] = 0
expected = DataFrame([0, 2], index=mi)
tm.assert_frame_equal(obj, expected)


@pytest.mark.parametrize(
"indexer, pos",
Expand Down