Merge pull request #1990 from minrk/func_defaults

Serialize func_defaults with canning machinery, which allows passing interactively defined functions as func_defaults.

IPython/parallel/tests/test_view.py

@@ -593,5 +593,17 class TestView(ClusterTestCase, ParametricTestCase):
         self.assertTrue("data" in output)
         data = output['data']
         self.assertTrue("image/png" in data)
+    
+    def test_func_default_func(self):
+        """interactively defined function as apply func default"""
+        def foo():
+            return 'foo'
+        
+        def bar(f=foo):
+            return f()
         
+        view = self.client[-1]
+        ar = view.apply_async(bar)
+        r = ar.get(10)
+        self.assertEquals(r, 'foo')
 

IPython/utils/pickleutil.py

@@ -84,7 +84,10 class CannedFunction(CannedObject):
     def __init__(self, f):
         self._check_type(f)
         self.code = f.func_code
-        self.defaults = f.func_defaults
+        if f.func_defaults:
+            self.defaults = [ can(fd) for fd in f.func_defaults ]
+        else:
+            self.defaults = None
         self.module = f.__module__ or '__main__'
         self.__name__ = f.__name__
         self.buffers = []
@@ -104,7 +107,11 class CannedFunction(CannedObject):
 
         if g is None:
             g = {}
-        newFunc = FunctionType(self.code, g, self.__name__, self.defaults)
+        if self.defaults:
+            defaults = tuple(uncan(cfd, g) for cfd in self.defaults)
+        else:
+            defaults = None
+        newFunc = FunctionType(self.code, g, self.__name__, defaults)
         return newFunc