Skip to content

Commit eebdafb

Browse files
committed
Fix typing
1 parent 4fb7a88 commit eebdafb

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

pandas/core/window/rolling.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -652,11 +652,10 @@ def _numba_apply(
652652
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()
655-
if result is not None:
656-
if isinstance(result, ABCDataFrame) and relabeling:
657-
result = result.iloc[:, order]
658-
result.columns = columns
659-
else:
655+
if result is not None and isinstance(result, ABCDataFrame) and relabeling:
656+
result = result.iloc[:, order]
657+
result.columns = columns
658+
if result is None:
660659
return self.apply(func, raw=False, args=args, kwargs=kwargs)
661660
return result
662661

0 commit comments

Comments
 (0)