From a662c5a09658922004ad4fc865071133d3e8217f Mon Sep 17 00:00:00 2001
From: jbrockmendel <jbrockmendel@gmail.com>
Date: Fri, 18 Oct 2019 09:12:11 -0700
Subject: [PATCH] CLN: catch less in groupby

---
 pandas/core/groupby/generic.py | 20 +++++++++++++++++---
 pandas/core/resample.py        | 19 ++++++++++++++++++-
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/pandas/core/groupby/generic.py b/pandas/core/groupby/generic.py
index 8e53972c95275..8191c3519a36a 100644
--- a/pandas/core/groupby/generic.py
+++ b/pandas/core/groupby/generic.py
@@ -889,9 +889,23 @@ def aggregate(self, func=None, *args, **kwargs):
                     result = self._aggregate_multiple_funcs(
                         [func], _level=_level, _axis=self.axis
                     )
-                except AssertionError:
-                    raise
-                except Exception:
+                except ValueError as err:
+                    if "no results" not in str(err):
+                        # raised directly by _aggregate_multiple_funcs
+                        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):
+                        # 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(
diff --git a/pandas/core/resample.py b/pandas/core/resample.py
index 5185d95cfac4c..d4ae3767f6157 100644
--- a/pandas/core/resample.py
+++ b/pandas/core/resample.py
@@ -17,6 +17,7 @@
 from pandas.core.dtypes.generic import ABCDataFrame, ABCSeries
 
 import pandas.core.algorithms as algos
+from pandas.core.base import DataError
 from pandas.core.generic import _shared_docs
 from pandas.core.groupby.base import GroupByMixin
 from pandas.core.groupby.generic import SeriesGroupBy
@@ -362,7 +363,23 @@ def _groupby_and_aggregate(self, how, grouper=None, *args, **kwargs):
                 result = grouped.aggregate(how, *args, **kwargs)
         except AssertionError:
             raise
-        except Exception:
+        except DataError:
+            # we have a non-reducing function; try to evaluate
+            result = grouped.apply(how, *args, **kwargs)
+        except ValueError as err:
+            if "Must produce aggregated value" in str(err):
+                # raised in _aggregate_named
+                pass
+            elif "len(index) != len(labels)" in str(err):
+                # raised in libgroupby validation
+                pass
+            elif "No objects to concatenate" in str(err):
+                # raised in concat call
+                #  In tests this is reached via either
+                #  _apply_to_column_groupbys (ohlc) or DataFrameGroupBy.nunique
+                pass
+            else:
+                raise
 
             # we have a non-reducing function
             # try to evaluate