Skip to content

Commit fc90331

Browse files
jbrockmendelyeshsurya
authored andcommitted
REF: dont call libreduction incorrectly (pandas-dev#41148)
1 parent 5de8aac commit fc90331

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

pandas/core/groupby/generic.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ def aggregate(self, func=None, *args, engine=None, engine_kwargs=None, **kwargs)
275275

276276
try:
277277
return self._python_agg_general(func, *args, **kwargs)
278-
except (ValueError, KeyError):
278+
except KeyError:
279279
# TODO: KeyError is raised in _python_agg_general,
280280
# see test_groupby.test_basic
281281
result = self._aggregate_named(func, *args, **kwargs)
@@ -553,6 +553,7 @@ def _transform_general(self, func, *args, **kwargs):
553553

554554
results = []
555555
for name, group in self:
556+
# this setattr is needed for test_transform_lambda_with_datetimetz
556557
object.__setattr__(group, "name", name)
557558
res = func(group, *args, **kwargs)
558559

pandas/core/groupby/ops.py

+3
Original file line numberDiff line numberDiff line change
@@ -1089,6 +1089,9 @@ def agg_series(self, obj: Series, func: F):
10891089
# preempt SeriesBinGrouper from raising TypeError
10901090
return self._aggregate_series_pure_python(obj, func)
10911091

1092+
elif obj.index._has_complex_internals:
1093+
return self._aggregate_series_pure_python(obj, func)
1094+
10921095
grouper = libreduction.SeriesBinGrouper(obj, func, self.bins)
10931096
return grouper.get_result()
10941097

0 commit comments

Comments
 (0)