Merge pull request #7881 from jreback/apply_optimize

PERF: groupby / frame apply optimization

Author: jreback

pandas/core/groupby.py

@@ -635,11 +635,11 @@ def apply(self, func, *args, **kwargs):
 
         @wraps(func)
         def f(g):
-            # ignore SettingWithCopy here in case the user mutates
-            with option_context('mode.chained_assignment',None):
-                return func(g, *args, **kwargs)
+            return func(g, *args, **kwargs)
 
-        return self._python_apply_general(f)
+        # ignore SettingWithCopy here in case the user mutates
+        with option_context('mode.chained_assignment',None):
+            return self._python_apply_general(f)
 
     def _python_apply_general(self, f):
         keys, values, mutated = self.grouper.apply(f, self._selected_obj,

pandas/io/tests/test_data.py

@@ -445,7 +445,10 @@ def test_fred(self):
         end = datetime(2013, 1, 27)
 
         received = web.DataReader("GDP", "fred", start, end)['GDP'].tail(1)[0]
-        self.assertEqual(int(received), 16535)
+
+        # < 7/30/14 16535 was returned
+        #self.assertEqual(int(received), 16535)
+        self.assertEqual(int(received), 16502)
 
         self.assertRaises(Exception, web.DataReader, "NON EXISTENT SERIES",
                           'fred', start, end)