@@ -1095,9 +1095,8 @@ def _reduce(self, name: str, *, skipna: bool = True, **kwargs):
1095
1095
1096
1096
return result
1097
1097
1098
- def _wrap_reduction_result (self , name : str , result , skipna , ** kwargs ):
1098
+ def _wrap_reduction_result (self , name : str , result , * , skipna , axis ):
1099
1099
if isinstance (result , np .ndarray ):
1100
- axis = kwargs ["axis" ]
1101
1100
if skipna :
1102
1101
# we only retain mask for all-NA rows/columns
1103
1102
mask = self ._mask .all (axis = axis )
@@ -1124,9 +1123,7 @@ def sum(
1124
1123
min_count = min_count ,
1125
1124
axis = axis ,
1126
1125
)
1127
- return self ._wrap_reduction_result (
1128
- "sum" , result , skipna = skipna , axis = axis , ** kwargs
1129
- )
1126
+ return self ._wrap_reduction_result ("sum" , result , skipna = skipna , axis = axis )
1130
1127
1131
1128
def prod (
1132
1129
self ,
@@ -1144,9 +1141,7 @@ def prod(
1144
1141
min_count = min_count ,
1145
1142
axis = axis ,
1146
1143
)
1147
- return self ._wrap_reduction_result (
1148
- "prod" , result , skipna = skipna , axis = axis , ** kwargs
1149
- )
1144
+ return self ._wrap_reduction_result ("prod" , result , skipna = skipna , axis = axis )
1150
1145
1151
1146
def mean (self , * , skipna : bool = True , axis : AxisInt | None = 0 , ** kwargs ):
1152
1147
nv .validate_mean ((), kwargs )
@@ -1156,9 +1151,7 @@ def mean(self, *, skipna: bool = True, axis: AxisInt | None = 0, **kwargs):
1156
1151
skipna = skipna ,
1157
1152
axis = axis ,
1158
1153
)
1159
- return self ._wrap_reduction_result (
1160
- "mean" , result , skipna = skipna , axis = axis , ** kwargs
1161
- )
1154
+ return self ._wrap_reduction_result ("mean" , result , skipna = skipna , axis = axis )
1162
1155
1163
1156
def var (
1164
1157
self , * , skipna : bool = True , axis : AxisInt | None = 0 , ddof : int = 1 , ** kwargs
@@ -1171,9 +1164,7 @@ def var(
1171
1164
axis = axis ,
1172
1165
ddof = ddof ,
1173
1166
)
1174
- return self ._wrap_reduction_result (
1175
- "var" , result , skipna = skipna , axis = axis , ** kwargs
1176
- )
1167
+ return self ._wrap_reduction_result ("var" , result , skipna = skipna , axis = axis )
1177
1168
1178
1169
def std (
1179
1170
self , * , skipna : bool = True , axis : AxisInt | None = 0 , ddof : int = 1 , ** kwargs
@@ -1186,9 +1177,7 @@ def std(
1186
1177
axis = axis ,
1187
1178
ddof = ddof ,
1188
1179
)
1189
- return self ._wrap_reduction_result (
1190
- "std" , result , skipna = skipna , axis = axis , ** kwargs
1191
- )
1180
+ return self ._wrap_reduction_result ("std" , result , skipna = skipna , axis = axis )
1192
1181
1193
1182
def min (self , * , skipna : bool = True , axis : AxisInt | None = 0 , ** kwargs ):
1194
1183
nv .validate_min ((), kwargs )
0 commit comments