Skip to content

Commit 2bf1df9

Browse files
authored
TYP: Return type for eq/ne/div/... (#54725)
1 parent a180f0f commit 2bf1df9

File tree

2 files changed

+70
-42
lines changed

2 files changed

+70
-42
lines changed

pandas/core/frame.py

+48-20
Original file line numberDiff line numberDiff line change
@@ -8067,71 +8067,85 @@ def _flex_cmp_method(self, other, op, *, axis: Axis = "columns", level=None):
80678067
return self._construct_result(new_data)
80688068

80698069
@Appender(ops.make_flex_doc("eq", "dataframe"))
8070-
def eq(self, other, axis: Axis = "columns", level=None):
8070+
def eq(self, other, axis: Axis = "columns", level=None) -> DataFrame:
80718071
return self._flex_cmp_method(other, operator.eq, axis=axis, level=level)
80728072

80738073
@Appender(ops.make_flex_doc("ne", "dataframe"))
8074-
def ne(self, other, axis: Axis = "columns", level=None):
8074+
def ne(self, other, axis: Axis = "columns", level=None) -> DataFrame:
80758075
return self._flex_cmp_method(other, operator.ne, axis=axis, level=level)
80768076

80778077
@Appender(ops.make_flex_doc("le", "dataframe"))
8078-
def le(self, other, axis: Axis = "columns", level=None):
8078+
def le(self, other, axis: Axis = "columns", level=None) -> DataFrame:
80798079
return self._flex_cmp_method(other, operator.le, axis=axis, level=level)
80808080

80818081
@Appender(ops.make_flex_doc("lt", "dataframe"))
8082-
def lt(self, other, axis: Axis = "columns", level=None):
8082+
def lt(self, other, axis: Axis = "columns", level=None) -> DataFrame:
80838083
return self._flex_cmp_method(other, operator.lt, axis=axis, level=level)
80848084

80858085
@Appender(ops.make_flex_doc("ge", "dataframe"))
8086-
def ge(self, other, axis: Axis = "columns", level=None):
8086+
def ge(self, other, axis: Axis = "columns", level=None) -> DataFrame:
80878087
return self._flex_cmp_method(other, operator.ge, axis=axis, level=level)
80888088

80898089
@Appender(ops.make_flex_doc("gt", "dataframe"))
8090-
def gt(self, other, axis: Axis = "columns", level=None):
8090+
def gt(self, other, axis: Axis = "columns", level=None) -> DataFrame:
80918091
return self._flex_cmp_method(other, operator.gt, axis=axis, level=level)
80928092

80938093
@Appender(ops.make_flex_doc("add", "dataframe"))
8094-
def add(self, other, axis: Axis = "columns", level=None, fill_value=None):
8094+
def add(
8095+
self, other, axis: Axis = "columns", level=None, fill_value=None
8096+
) -> DataFrame:
80958097
return self._flex_arith_method(
80968098
other, operator.add, level=level, fill_value=fill_value, axis=axis
80978099
)
80988100

80998101
@Appender(ops.make_flex_doc("radd", "dataframe"))
8100-
def radd(self, other, axis: Axis = "columns", level=None, fill_value=None):
8102+
def radd(
8103+
self, other, axis: Axis = "columns", level=None, fill_value=None
8104+
) -> DataFrame:
81018105
return self._flex_arith_method(
81028106
other, roperator.radd, level=level, fill_value=fill_value, axis=axis
81038107
)
81048108

81058109
@Appender(ops.make_flex_doc("sub", "dataframe"))
8106-
def sub(self, other, axis: Axis = "columns", level=None, fill_value=None):
8110+
def sub(
8111+
self, other, axis: Axis = "columns", level=None, fill_value=None
8112+
) -> DataFrame:
81078113
return self._flex_arith_method(
81088114
other, operator.sub, level=level, fill_value=fill_value, axis=axis
81098115
)
81108116

81118117
subtract = sub
81128118

81138119
@Appender(ops.make_flex_doc("rsub", "dataframe"))
8114-
def rsub(self, other, axis: Axis = "columns", level=None, fill_value=None):
8120+
def rsub(
8121+
self, other, axis: Axis = "columns", level=None, fill_value=None
8122+
) -> DataFrame:
81158123
return self._flex_arith_method(
81168124
other, roperator.rsub, level=level, fill_value=fill_value, axis=axis
81178125
)
81188126

81198127
@Appender(ops.make_flex_doc("mul", "dataframe"))
8120-
def mul(self, other, axis: Axis = "columns", level=None, fill_value=None):
8128+
def mul(
8129+
self, other, axis: Axis = "columns", level=None, fill_value=None
8130+
) -> DataFrame:
81218131
return self._flex_arith_method(
81228132
other, operator.mul, level=level, fill_value=fill_value, axis=axis
81238133
)
81248134

81258135
multiply = mul
81268136

81278137
@Appender(ops.make_flex_doc("rmul", "dataframe"))
8128-
def rmul(self, other, axis: Axis = "columns", level=None, fill_value=None):
8138+
def rmul(
8139+
self, other, axis: Axis = "columns", level=None, fill_value=None
8140+
) -> DataFrame:
81298141
return self._flex_arith_method(
81308142
other, roperator.rmul, level=level, fill_value=fill_value, axis=axis
81318143
)
81328144

81338145
@Appender(ops.make_flex_doc("truediv", "dataframe"))
8134-
def truediv(self, other, axis: Axis = "columns", level=None, fill_value=None):
8146+
def truediv(
8147+
self, other, axis: Axis = "columns", level=None, fill_value=None
8148+
) -> DataFrame:
81358149
return self._flex_arith_method(
81368150
other, operator.truediv, level=level, fill_value=fill_value, axis=axis
81378151
)
@@ -8140,45 +8154,59 @@ def truediv(self, other, axis: Axis = "columns", level=None, fill_value=None):
81408154
divide = truediv
81418155

81428156
@Appender(ops.make_flex_doc("rtruediv", "dataframe"))
8143-
def rtruediv(self, other, axis: Axis = "columns", level=None, fill_value=None):
8157+
def rtruediv(
8158+
self, other, axis: Axis = "columns", level=None, fill_value=None
8159+
) -> DataFrame:
81448160
return self._flex_arith_method(
81458161
other, roperator.rtruediv, level=level, fill_value=fill_value, axis=axis
81468162
)
81478163

81488164
rdiv = rtruediv
81498165

81508166
@Appender(ops.make_flex_doc("floordiv", "dataframe"))
8151-
def floordiv(self, other, axis: Axis = "columns", level=None, fill_value=None):
8167+
def floordiv(
8168+
self, other, axis: Axis = "columns", level=None, fill_value=None
8169+
) -> DataFrame:
81528170
return self._flex_arith_method(
81538171
other, operator.floordiv, level=level, fill_value=fill_value, axis=axis
81548172
)
81558173

81568174
@Appender(ops.make_flex_doc("rfloordiv", "dataframe"))
8157-
def rfloordiv(self, other, axis: Axis = "columns", level=None, fill_value=None):
8175+
def rfloordiv(
8176+
self, other, axis: Axis = "columns", level=None, fill_value=None
8177+
) -> DataFrame:
81588178
return self._flex_arith_method(
81598179
other, roperator.rfloordiv, level=level, fill_value=fill_value, axis=axis
81608180
)
81618181

81628182
@Appender(ops.make_flex_doc("mod", "dataframe"))
8163-
def mod(self, other, axis: Axis = "columns", level=None, fill_value=None):
8183+
def mod(
8184+
self, other, axis: Axis = "columns", level=None, fill_value=None
8185+
) -> DataFrame:
81648186
return self._flex_arith_method(
81658187
other, operator.mod, level=level, fill_value=fill_value, axis=axis
81668188
)
81678189

81688190
@Appender(ops.make_flex_doc("rmod", "dataframe"))
8169-
def rmod(self, other, axis: Axis = "columns", level=None, fill_value=None):
8191+
def rmod(
8192+
self, other, axis: Axis = "columns", level=None, fill_value=None
8193+
) -> DataFrame:
81708194
return self._flex_arith_method(
81718195
other, roperator.rmod, level=level, fill_value=fill_value, axis=axis
81728196
)
81738197

81748198
@Appender(ops.make_flex_doc("pow", "dataframe"))
8175-
def pow(self, other, axis: Axis = "columns", level=None, fill_value=None):
8199+
def pow(
8200+
self, other, axis: Axis = "columns", level=None, fill_value=None
8201+
) -> DataFrame:
81768202
return self._flex_arith_method(
81778203
other, operator.pow, level=level, fill_value=fill_value, axis=axis
81788204
)
81798205

81808206
@Appender(ops.make_flex_doc("rpow", "dataframe"))
8181-
def rpow(self, other, axis: Axis = "columns", level=None, fill_value=None):
8207+
def rpow(
8208+
self, other, axis: Axis = "columns", level=None, fill_value=None
8209+
) -> DataFrame:
81828210
return self._flex_arith_method(
81838211
other, roperator.rpow, level=level, fill_value=fill_value, axis=axis
81848212
)

pandas/core/series.py

+22-22
Original file line numberDiff line numberDiff line change
@@ -5946,63 +5946,63 @@ def _flex_method(self, other, op, *, level=None, fill_value=None, axis: Axis = 0
59465946
return op(self, other)
59475947

59485948
@Appender(ops.make_flex_doc("eq", "series"))
5949-
def eq(self, other, level=None, fill_value=None, axis: Axis = 0):
5949+
def eq(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59505950
return self._flex_method(
59515951
other, operator.eq, level=level, fill_value=fill_value, axis=axis
59525952
)
59535953

59545954
@Appender(ops.make_flex_doc("ne", "series"))
5955-
def ne(self, other, level=None, fill_value=None, axis: Axis = 0):
5955+
def ne(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59565956
return self._flex_method(
59575957
other, operator.ne, level=level, fill_value=fill_value, axis=axis
59585958
)
59595959

59605960
@Appender(ops.make_flex_doc("le", "series"))
5961-
def le(self, other, level=None, fill_value=None, axis: Axis = 0):
5961+
def le(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59625962
return self._flex_method(
59635963
other, operator.le, level=level, fill_value=fill_value, axis=axis
59645964
)
59655965

59665966
@Appender(ops.make_flex_doc("lt", "series"))
5967-
def lt(self, other, level=None, fill_value=None, axis: Axis = 0):
5967+
def lt(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59685968
return self._flex_method(
59695969
other, operator.lt, level=level, fill_value=fill_value, axis=axis
59705970
)
59715971

59725972
@Appender(ops.make_flex_doc("ge", "series"))
5973-
def ge(self, other, level=None, fill_value=None, axis: Axis = 0):
5973+
def ge(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59745974
return self._flex_method(
59755975
other, operator.ge, level=level, fill_value=fill_value, axis=axis
59765976
)
59775977

59785978
@Appender(ops.make_flex_doc("gt", "series"))
5979-
def gt(self, other, level=None, fill_value=None, axis: Axis = 0):
5979+
def gt(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59805980
return self._flex_method(
59815981
other, operator.gt, level=level, fill_value=fill_value, axis=axis
59825982
)
59835983

59845984
@Appender(ops.make_flex_doc("add", "series"))
5985-
def add(self, other, level=None, fill_value=None, axis: Axis = 0):
5985+
def add(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59865986
return self._flex_method(
59875987
other, operator.add, level=level, fill_value=fill_value, axis=axis
59885988
)
59895989

59905990
@Appender(ops.make_flex_doc("radd", "series"))
5991-
def radd(self, other, level=None, fill_value=None, axis: Axis = 0):
5991+
def radd(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59925992
return self._flex_method(
59935993
other, roperator.radd, level=level, fill_value=fill_value, axis=axis
59945994
)
59955995

59965996
@Appender(ops.make_flex_doc("sub", "series"))
5997-
def sub(self, other, level=None, fill_value=None, axis: Axis = 0):
5997+
def sub(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
59985998
return self._flex_method(
59995999
other, operator.sub, level=level, fill_value=fill_value, axis=axis
60006000
)
60016001

60026002
subtract = sub
60036003

60046004
@Appender(ops.make_flex_doc("rsub", "series"))
6005-
def rsub(self, other, level=None, fill_value=None, axis: Axis = 0):
6005+
def rsub(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60066006
return self._flex_method(
60076007
other, roperator.rsub, level=level, fill_value=fill_value, axis=axis
60086008
)
@@ -6014,21 +6014,21 @@ def mul(
60146014
level: Level | None = None,
60156015
fill_value: float | None = None,
60166016
axis: Axis = 0,
6017-
):
6017+
) -> Series:
60186018
return self._flex_method(
60196019
other, operator.mul, level=level, fill_value=fill_value, axis=axis
60206020
)
60216021

60226022
multiply = mul
60236023

60246024
@Appender(ops.make_flex_doc("rmul", "series"))
6025-
def rmul(self, other, level=None, fill_value=None, axis: Axis = 0):
6025+
def rmul(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60266026
return self._flex_method(
60276027
other, roperator.rmul, level=level, fill_value=fill_value, axis=axis
60286028
)
60296029

60306030
@Appender(ops.make_flex_doc("truediv", "series"))
6031-
def truediv(self, other, level=None, fill_value=None, axis: Axis = 0):
6031+
def truediv(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60326032
return self._flex_method(
60336033
other, operator.truediv, level=level, fill_value=fill_value, axis=axis
60346034
)
@@ -6037,57 +6037,57 @@ def truediv(self, other, level=None, fill_value=None, axis: Axis = 0):
60376037
divide = truediv
60386038

60396039
@Appender(ops.make_flex_doc("rtruediv", "series"))
6040-
def rtruediv(self, other, level=None, fill_value=None, axis: Axis = 0):
6040+
def rtruediv(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60416041
return self._flex_method(
60426042
other, roperator.rtruediv, level=level, fill_value=fill_value, axis=axis
60436043
)
60446044

60456045
rdiv = rtruediv
60466046

60476047
@Appender(ops.make_flex_doc("floordiv", "series"))
6048-
def floordiv(self, other, level=None, fill_value=None, axis: Axis = 0):
6048+
def floordiv(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60496049
return self._flex_method(
60506050
other, operator.floordiv, level=level, fill_value=fill_value, axis=axis
60516051
)
60526052

60536053
@Appender(ops.make_flex_doc("rfloordiv", "series"))
6054-
def rfloordiv(self, other, level=None, fill_value=None, axis: Axis = 0):
6054+
def rfloordiv(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60556055
return self._flex_method(
60566056
other, roperator.rfloordiv, level=level, fill_value=fill_value, axis=axis
60576057
)
60586058

60596059
@Appender(ops.make_flex_doc("mod", "series"))
6060-
def mod(self, other, level=None, fill_value=None, axis: Axis = 0):
6060+
def mod(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60616061
return self._flex_method(
60626062
other, operator.mod, level=level, fill_value=fill_value, axis=axis
60636063
)
60646064

60656065
@Appender(ops.make_flex_doc("rmod", "series"))
6066-
def rmod(self, other, level=None, fill_value=None, axis: Axis = 0):
6066+
def rmod(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60676067
return self._flex_method(
60686068
other, roperator.rmod, level=level, fill_value=fill_value, axis=axis
60696069
)
60706070

60716071
@Appender(ops.make_flex_doc("pow", "series"))
6072-
def pow(self, other, level=None, fill_value=None, axis: Axis = 0):
6072+
def pow(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60736073
return self._flex_method(
60746074
other, operator.pow, level=level, fill_value=fill_value, axis=axis
60756075
)
60766076

60776077
@Appender(ops.make_flex_doc("rpow", "series"))
6078-
def rpow(self, other, level=None, fill_value=None, axis: Axis = 0):
6078+
def rpow(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60796079
return self._flex_method(
60806080
other, roperator.rpow, level=level, fill_value=fill_value, axis=axis
60816081
)
60826082

60836083
@Appender(ops.make_flex_doc("divmod", "series"))
6084-
def divmod(self, other, level=None, fill_value=None, axis: Axis = 0):
6084+
def divmod(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60856085
return self._flex_method(
60866086
other, divmod, level=level, fill_value=fill_value, axis=axis
60876087
)
60886088

60896089
@Appender(ops.make_flex_doc("rdivmod", "series"))
6090-
def rdivmod(self, other, level=None, fill_value=None, axis: Axis = 0):
6090+
def rdivmod(self, other, level=None, fill_value=None, axis: Axis = 0) -> Series:
60916091
return self._flex_method(
60926092
other, roperator.rdivmod, level=level, fill_value=fill_value, axis=axis
60936093
)

0 commit comments

Comments
 (0)