Skip to content

Commit 4fb7a88

Browse files
committed
Pre-commit fix
1 parent 2a8fe8e commit 4fb7a88

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

pandas/core/window/ewm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -981,7 +981,7 @@ def reset(self) -> None:
981981
"""
982982
self._mean.reset()
983983

984-
def aggregate(self, func, *args, **kwargs):
984+
def aggregate(self, func=None, *args, **kwargs):
985985
raise NotImplementedError("aggregate is not implemented.")
986986

987987
def std(self, bias: bool = False, *args, **kwargs):

pandas/core/window/rolling.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ def aggregate(self, func=None, *args, **kwargs):
653653
relabeling, func, columns, order = reconstruct_func(func, **kwargs)
654654
result = ResamplerWindowApply(self, func, args=args, kwargs=kwargs).agg()
655655
if result is not None:
656-
if relabeling:
656+
if isinstance(result, ABCDataFrame) and relabeling:
657657
result = result.iloc[:, order]
658658
result.columns = columns
659659
else:
@@ -1247,7 +1247,7 @@ def calc(x):
12471247
klass="Series/DataFrame",
12481248
axis="",
12491249
)
1250-
def aggregate(self, func, *args, **kwargs):
1250+
def aggregate(self, func=None, *args, **kwargs):
12511251
result = ResamplerWindowApply(self, func, args=args, kwargs=kwargs).agg()
12521252
if result is None:
12531253
# these must apply directly

0 commit comments

Comments
 (0)