fixed args on df

Author: discort

pandas/core/resample.py

@@ -855,7 +855,7 @@ def __init__(self, obj, *args, **kwargs):
         self._groupby.grouper.mutated = True
         self.groupby = copy.copy(parent.groupby)
 
-    def _apply(self, f, *args, **kwargs):
+    def _apply(self, f, grouper=None, *args, **kwargs):
         """
         dispatch to _upsample; we are stripping all of the _upsample kwargs and
         performing the original function call on the grouped object
@@ -867,7 +867,7 @@ def func(x):
             if isinstance(f, compat.string_types):
                 return getattr(x, f)(**kwargs)
 
-            return x.apply(f, **kwargs)
+            return x.apply(f, *args, **kwargs)
 
         result = self._groupby.apply(func)
         return self._wrap_result(result)

pandas/tests/test_resample.py

@@ -2166,6 +2166,7 @@ def test_resample_datetime_values(self):
         tm.assert_series_equal(res, exp)
 
     def test_resample_apply_with_additional_args(self):
+        # GH 14615
         def f(data, add_arg):
             return np.mean(data) * add_arg
 
@@ -2179,6 +2180,13 @@ def f(data, add_arg):
         expected = self.series.resample('D').mean().multiply(multiplier)
         tm.assert_series_equal(result, expected)
 
+        # Testing dataframe
+        df = pd.DataFrame({"A": 1, "B": 2},
+                          index=pd.date_range('2017', periods=10))
+        result = df.groupby("A").resample("D").agg(f, multiplier)
+        expected = df.groupby("A").resample('D').mean().multiply(multiplier)
+        assert_frame_equal(result, expected)
+
 
 class TestPeriodIndex(Base):
     _index_factory = lambda x: period_range