Skip to content

Commit 4e46d69

Browse files
committed
Refinements
1 parent 054398d commit 4e46d69

File tree

7 files changed

+141
-99
lines changed

7 files changed

+141
-99
lines changed

pandas/core/frame.py

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11910,9 +11910,7 @@ def all(
1191011910
**kwargs,
1191111911
) -> Series | bool: ...
1191211912

11913-
@deprecate_nonkeyword_arguments(
11914-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="all"
11915-
)
11913+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="all")
1191611914
@doc(make_doc("all", ndim=1))
1191711915
def all(
1191811916
self,
@@ -11959,9 +11957,7 @@ def min(
1195911957
**kwargs,
1196011958
) -> Series | Any: ...
1196111959

11962-
@deprecate_nonkeyword_arguments(
11963-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="min"
11964-
)
11960+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="min")
1196511961
@doc(make_doc("min", ndim=2))
1196611962
def min(
1196711963
self,
@@ -12008,9 +12004,7 @@ def max(
1200812004
**kwargs,
1200912005
) -> Series | Any: ...
1201012006

12011-
@deprecate_nonkeyword_arguments(
12012-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="max"
12013-
)
12007+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="max")
1201412008
@doc(make_doc("max", ndim=2))
1201512009
def max(
1201612010
self,
@@ -12026,9 +12020,7 @@ def max(
1202612020
result = result.__finalize__(self, method="max")
1202712021
return result
1202812022

12029-
@deprecate_nonkeyword_arguments(
12030-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="sum"
12031-
)
12023+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="sum")
1203212024
def sum(
1203312025
self,
1203412026
axis: Axis | None = 0,
@@ -12129,9 +12121,7 @@ def sum(
1212912121
result = result.__finalize__(self, method="sum")
1213012122
return result
1213112123

12132-
@deprecate_nonkeyword_arguments(
12133-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="prod"
12134-
)
12124+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="prod")
1213512125
def prod(
1213612126
self,
1213712127
axis: Axis | None = 0,
@@ -12249,9 +12239,7 @@ def mean(
1224912239
**kwargs,
1225012240
) -> Series | Any: ...
1225112241

12252-
@deprecate_nonkeyword_arguments(
12253-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="mean"
12254-
)
12242+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="mean")
1225512243
@doc(make_doc("mean", ndim=2))
1225612244
def mean(
1225712245
self,
@@ -12299,7 +12287,7 @@ def median(
1229912287
) -> Series | Any: ...
1230012288

1230112289
@deprecate_nonkeyword_arguments(
12302-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="median"
12290+
Pandas4Warning, allowed_args=["self"], name="median"
1230312291
)
1230412292
@doc(make_doc("median", ndim=2))
1230512293
def median(
@@ -12350,9 +12338,7 @@ def sem(
1235012338
**kwargs,
1235112339
) -> Series | Any: ...
1235212340

12353-
@deprecate_nonkeyword_arguments(
12354-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="sem"
12355-
)
12341+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="sem")
1235612342
def sem(
1235712343
self,
1235812344
axis: Axis | None = 0,
@@ -12472,9 +12458,7 @@ def var(
1247212458
**kwargs,
1247312459
) -> Series | Any: ...
1247412460

12475-
@deprecate_nonkeyword_arguments(
12476-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="var"
12477-
)
12461+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="var")
1247812462
def var(
1247912463
self,
1248012464
axis: Axis | None = 0,
@@ -12593,9 +12577,7 @@ def std(
1259312577
**kwargs,
1259412578
) -> Series | Any: ...
1259512579

12596-
@deprecate_nonkeyword_arguments(
12597-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="std"
12598-
)
12580+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="std")
1259912581
def std(
1260012582
self,
1260112583
axis: Axis | None = 0,
@@ -12718,9 +12700,7 @@ def skew(
1271812700
**kwargs,
1271912701
) -> Series | Any: ...
1272012702

12721-
@deprecate_nonkeyword_arguments(
12722-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="skew"
12723-
)
12703+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="skew")
1272412704
def skew(
1272512705
self,
1272612706
axis: Axis | None = 0,
@@ -12840,9 +12820,7 @@ def kurt(
1284012820
**kwargs,
1284112821
) -> Series | Any: ...
1284212822

12843-
@deprecate_nonkeyword_arguments(
12844-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="kurt"
12845-
)
12823+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="kurt")
1284612824
def kurt(
1284712825
self,
1284812826
axis: Axis | None = 0,

pandas/core/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4387,7 +4387,7 @@ def _check_copy_deprecation(copy):
43874387
)
43884388

43894389
# issue 58667
4390-
@deprecate_kwarg("method", klass=Pandas4Warning, new_arg_name=None)
4390+
@deprecate_kwarg(Pandas4Warning, "method", new_arg_name=None)
43914391
@final
43924392
def reindex_like(
43934393
self,

pandas/core/series.py

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,10 +1473,7 @@ def to_string(
14731473
) -> None: ...
14741474

14751475
@deprecate_nonkeyword_arguments(
1476-
version="4.0",
1477-
klass=Pandas4Warning,
1478-
allowed_args=["self", "buf"],
1479-
name="to_string",
1476+
Pandas4Warning, allowed_args=["self", "buf"], name="to_string"
14801477
)
14811478
def to_string(
14821479
self,
@@ -1634,10 +1631,7 @@ def to_markdown(
16341631
),
16351632
)
16361633
@deprecate_nonkeyword_arguments(
1637-
version="4.0",
1638-
klass=Pandas4Warning,
1639-
allowed_args=["self", "buf"],
1640-
name="to_markdown",
1634+
Pandas4Warning, allowed_args=["self", "buf"], name="to_markdown"
16411635
)
16421636
def to_markdown(
16431637
self,
@@ -6650,9 +6644,7 @@ def any( # type: ignore[override]
66506644
filter_type="bool",
66516645
)
66526646

6653-
@deprecate_nonkeyword_arguments(
6654-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="all"
6655-
)
6647+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="all")
66566648
@Appender(make_doc("all", ndim=1))
66576649
def all(
66586650
self,
@@ -6672,9 +6664,7 @@ def all(
66726664
filter_type="bool",
66736665
)
66746666

6675-
@deprecate_nonkeyword_arguments(
6676-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="min"
6677-
)
6667+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="min")
66786668
def min(
66796669
self,
66806670
axis: Axis | None = 0,
@@ -6745,9 +6735,7 @@ def min(
67456735
self, axis=axis, skipna=skipna, numeric_only=numeric_only, **kwargs
67466736
)
67476737

6748-
@deprecate_nonkeyword_arguments(
6749-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="max"
6750-
)
6738+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="max")
67516739
def max(
67526740
self,
67536741
axis: Axis | None = 0,
@@ -6818,9 +6806,7 @@ def max(
68186806
self, axis=axis, skipna=skipna, numeric_only=numeric_only, **kwargs
68196807
)
68206808

6821-
@deprecate_nonkeyword_arguments(
6822-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="sum"
6823-
)
6809+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="sum")
68246810
def sum(
68256811
self,
68266812
axis: Axis | None = None,
@@ -6921,9 +6907,7 @@ def sum(
69216907
**kwargs,
69226908
)
69236909

6924-
@deprecate_nonkeyword_arguments(
6925-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="prod"
6926-
)
6910+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="prod")
69276911
@doc(make_doc("prod", ndim=1))
69286912
def prod(
69296913
self,
@@ -6942,9 +6926,7 @@ def prod(
69426926
**kwargs,
69436927
)
69446928

6945-
@deprecate_nonkeyword_arguments(
6946-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="mean"
6947-
)
6929+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="mean")
69486930
def mean(
69496931
self,
69506932
axis: Axis | None = 0,
@@ -6999,7 +6981,7 @@ def mean(
69996981
)
70006982

70016983
@deprecate_nonkeyword_arguments(
7002-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="median"
6984+
Pandas4Warning, allowed_args=["self"], name="median"
70036985
)
70046986
def median(
70056987
self,
@@ -7081,9 +7063,7 @@ def median(
70817063
self, axis=axis, skipna=skipna, numeric_only=numeric_only, **kwargs
70827064
)
70837065

7084-
@deprecate_nonkeyword_arguments(
7085-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="sem"
7086-
)
7066+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="sem")
70877067
@doc(make_doc("sem", ndim=1))
70887068
def sem(
70897069
self,
@@ -7102,9 +7082,7 @@ def sem(
71027082
**kwargs,
71037083
)
71047084

7105-
@deprecate_nonkeyword_arguments(
7106-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="var"
7107-
)
7085+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="var")
71087086
def var(
71097087
self,
71107088
axis: Axis | None = None,
@@ -7191,9 +7169,7 @@ def var(
71917169
**kwargs,
71927170
)
71937171

7194-
@deprecate_nonkeyword_arguments(
7195-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="std"
7196-
)
7172+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="std")
71977173
@doc(make_doc("std", ndim=1))
71987174
def std(
71997175
self,
@@ -7212,9 +7188,7 @@ def std(
72127188
**kwargs,
72137189
)
72147190

7215-
@deprecate_nonkeyword_arguments(
7216-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="skew"
7217-
)
7191+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="skew")
72187192
@doc(make_doc("skew", ndim=1))
72197193
def skew(
72207194
self,
@@ -7227,9 +7201,7 @@ def skew(
72277201
self, axis=axis, skipna=skipna, numeric_only=numeric_only, **kwargs
72287202
)
72297203

7230-
@deprecate_nonkeyword_arguments(
7231-
version="4.0", klass=Pandas4Warning, allowed_args=["self"], name="kurt"
7232-
)
7204+
@deprecate_nonkeyword_arguments(Pandas4Warning, allowed_args=["self"], name="kurt")
72337205
def kurt(
72347206
self,
72357207
axis: Axis | None = 0,

pandas/errors/__init__.py

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,36 +94,90 @@ class PerformanceWarning(Warning):
9494
class PandasChangeWarning(Warning):
9595
"""
9696
Warning raised for any an upcoming change.
97+
98+
See Also
99+
--------
100+
errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
101+
102+
Examples
103+
--------
104+
>>> pd.errors.PandasChangeWarning
105+
<class 'pandas.errors.PandasChangeWarning'>
97106
"""
98107

99108

100109
class PandasPendingDeprecationWarning(PandasChangeWarning, PendingDeprecationWarning):
101110
"""
102111
Warning raised for an upcoming change that is a PendingDeprecationWarning.
112+
113+
See Also
114+
--------
115+
errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
116+
117+
Examples
118+
--------
119+
>>> pd.errors.PandasPendingDeprecationWarning
120+
<class 'pandas.errors.PandasPendingDeprecationWarning'>
103121
"""
104122

105123

106124
class PandasDeprecationWarning(PandasChangeWarning, DeprecationWarning):
107125
"""
108126
Warning raised for an upcoming change that is a DeprecationWarning.
127+
128+
See Also
129+
--------
130+
errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
131+
132+
Examples
133+
--------
134+
>>> pd.errors.PandasDeprecationWarning
135+
<class 'pandas.errors.PandasDeprecationWarning'>
109136
"""
110137

111138

112139
class PandasFutureWarning(PandasChangeWarning, FutureWarning):
113140
"""
114141
Warning raised for an upcoming change that is a FutureWarning.
142+
143+
See Also
144+
--------
145+
errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
146+
147+
Examples
148+
--------
149+
>>> pd.errors.PandasFutureWarning
150+
<class 'pandas.errors.PandasFutureWarning'>
115151
"""
116152

117153

118154
class Pandas4Warning(PandasDeprecationWarning):
119155
"""
120156
Warning raised for an upcoming change that will be enforced in pandas 4.0.
157+
158+
See Also
159+
--------
160+
errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
161+
162+
Examples
163+
--------
164+
>>> pd.errors.Pandas4Warning
165+
<class 'pandas.errors.Pandas4Warning'>
121166
"""
122167

123168

124169
class Pandas5Warning(PandasPendingDeprecationWarning):
125170
"""
126171
Warning raised for an upcoming change that will be enforced in pandas 5.0.
172+
173+
See Also
174+
--------
175+
errors.Pandas4Warning : Class for deprecations to be enforced in pandas 4.0.
176+
177+
Examples
178+
--------
179+
>>> pd.errors.Pandas5Warning
180+
<class 'pandas.errors.Pandas5Warning'>
127181
"""
128182

129183

@@ -968,6 +1022,12 @@ class InvalidComparison(Exception):
9681022
"OptionError",
9691023
"OutOfBoundsDatetime",
9701024
"OutOfBoundsTimedelta",
1025+
"Pandas4Warning",
1026+
"Pandas5Warning",
1027+
"PandasChangeWarning",
1028+
"PandasDeprecationWarning",
1029+
"PandasFutureWarning",
1030+
"PandasPendingDeprecationWarning",
9711031
"ParserError",
9721032
"ParserWarning",
9731033
"PerformanceWarning",

0 commit comments

Comments
 (0)