BUG: catch Exception instead of TypeError in multi-groupby code, surfaced due to # of args in DataFrame.mean changing in PR #313

Author: wesm

RELEASE.rst

@@ -30,6 +30,10 @@ pandas 0.5.1
 **New features / modules**
 
   - Add `melt` function to `pandas.core.reshape`
+  - Add `level` parameter to group by level in Series and DataFrame
+    descriptive statistics (PR #313)
+  - Add `head` and `tail` methods to Series, analogous to to DataFrame (PR
+    #296)
 
 **Improvements to existing features**
 
@@ -46,6 +50,8 @@ Thanks
 ------
 
 - Kieran O'Mahony
+- Jeff Hammerbacher
+- Adam Klein
 
 pandas 0.5.0
 ============

pandas/core/groupby.py

@@ -388,7 +388,9 @@ def _doit(reschunk, ctchunk, gen, shape_axis=0):
             mask = counts.ravel() > 0
             output = output.reshape((np.prod(group_shape),) + stride_shape)
             output = output[mask]
-        except TypeError:
+        except Exception:
+            # we failed, try to go slice-by-slice / column-by-column
+
             result = np.empty(group_shape, dtype=float)
             result.fill(np.nan)
             # iterate through "columns" ex exclusions to populate output dict