Remove curry.__getattr__ forwarding and comment out the tests this affects.

IMHO, this is a failure of how Python handles `__qualname__` during pickling.
Objects wrapped by decorators should only need to use `__wrapped__` for
pickling to work as expected.  It's unreasonable to expect wrapping objects
such as `curry` to forward attributes to allow pickling to work.

Author: eriknw

toolz/functoolz.py

@@ -201,6 +201,7 @@ def __init__(self, *args, **kwargs):
         self.__doc__ = getattr(func, '__doc__', None)
         self.__name__ = getattr(func, '__name__', '<curry>')
         self.__module__ = getattr(func, '__module__', None)
+        self.__qualname__ = getattr(func, '__qualname__', None)
         self._sigspec = None
         self._has_unknown_args = None
 
@@ -259,9 +260,6 @@ def keywords(self):
     def func_name(self):
         return self.__name__
 
-    def __getattr__(self, attr):
-        return getattr(self.func, attr)
-
     def __str__(self):
         return str(self.func)
 

toolz/tests/test_functoolz.py

@@ -285,14 +285,17 @@ def foo(a, b, c=1):
 def test_curry_attributes_writable():
     def foo(a, b, c=1):
         return a + b + c
-
+    foo.__qualname__ = 'this.is.foo'
     f = curry(foo, 1, c=2)
+    assert f.__qualname__ == 'this.is.foo'
     f.__name__ = 'newname'
     f.__doc__ = 'newdoc'
     f.__module__ = 'newmodule'
+    f.__qualname__ = 'newqualname'
     assert f.__name__ == 'newname'
     assert f.__doc__ == 'newdoc'
     assert f.__module__ == 'newmodule'
+    assert f.__qualname__ == 'newqualname'
     if hasattr(f, 'func_name'):
         assert f.__name__ == f.func_name
 

toolz/tests/test_serialization.py

@@ -116,6 +116,7 @@ def g3(self):
 def test_curried_qualname():
     if not PY3:
         return
+
     def preserves_identity(obj):
         return pickle.loads(pickle.dumps(obj)) is obj
 
@@ -124,22 +125,6 @@ def preserves_identity(obj):
     assert preserves_identity(GlobalCurried.func.NestedCurried)
     assert preserves_identity(GlobalCurried.func.NestedCurried.func.f2)
     assert preserves_identity(GlobalCurried.func.Nested.f3)
-    if not PY33 and not PY34:
-        assert preserves_identity(GlobalCurried.func.g1)
-        assert preserves_identity(GlobalCurried.func.NestedCurried.func.g2)
-        assert preserves_identity(GlobalCurried.func.Nested)
-        assert preserves_identity(GlobalCurried.func.Nested.g3)
-
-    # Rely on curry.__getattr__
-    assert preserves_identity(GlobalCurried.f1)
-    assert preserves_identity(GlobalCurried.NestedCurried)
-    assert preserves_identity(GlobalCurried.NestedCurried.f2)
-    assert preserves_identity(GlobalCurried.Nested.f3)
-    if not PY33 and not PY34:
-        assert preserves_identity(GlobalCurried.g1)
-        assert preserves_identity(GlobalCurried.NestedCurried.g2)
-        assert preserves_identity(GlobalCurried.Nested)
-        assert preserves_identity(GlobalCurried.Nested.g3)
 
     global_curried1 = GlobalCurried(1)
     global_curried2 = pickle.loads(pickle.dumps(global_curried1))
@@ -156,31 +141,50 @@ def preserves_identity(obj):
     assert func1 is not func2
     assert func1(4) == func2(4) == 10
 
-    nested_curried1 = GlobalCurried.NestedCurried(1)
+    nested_curried1 = GlobalCurried.func.NestedCurried(1)
     nested_curried2 = pickle.loads(pickle.dumps(nested_curried1))
     assert nested_curried1 is not nested_curried2
     assert nested_curried1(2).f2(3, 4) == nested_curried2(2).f2(3, 4) == 10
 
-    nested_curried3 = nested_curried1(2)
-    nested_curried4 = pickle.loads(pickle.dumps(nested_curried3))
-    assert nested_curried3 is not nested_curried4
-    assert nested_curried3.f2(3, 4) == nested_curried4.f2(3, 4) == 10
-
-    func1 = nested_curried1(2).f2(3)
-    func2 = pickle.loads(pickle.dumps(func1))
-    assert func1 is not func2
-    assert func1(4) == func2(4) == 10
-
-    if not PY33 and not PY34:
-        nested3 = GlobalCurried.Nested(1, 2)
-        nested4 = pickle.loads(pickle.dumps(nested3))
-        assert nested3 is not nested4
-        assert nested3.f3(3, 4) == nested4.f3(3, 4) == 10
-
-        func1 = nested3.f3(3)
-        func2 = pickle.loads(pickle.dumps(func1))
-        assert func1 is not func2
-        assert func1(4) == func2(4) == 10
+    # If we add `curry.__getattr__` forwarding, the following tests will pass
+
+    # if not PY33 and not PY34:
+    #     assert preserves_identity(GlobalCurried.func.g1)
+    #     assert preserves_identity(GlobalCurried.func.NestedCurried.func.g2)
+    #     assert preserves_identity(GlobalCurried.func.Nested)
+    #     assert preserves_identity(GlobalCurried.func.Nested.g3)
+    #
+    # # Rely on curry.__getattr__
+    # assert preserves_identity(GlobalCurried.f1)
+    # assert preserves_identity(GlobalCurried.NestedCurried)
+    # assert preserves_identity(GlobalCurried.NestedCurried.f2)
+    # assert preserves_identity(GlobalCurried.Nested.f3)
+    # if not PY33 and not PY34:
+    #     assert preserves_identity(GlobalCurried.g1)
+    #     assert preserves_identity(GlobalCurried.NestedCurried.g2)
+    #     assert preserves_identity(GlobalCurried.Nested)
+    #     assert preserves_identity(GlobalCurried.Nested.g3)
+    #
+    # nested_curried3 = nested_curried1(2)
+    # nested_curried4 = pickle.loads(pickle.dumps(nested_curried3))
+    # assert nested_curried3 is not nested_curried4
+    # assert nested_curried3.f2(3, 4) == nested_curried4.f2(3, 4) == 10
+    #
+    # func1 = nested_curried1(2).f2(3)
+    # func2 = pickle.loads(pickle.dumps(func1))
+    # assert func1 is not func2
+    # assert func1(4) == func2(4) == 10
+    #
+    # if not PY33 and not PY34:
+    #     nested3 = GlobalCurried.func.Nested(1, 2)
+    #     nested4 = pickle.loads(pickle.dumps(nested3))
+    #     assert nested3 is not nested4
+    #     assert nested3.f3(3, 4) == nested4.f3(3, 4) == 10
+    #
+    #     func1 = nested3.f3(3)
+    #     func2 = pickle.loads(pickle.dumps(func1))
+    #     assert func1 is not func2
+    #     assert func1(4) == func2(4) == 10
 
 
 def test_curried_bad_qualname():