Simpler fix

Author: ogrisel

cloudpickle/cloudpickle.py

@@ -620,11 +620,11 @@ def save_global(self, obj, name=None, pack=struct.pack):
         The name of this method is somewhat misleading: all types get
         dispatched here.
         """
+        if obj.__module__ == "__main__":
+            return self.save_dynamic_class(obj)
+
         try:
-            if obj.__module__ == "__main__":
-                raise ValueError("%r is defined in __main__" % obj)
-            else:
-                return Pickler.save_global(self, obj, name=name)
+            return Pickler.save_global(self, obj, name=name)
         except Exception:
             if obj.__module__ == "__builtin__" or obj.__module__ == "builtins":
                 if obj in _BUILTIN_TYPE_NAMES:

tests/cloudpickle_test.py

@@ -749,6 +749,8 @@ class Foo(object):
             def method(self, x):
                 return x
 
+        foo = Foo()
+
         def f0(x):
             return x ** 2
 
@@ -761,6 +763,9 @@ def f2(x):
         def f3():
             return Foo().method(CONSTANT)
 
+        def f4(x):
+            return foo.method(x)
+
         cloned = subprocess_pickle_echo(lambda x: x**2, protocol={protocol})
         assert cloned(3) == 9
 
@@ -781,6 +786,9 @@ def f3():
 
         cloned = subprocess_pickle_echo(f3, protocol={protocol})
         assert cloned() == f3()
+
+        cloned = subprocess_pickle_echo(f4, protocol={protocol})
+        assert cloned(2) == f4(2)
         """.format(protocol=self.protocol)
         assert_run_python_script(textwrap.dedent(code))