Skip to content

Commit fb64041

Browse files
committed
BUG: loc misbehaves when Period is at start of 3-level MultiIndex
(#20684) If `MultiIndex` nlevel is 3 and first level index is `PeriodIndex`, `.loc` would raise exception with a miss match key
1 parent 96bf661 commit fb64041

File tree

4 files changed

+28
-5
lines changed

4 files changed

+28
-5
lines changed

doc/source/whatsnew/v1.0.0.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Missing
174174
MultiIndex
175175
^^^^^^^^^^
176176

177-
-
177+
- If `MultiIndex` nlevel is 3 and first level index in `MultiIndex` is `PeriodIndex` , `.loc` could not raise exception when key is not matched (:issue:`20684`)
178178
-
179179

180180
I/O

pandas/_libs/tslibs/parsing.pyx

+2-4
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,8 @@ def parse_time_string(arg, freq=None, dayfirst=None, yearfirst=None):
251251
-------
252252
datetime, datetime/dateutil.parser._result, str
253253
"""
254-
if not isinstance(arg, (str, unicode)):
255-
# Note: cython recognizes `unicode` in both py2/py3, optimizes
256-
# this check into a C call.
257-
return arg
254+
if not isinstance(arg, str):
255+
raise TypeError
258256

259257
if getattr(freq, "_typ", None) == "dateoffset":
260258
freq = freq.rule_code

pandas/tests/indexes/period/test_period.py

+15
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,21 @@ def test_insert(self):
617617
result = period_range("2017Q1", periods=4, freq="Q").insert(1, na)
618618
tm.assert_index_equal(result, expected)
619619

620+
def test_contains_raise_error_if_first_level_index_is_period_index(self):
621+
# issue 20684
622+
df = DataFrame(
623+
{
624+
"A": [Period("2019"), Period("2018")],
625+
"B": ["x1", "x2"],
626+
"C": ["y1", "y2"],
627+
"V1": [1, 2],
628+
"V2": [10, 20],
629+
}
630+
).set_index(["A", "B", "C"])
631+
msg = r"Period\('2019', 'A-DEC'\), 'foo', 'bar'"
632+
with pytest.raises(KeyError, match=msg):
633+
df.loc[(Period("2019"), "foo", "bar")]
634+
620635

621636
def test_maybe_convert_timedelta():
622637
pi = PeriodIndex(["2000", "2001"], freq="D")

pandas/tests/tslibs/test_parsing.py

+10
Original file line numberDiff line numberDiff line change
@@ -209,3 +209,13 @@ def test_try_parse_dates():
209209

210210
expected = np.array([parse(d, dayfirst=True) for d in arr])
211211
tm.assert_numpy_array_equal(result, expected)
212+
213+
214+
def test_parse_time_string_check_instance_type_raise_exception():
215+
# issue 20684
216+
with pytest.raises(TypeError):
217+
parse_time_string((1, 2, 3))
218+
219+
result = parse_time_string("2019")
220+
expected = (datetime(2019, 1, 1), datetime(2019, 1, 1), "year")
221+
assert result == expected

0 commit comments

Comments
 (0)