Merge branch 'Fix-GH7885' of https://github.com/jmorris0x0/pandas into jmorris0x0-Fix-GH7885

Author: jreback

doc/source/v0.15.0.txt

@@ -480,7 +480,7 @@ Enhancements
 
 
 
-
+- Bug in ``DataFrame.groupby`` where ``Grouper`` does not recognize level when frequency is specified (:issue:`7885`)
 
 
 

pandas/core/groupby.py

@@ -248,7 +248,7 @@ def _set_grouper(self, obj, sort=False):
             key = self.key
             if key not in obj._info_axis:
                 raise KeyError("The grouper name {0} is not found".format(key))
-            ax = Index(obj[key],name=key)
+            ax = Index(obj[key], name=key)
 
         else:
             ax = obj._get_axis(self.axis)
@@ -258,18 +258,12 @@ def _set_grouper(self, obj, sort=False):
                 # if a level is given it must be a mi level or
                 # equivalent to the axis name
                 if isinstance(ax, MultiIndex):
-
-                    if isinstance(level, compat.string_types):
-                        if obj.index.name != level:
-                            raise ValueError('level name %s is not the name of the '
-                                             'index' % level)
-                    elif level > 0:
-                        raise ValueError('level > 0 only valid with MultiIndex')
-                    ax = Index(ax.get_level_values(level), name=level)
+                    level = ax._get_level_number(level)
+                    ax = Index(ax.get_level_values(level), name=ax.names[level])
 
                 else:
-                    if not (level == 0 or level == ax.name):
-                        raise ValueError("The grouper level {0} is not valid".format(level))
+                    if level not in (0, ax.name):
+                        raise ValueError("The level {0} is not valid".format(level))
 
         # possibly sort
         if (self.sort or sort) and not ax.is_monotonic:

pandas/tests/test_groupby.py

@@ -351,6 +351,28 @@ def test_grouper_index_types(self):
             df.index = list(reversed(df.index.tolist()))
             df.groupby(list('abcde')).apply(lambda x: x)
 
+    def test_grouper_multilevel_freq(self):
+
+        # GH 7885
+        # with level and freq specified in a pd.Grouper
+        from datetime import date, timedelta
+        d0 = date.today() - timedelta(days=14)
+        dates = date_range(d0, date.today())
+        date_index = pd.MultiIndex.from_product([dates, dates], names=['foo', 'bar'])
+        df = pd.DataFrame(np.random.randint(0, 100, 225), index=date_index)
+
+        # Check string level
+        expected = df.reset_index().groupby([pd.Grouper(key='foo', freq='W'),
+                                             pd.Grouper(key='bar', freq='W')]).sum()
+        result = df.groupby([pd.Grouper(level='foo', freq='W'),
+                             pd.Grouper(level='bar', freq='W')]).sum()
+        assert_frame_equal(result, expected)
+
+        # Check integer level
+        result = df.groupby([pd.Grouper(level=0, freq='W'),
+                             pd.Grouper(level=1, freq='W')]).sum()
+        assert_frame_equal(result, expected)
+
     def test_grouper_iter(self):
         self.assertEqual(sorted(self.df.groupby('A').grouper), ['bar', 'foo'])