Skip to content

Commit fe143e5

Browse files
jbrockmendeljreback
authored andcommitted
CLN: pre-empt NotImplementedErorr in _aggregate_multiple_funcs (#29582)
1 parent 1715468 commit fe143e5

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

pandas/core/groupby/generic.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -888,6 +888,11 @@ def aggregate(self, func=None, *args, **kwargs):
888888
return self._python_agg_general(func, *args, **kwargs)
889889
elif args or kwargs:
890890
result = self._aggregate_frame(func, *args, **kwargs)
891+
892+
elif self.axis == 1:
893+
# _aggregate_multiple_funcs does not allow self.axis == 1
894+
result = self._aggregate_frame(func)
895+
891896
else:
892897

893898
# try to treat as if we are passing a list
@@ -901,17 +906,11 @@ def aggregate(self, func=None, *args, **kwargs):
901906
raise
902907
result = self._aggregate_frame(func)
903908
except NotImplementedError as err:
904-
if "axis other than 0 is not supported" in str(err):
905-
# raised directly by _aggregate_multiple_funcs
906-
pass
907-
elif "decimal does not support skipna=True" in str(err):
909+
if "decimal does not support skipna=True" in str(err):
908910
# FIXME: kludge for DecimalArray tests
909911
pass
910912
else:
911913
raise
912-
# FIXME: this is raised in a bunch of
913-
# test_whitelist.test_regression_whitelist_methods tests,
914-
# can be avoided
915914
result = self._aggregate_frame(func)
916915
else:
917916
result.columns = Index(

0 commit comments

Comments
 (0)