Skip to content

Commit ea9ed11

Browse files
authored
CLN: tests, annotations (#43186)
1 parent 5332a8d commit ea9ed11

File tree

3 files changed

+27
-27
lines changed

3 files changed

+27
-27
lines changed

pandas/core/generic.py

-2
Original file line numberDiff line numberDiff line change
@@ -4816,7 +4816,6 @@ def reindex(self: FrameOrSeries, *args, **kwargs) -> FrameOrSeries:
48164816
axes, level, limit, tolerance, method, fill_value, copy
48174817
).__finalize__(self, method="reindex")
48184818

4819-
@final
48204819
def _reindex_axes(
48214820
self: FrameOrSeries, axes, level, limit, tolerance, method, fill_value, copy
48224821
) -> FrameOrSeries:
@@ -8977,7 +8976,6 @@ def where(
89778976

89788977
return self._where(cond, other, inplace, axis, level, errors=errors)
89798978

8980-
@final
89818979
@doc(
89828980
where,
89838981
klass=_shared_doc_kwargs["klass"],

pandas/core/groupby/groupby.py

-2
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,6 @@ def ohlc(self) -> DataFrame:
19601960
lambda x: x.ohlc(), self._obj_with_exclusions
19611961
)
19621962

1963-
@final
19641963
@doc(DataFrame.describe)
19651964
def describe(self, **kwargs):
19661965
with group_selection_context(self):
@@ -3093,7 +3092,6 @@ def shift(self, periods=1, freq=None, axis=0, fill_value=None):
30933092
)
30943093
return res
30953094

3096-
@final
30973095
@Substitution(name="groupby")
30983096
@Appender(_common_see_also)
30993097
def pct_change(self, periods=1, fill_method="pad", limit=None, freq=None, axis=0):

pandas/tests/generic/test_series.py

+27-23
Original file line numberDiff line numberDiff line change
@@ -19,38 +19,38 @@ class TestSeries(Generic):
1919

2020
@pytest.mark.parametrize("func", ["rename_axis", "_set_axis_name"])
2121
def test_set_axis_name_mi(self, func):
22-
s = Series(
22+
ser = Series(
2323
[11, 21, 31],
2424
index=MultiIndex.from_tuples(
2525
[("A", x) for x in ["a", "B", "c"]], names=["l1", "l2"]
2626
),
2727
)
2828

29-
result = methodcaller(func, ["L1", "L2"])(s)
30-
assert s.index.name is None
31-
assert s.index.names == ["l1", "l2"]
29+
result = methodcaller(func, ["L1", "L2"])(ser)
30+
assert ser.index.name is None
31+
assert ser.index.names == ["l1", "l2"]
3232
assert result.index.name is None
3333
assert result.index.names, ["L1", "L2"]
3434

3535
def test_set_axis_name_raises(self):
36-
s = Series([1])
36+
ser = Series([1])
3737
msg = "No axis named 1 for object type Series"
3838
with pytest.raises(ValueError, match=msg):
39-
s._set_axis_name(name="a", axis=1)
39+
ser._set_axis_name(name="a", axis=1)
4040

4141
def test_get_bool_data_preserve_dtype(self):
42-
o = Series([True, False, True])
43-
result = o._get_bool_data()
44-
self._compare(result, o)
42+
ser = Series([True, False, True])
43+
result = ser._get_bool_data()
44+
self._compare(result, ser)
4545

4646
def test_nonzero_single_element(self):
4747

4848
# allow single item via bool method
49-
s = Series([True])
50-
assert s.bool()
49+
ser = Series([True])
50+
assert ser.bool()
5151

52-
s = Series([False])
53-
assert not s.bool()
52+
ser = Series([False])
53+
assert not ser.bool()
5454

5555
@pytest.mark.parametrize("data", [np.nan, pd.NaT, True, False])
5656
def test_nonzero_single_element_raise_1(self, data):
@@ -112,25 +112,29 @@ def test_metadata_propagation_indiv_resample(self):
112112
def test_metadata_propagation_indiv(self):
113113
# check that the metadata matches up on the resulting ops
114114

115-
o = Series(range(3), range(3))
116-
o.name = "foo"
117-
o2 = Series(range(3), range(3))
118-
o2.name = "bar"
115+
ser = Series(range(3), range(3))
116+
ser.name = "foo"
117+
ser2 = Series(range(3), range(3))
118+
ser2.name = "bar"
119119

120-
result = o.T
121-
self.check_metadata(o, result)
120+
result = ser.T
121+
self.check_metadata(ser, result)
122122

123123
_metadata = Series._metadata
124124
_finalize = Series.__finalize__
125125
Series._metadata = ["name", "filename"]
126-
o.filename = "foo"
127-
o2.filename = "bar"
126+
ser.filename = "foo"
127+
ser2.filename = "bar"
128128

129129
def finalize(self, other, method=None, **kwargs):
130130
for name in self._metadata:
131131
if method == "concat" and name == "filename":
132132
value = "+".join(
133-
[getattr(o, name) for o in other.objs if getattr(o, name, None)]
133+
[
134+
getattr(obj, name)
135+
for obj in other.objs
136+
if getattr(obj, name, None)
137+
]
134138
)
135139
object.__setattr__(self, name, value)
136140
else:
@@ -140,7 +144,7 @@ def finalize(self, other, method=None, **kwargs):
140144

141145
Series.__finalize__ = finalize
142146

143-
result = pd.concat([o, o2])
147+
result = pd.concat([ser, ser2])
144148
assert result.filename == "foo+bar"
145149
assert result.name is None
146150

0 commit comments

Comments
 (0)