Skip to content

Commit 7406607

Browse files
committed
Tweaked comments, adjusted tests
- Added test for a series with an index of tuples - Combined at/loc tests, agreeing with the style of other tests
1 parent 5861b4e commit 7406607

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

pandas/core/indexing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2058,7 +2058,7 @@ def _convert_key(self, key, is_setter: bool = False):
20582058
fallback)
20592059
"""
20602060
# For series, unpacking key needs to result in the label.
2061-
# This is already the case for non-multiindex
2061+
# This is already the case for len(key) == 1; e.g. (1,)
20622062
if isinstance(self.obj, ABCSeries) and len(key) > 1:
20632063
key = (key,)
20642064

pandas/tests/indexing/test_scalar.py

+12-9
Original file line numberDiff line numberDiff line change
@@ -305,27 +305,30 @@ def test_iat_dont_wrap_object_datetimelike():
305305
assert not isinstance(result, Timedelta)
306306

307307

308-
def test_multiindex_series_loc_get():
309-
series = pd.Series([1, 2], index=[[1, 2], [3, 4]])
310-
assert series.loc[1, 3] == 1
308+
def test_tuple_indexed_series_at_get():
309+
series = pd.Series([1, 2], index=[(1, 2), (3, 4)])
310+
assert series.at[1, 2] == 1
311311

312312

313-
def test_multiindex_series_loc_set():
314-
series = pd.Series([1, 2], index=[[1, 2], [3, 4]])
315-
series.loc[1, 3] = 3
316-
assert series.loc[1, 3] == 3
313+
def test_tuple_indexed_series_at_set():
314+
series = pd.Series([1, 2], index=[(1, 2), (3, 4)])
315+
series.at[1, 2] = 3
316+
assert series.at[1, 2] == 3
317317

318318

319319
def test_multiindex_series_at_get():
320320
# GH 26989
321-
# Series with multiindex at getter raises TypeError
321+
# series.at works with multiindex
322322
series = pd.Series([1, 2], index=[[1, 2], [3, 4]])
323323
assert series.at[1, 3] == 1
324+
assert series.loc[1, 3] == 1
324325

325326

326327
def test_multiindex_series_at_set():
327328
# GH 26989
328-
# Series with multiindex at setter raises ValueError
329+
# series.at works with multiindex
329330
series = pd.Series([1, 2], index=[[1, 2], [3, 4]])
330331
series.at[1, 3] = 3
331332
assert series.at[1, 3] == 3
333+
series.loc[1, 3] = 4
334+
assert series.loc[1, 3] == 4

0 commit comments

Comments
 (0)