@@ -63,7 +63,7 @@ def frame_apply(
63
63
raw : bool = False ,
64
64
result_type : Optional [str ] = None ,
65
65
args = None ,
66
- kwds = None ,
66
+ kwargs = None ,
67
67
) -> FrameApply :
68
68
""" construct and return a row or column based frame apply object """
69
69
axis = obj ._get_axis_number (axis )
@@ -79,7 +79,7 @@ def frame_apply(
79
79
raw = raw ,
80
80
result_type = result_type ,
81
81
args = args ,
82
- kwds = kwds ,
82
+ kwargs = kwargs ,
83
83
)
84
84
85
85
@@ -88,14 +88,14 @@ def series_apply(
88
88
func : AggFuncType ,
89
89
convert_dtype : bool = True ,
90
90
args = None ,
91
- kwds = None ,
91
+ kwargs = None ,
92
92
) -> SeriesApply :
93
93
return SeriesApply (
94
94
obj ,
95
95
func ,
96
96
convert_dtype ,
97
97
args ,
98
- kwds ,
98
+ kwargs ,
99
99
)
100
100
101
101
@@ -109,12 +109,12 @@ def __init__(
109
109
raw : bool ,
110
110
result_type : Optional [str ],
111
111
args ,
112
- kwds ,
112
+ kwargs ,
113
113
):
114
114
self .obj = obj
115
115
self .raw = raw
116
116
self .args = args or ()
117
- self .kwds = kwds or {}
117
+ self .kwargs = kwargs or {}
118
118
119
119
if result_type not in [None , "reduce" , "broadcast" , "expand" ]:
120
120
raise ValueError (
@@ -126,13 +126,13 @@ def __init__(
126
126
127
127
# curry if needed
128
128
if (
129
- (kwds or args )
129
+ (kwargs or args )
130
130
and not isinstance (func , (np .ufunc , str ))
131
131
and not is_list_like (func )
132
132
):
133
133
134
134
def f (x ):
135
- return func (x , * args , ** kwds )
135
+ return func (x , * args , ** kwargs )
136
136
137
137
else :
138
138
f = func
@@ -163,7 +163,7 @@ def agg(self) -> Tuple[Optional[FrameOrSeriesUnion], Optional[bool]]:
163
163
obj = self .obj
164
164
arg = self .f
165
165
args = self .args
166
- kwargs = self .kwds
166
+ kwargs = self .kwargs
167
167
168
168
_axis = kwargs .pop ("_axis" , None )
169
169
if _axis is None :
@@ -413,10 +413,10 @@ def maybe_apply_str(self) -> Optional[FrameOrSeriesUnion]:
413
413
if callable (func ):
414
414
sig = inspect .getfullargspec (func )
415
415
if "axis" in sig .args :
416
- self .kwds ["axis" ] = self .axis
416
+ self .kwargs ["axis" ] = self .axis
417
417
elif self .axis != 0 :
418
418
raise ValueError (f"Operation { f } does not support axis=1" )
419
- return self .obj ._try_aggregate_string_function (f , * self .args , ** self .kwds )
419
+ return self .obj ._try_aggregate_string_function (f , * self .args , ** self .kwargs )
420
420
421
421
def maybe_apply_multiple (self ) -> Optional [FrameOrSeriesUnion ]:
422
422
"""
@@ -430,7 +430,7 @@ def maybe_apply_multiple(self) -> Optional[FrameOrSeriesUnion]:
430
430
# Note: dict-likes are list-like
431
431
if not is_list_like (self .f ):
432
432
return None
433
- return self .obj .aggregate (self .f , self .axis , * self .args , ** self .kwds )
433
+ return self .obj .aggregate (self .f , self .axis , * self .args , ** self .kwargs )
434
434
435
435
436
436
class FrameApply (Apply ):
@@ -806,7 +806,7 @@ def __init__(
806
806
func : AggFuncType ,
807
807
convert_dtype : bool ,
808
808
args ,
809
- kwds ,
809
+ kwargs ,
810
810
):
811
811
self .convert_dtype = convert_dtype
812
812
@@ -816,7 +816,7 @@ def __init__(
816
816
raw = False ,
817
817
result_type = None ,
818
818
args = args ,
819
- kwds = kwds ,
819
+ kwargs = kwargs ,
820
820
)
821
821
822
822
def apply (self ) -> FrameOrSeriesUnion :
@@ -877,17 +877,17 @@ def __init__(
877
877
obj : Union [SeriesGroupBy , DataFrameGroupBy ],
878
878
func : AggFuncType ,
879
879
args ,
880
- kwds ,
880
+ kwargs ,
881
881
):
882
- kwds = kwds .copy ()
883
- self .axis = obj .obj ._get_axis_number (kwds .get ("axis" , 0 ))
882
+ kwargs = kwargs .copy ()
883
+ self .axis = obj .obj ._get_axis_number (kwargs .get ("axis" , 0 ))
884
884
super ().__init__ (
885
885
obj ,
886
886
func ,
887
887
raw = False ,
888
888
result_type = None ,
889
889
args = args ,
890
- kwds = kwds ,
890
+ kwargs = kwargs ,
891
891
)
892
892
893
893
def apply (self ):
@@ -903,15 +903,15 @@ def __init__(
903
903
obj : Union [Resampler , BaseWindow ],
904
904
func : AggFuncType ,
905
905
args ,
906
- kwds ,
906
+ kwargs ,
907
907
):
908
908
super ().__init__ (
909
909
obj ,
910
910
func ,
911
911
raw = False ,
912
912
result_type = None ,
913
913
args = args ,
914
- kwds = kwds ,
914
+ kwargs = kwargs ,
915
915
)
916
916
917
917
def apply (self ):
0 commit comments