|
23 | 23 | DatetimeIndex,
|
24 | 24 | Index,
|
25 | 25 | IndexSlice,
|
| 26 | + Int64Index, |
26 | 27 | MultiIndex,
|
27 | 28 | Period,
|
28 | 29 | RangeIndex,
|
|
37 | 38 | to_timedelta,
|
38 | 39 | )
|
39 | 40 | import pandas._testing as tm
|
40 |
| -from pandas.errors import InvalidIndexError |
41 | 41 | from pandas.api.types import is_scalar
|
42 | 42 | from pandas.tests.indexing.common import Base
|
43 | 43 |
|
@@ -2092,56 +2092,51 @@ class TestLocBooleanLabelsAndSlices(Base):
|
2092 | 2092 | @pytest.mark.parametrize(
|
2093 | 2093 | "index",
|
2094 | 2094 | [
|
2095 |
| - pd.RangeIndex(4), |
2096 |
| - pd.Int64Index(range(4)), |
2097 |
| - pd.UInt64Index(range(4)), |
| 2095 | + RangeIndex(4), |
| 2096 | + Int64Index(range(4)), |
| 2097 | + UInt64Index(range(4)), |
2098 | 2098 | pd.Float64Index(range(4)),
|
2099 |
| - pd.CategoricalIndex(range(4)), |
2100 |
| - pd.date_range(0, periods=4, freq="ns"), |
2101 |
| - pd.timedelta_range(0, periods=4, freq="ns"), |
| 2099 | + CategoricalIndex(range(4)), |
| 2100 | + date_range(0, periods=4, freq="ns"), |
| 2101 | + timedelta_range(0, periods=4, freq="ns"), |
2102 | 2102 | pd.interval_range(0, periods=4),
|
2103 |
| - pd.Index([0, 1, 2, 3], dtype=object), |
2104 |
| - pd.MultiIndex.from_product([[0, 1], [0, 1]]), |
2105 |
| - pd.period_range("2018Q1", freq="Q", periods=4) |
2106 |
| - ] |
| 2103 | + Index([0, 1, 2, 3], dtype=object), |
| 2104 | + MultiIndex.from_product([[0, 1], [0, 1]]), |
| 2105 | + pd.period_range("2018Q1", freq="Q", periods=4), |
| 2106 | + ], |
2107 | 2107 | )
|
2108 | 2108 | def test_loc_bool_incompatible_index_raises(self, index, frame_or_series):
|
2109 | 2109 | # GH20432
|
2110 |
| - message = 'Boolean label can not be used without a boolean index' |
| 2110 | + message = "Boolean label can not be used without a boolean index" |
2111 | 2111 | obj = frame_or_series(range(4), index=index)
|
2112 | 2112 | with pytest.raises(TypeError, match=message):
|
2113 | 2113 | obj.loc[True]
|
2114 | 2114 |
|
2115 |
| - @pytest.mark.parametrize( |
2116 |
| - "index", |
2117 |
| - [ |
2118 |
| - pd.Index([True, False], dtype="boolean") |
2119 |
| - ] |
2120 |
| - ) |
| 2115 | + @pytest.mark.parametrize("index", [Index([True, False], dtype="boolean")]) |
2121 | 2116 | def test_loc_bool_should_not_raise(self, index, frame_or_series):
|
2122 | 2117 | obj = frame_or_series(range(2), index=index)
|
2123 | 2118 | obj.loc[True]
|
2124 | 2119 |
|
2125 | 2120 | @pytest.mark.parametrize(
|
2126 | 2121 | "index",
|
2127 | 2122 | [
|
2128 |
| - pd.RangeIndex(4), |
2129 |
| - pd.Int64Index(range(4)), |
2130 |
| - pd.UInt64Index(range(4)), |
| 2123 | + RangeIndex(4), |
| 2124 | + Int64Index(range(4)), |
| 2125 | + UInt64Index(range(4)), |
2131 | 2126 | pd.Float64Index(range(4)),
|
2132 |
| - pd.CategoricalIndex(range(4)), |
2133 |
| - pd.date_range(0, periods=4, freq="ns"), |
2134 |
| - pd.timedelta_range(0, periods=4, freq="ns"), |
| 2127 | + CategoricalIndex(range(4)), |
| 2128 | + date_range(0, periods=4, freq="ns"), |
| 2129 | + timedelta_range(0, periods=4, freq="ns"), |
2135 | 2130 | pd.interval_range(0, periods=4),
|
2136 |
| - pd.Index([0, 1, 2, 3], dtype=object), |
2137 |
| - pd.Index([True, True, False, False], dtype=object), |
2138 |
| - pd.MultiIndex.from_product([[0, 1], [0, 1]]), |
2139 |
| - pd.period_range("2018Q1", freq="Q", periods=4) |
2140 |
| - ] |
| 2131 | + Index([0, 1, 2, 3], dtype=object), |
| 2132 | + Index([True, True, False, False], dtype=object), |
| 2133 | + MultiIndex.from_product([[0, 1], [0, 1]]), |
| 2134 | + pd.period_range("2018Q1", freq="Q", periods=4), |
| 2135 | + ], |
2141 | 2136 | )
|
2142 | 2137 | def test_loc_bool_slice_raises(self, index, frame_or_series):
|
2143 | 2138 | # GH20432
|
2144 |
| - message = 'Boolean values can not be used in a slice' |
| 2139 | + message = "Boolean values can not be used in a slice" |
2145 | 2140 | obj = frame_or_series(range(4), index=index)
|
2146 | 2141 | with pytest.raises(TypeError, match=message):
|
2147 | 2142 | obj.loc[True:False]
|
|
0 commit comments