|
6 | 6 | import pytest
|
7 | 7 |
|
8 | 8 | import pandas as pd
|
9 |
| -from pandas import DataFrame, Series, Timestamp, date_range |
| 9 | +from pandas import DataFrame, Period, Series, Timestamp, date_range, period_range |
10 | 10 | from pandas.api.types import is_scalar
|
11 | 11 | from pandas.tests.indexing.common import Base
|
12 | 12 | import pandas.util.testing as tm
|
@@ -939,6 +939,71 @@ def test_loc_reverse_assignment(self):
|
939 | 939 |
|
940 | 940 | tm.assert_series_equal(result, expected)
|
941 | 941 |
|
| 942 | + @pytest.mark.parametrize( |
| 943 | + "idx,labels,expected_idx", |
| 944 | + [ |
| 945 | + ( |
| 946 | + period_range(start="2000", periods=20, freq="D"), |
| 947 | + ["2000-01-04", "2000-01-08", "2000-01-12"], |
| 948 | + [ |
| 949 | + Period("2000-01-04", freq="D"), |
| 950 | + Period("2000-01-08", freq="D"), |
| 951 | + Period("2000-01-12", freq="D"), |
| 952 | + ], |
| 953 | + ), |
| 954 | + ( |
| 955 | + date_range(start="2000", periods=20, freq="D"), |
| 956 | + ["2000-01-04", "2000-01-08", "2000-01-12"], |
| 957 | + [ |
| 958 | + Timestamp("2000-01-04", freq="D"), |
| 959 | + Timestamp("2000-01-08", freq="D"), |
| 960 | + Timestamp("2000-01-12", freq="D"), |
| 961 | + ], |
| 962 | + ), |
| 963 | + ], |
| 964 | + ) |
| 965 | + def test_loc_with_datetime_string_list(self, idx, labels, expected_idx): |
| 966 | + # GH 11278 |
| 967 | + s = Series(range(20), index=idx) |
| 968 | + df = DataFrame(range(20), index=idx) |
| 969 | + |
| 970 | + expected_value = [3, 7, 11] |
| 971 | + expected_s = Series(expected_value, expected_idx) |
| 972 | + expected_df = DataFrame(expected_value, expected_idx) |
| 973 | + |
| 974 | + tm.assert_series_equal(expected_s, s.loc[labels]) |
| 975 | + tm.assert_series_equal(expected_s, s[labels]) |
| 976 | + tm.assert_frame_equal(expected_df, df.loc[labels]) |
| 977 | + |
| 978 | + @pytest.mark.parametrize( |
| 979 | + "idx,labels,msg", |
| 980 | + [ |
| 981 | + ( |
| 982 | + period_range(start="2000", periods=20, freq="D"), |
| 983 | + ["2000-01-04", "2000-01-30"], |
| 984 | + r"None of \[PeriodIndex\(\['2000-01-04', '2000-01-30'\], " |
| 985 | + r"dtype='period\[D\]', freq='D'\)\] are in the \[index\]", |
| 986 | + ), |
| 987 | + ( |
| 988 | + date_range(start="2000", periods=20, freq="D"), |
| 989 | + ["2000-01-04", "2000-01-30"], |
| 990 | + r"None of \[DatetimeIndex\(\['2000-01-04', '2000-01-30'\], " |
| 991 | + r"dtype='datetime64\[ns\]', freq=None\)\] are in the \[index\]", |
| 992 | + ), |
| 993 | + ], |
| 994 | + ) |
| 995 | + def test_loc_with_datetime_string_and_missing_value(self, idx, labels, msg): |
| 996 | + # GH 11278 |
| 997 | + s = Series(range(20), index=idx) |
| 998 | + df = DataFrame(range(20), index=idx) |
| 999 | + |
| 1000 | + with pytest.raises(KeyError, match=msg): |
| 1001 | + s.loc[labels] |
| 1002 | + with pytest.raises(KeyError, match=msg): |
| 1003 | + s[labels] |
| 1004 | + with pytest.raises(KeyError, match=msg): |
| 1005 | + df.loc[labels] |
| 1006 | + |
942 | 1007 |
|
943 | 1008 | def test_series_loc_getitem_label_list_missing_values():
|
944 | 1009 | # gh-11428
|
|
0 commit comments