From 0d8489cc2fa7fd7bf31c1a4b7c3773da05a5519c Mon Sep 17 00:00:00 2001 From: jbrockmendel Date: Tue, 12 Nov 2019 13:48:42 -0800 Subject: [PATCH] CLN: pre-empt NotImplementedErorr in _aggregate_multiple_funcs --- pandas/core/groupby/generic.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py index 56a8a7d15077b..569f57346be4e 100644 --- a/pandas/core/groupby/generic.py +++ b/pandas/core/groupby/generic.py @@ -888,6 +888,11 @@ def aggregate(self, func=None, *args, **kwargs): return self._python_agg_general(func, *args, **kwargs) elif args or kwargs: result = self._aggregate_frame(func, *args, **kwargs) + + elif self.axis == 1: + # _aggregate_multiple_funcs does not allow self.axis == 1 + result = self._aggregate_frame(func) + else: # try to treat as if we are passing a list @@ -901,17 +906,11 @@ def aggregate(self, func=None, *args, **kwargs): raise result = self._aggregate_frame(func) except NotImplementedError as err: - if "axis other than 0 is not supported" in str(err): - # raised directly by _aggregate_multiple_funcs - pass - elif "decimal does not support skipna=True" in str(err): + if "decimal does not support skipna=True" in str(err): # FIXME: kludge for DecimalArray tests pass else: raise - # FIXME: this is raised in a bunch of - # test_whitelist.test_regression_whitelist_methods tests, - # can be avoided result = self._aggregate_frame(func) else: result.columns = Index(