Skip to content

Commit 937264d

Browse files
committed
Merge fixup
1 parent 3f3455b commit 937264d

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

pandas/core/resample.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -530,9 +530,7 @@ def _groupby_and_apply(self, how, *args, **kwargs):
530530
# a DataFrame column, but aggregate_item_by_item operates column-wise
531531
# on Series, raising AttributeError or KeyError
532532
# (depending on whether the column lookup uses getattr/__getitem__)
533-
result = _apply(
534-
grouped, how, *args, include_groups=self.include_groups, **kwargs
535-
)
533+
result = grouped.apply(how, *args, **kwargs)
536534

537535
except ValueError as err:
538536
if "Must produce aggregated value" in str(err):
@@ -544,9 +542,7 @@ def _groupby_and_apply(self, how, *args, **kwargs):
544542

545543
# we have a non-reducing function
546544
# try to evaluate
547-
result = _apply(
548-
grouped, how, *args, include_groups=self.include_groups, **kwargs
549-
)
545+
result = grouped.apply(how, *args, **kwargs)
550546

551547
return self._wrap_result(result)
552548

0 commit comments

Comments
 (0)