-

cool-RR · cool-RR · commit b5d53188d0a8 · 2013-10-26T19:51:47.000+03:00
diff --git a/source_py3/python_toolbox/monkeypatching_tools.py b/source_py3/python_toolbox/monkeypatching_tools.py
@@ -46,9 +46,8 @@ def decorator(function):
         if isinstance(function, types.FunctionType):
             name_ = name or function.__name__
             
-            new_method = types.MethodType(function, monkeypatchee) if \
-                monkeypatchee_is_a_class else types.MethodType(function,
-                                                        class_of_monkeypatchee)
+            new_method = function if monkeypatchee_is_a_class else \
+                             types.MethodType(function, class_of_monkeypatchee)
             setattr(monkeypatchee, name_, new_method)
             return function
         else:
diff --git a/source_py3/test_python_toolbox/test_monkeypatching_tools.py b/source_py3/test_python_toolbox/test_monkeypatching_tools.py
@@ -18,25 +18,30 @@
 from python_toolbox import caching
 
 
+class EqualByIdentity:
+    def __eq__(self, other):
+        return self is other
+
+
 def test():
     '''Test basic workings of `monkeypatch_method`.'''
     
-    class A:
+    class A(EqualByIdentity):
         pass
 
     @monkeypatching_tools.monkeypatch_method(A)
     def meow(a):
-        return 1
+        return (a, 1)
     
     a = A()
     
-    assert a.meow() == meow(a) == 1
+    assert a.meow() == meow(a) == (a, 1)
     
     @monkeypatching_tools.monkeypatch_method(A, 'roar')
     def woof(a):
-        return 2
+        return (a, 2)
     
-    assert a.roar() == woof(a) == 2
+    assert a.roar() == woof(a) == (a, 2)
     
     assert not hasattr(a, 'woof')
     
@@ -45,7 +50,7 @@ def woof(a):
     
 def test_monkeypatch_cached_property():
 
-    class A:
+    class A(EqualByIdentity):
         pass
 
     @monkeypatching_tools.monkeypatch_method(A)
@@ -82,31 +87,29 @@ def f(): pass
 
 def test_monkeypatch_staticmethod():
 
-    class A:
+    class A(EqualByIdentity):
         @staticmethod
         def my_static_method(x):
             raise 'Flow should never reach here.'
         
     @monkeypatching_tools.monkeypatch_method(A)
     @staticmethod
     def my_static_method(x):
-        return 'Success'
+        return (x, 'Success')
     
     assert isinstance(cute_inspect.getattr_static(A, 'my_static_method'),
                       staticmethod)
     assert isinstance(A.my_static_method, types.FunctionType)
     
-    assert A.my_static_method(3) == A.my_static_method('Whatever') == \
-                                                                      'Success'
+    assert A.my_static_method(3) == A.my_static_method(3) == (3, 'Success')
     
     a0 = A()
-    assert a0.my_static_method(3) == a0.my_static_method('Whatever') == \
-                                                                      'Success'
+    assert a0.my_static_method(3) == a0.my_static_method(3) == (3, 'Success')
     
     
 def test_monkeypatch_classmethod():
 
-    class A:
+    class A(EqualByIdentity):
         @classmethod
         def my_class_method(cls):
             raise 'Flow should never reach here.'
@@ -136,7 +139,7 @@ def test_monkeypatch_classmethod_subclass():
     class FunkyClassMethod(classmethod):
         is_funky = True
 
-    class A:
+    class A(EqualByIdentity):
         @FunkyClassMethod
         def my_funky_class_method(cls):
             raise 'Flow should never reach here.'
@@ -161,7 +164,7 @@ def test_directly_on_object():
     
     class A:
         def woof(self):
-            return 'woof'
+            return (self, 'woof')
 
     a0 = A()
     a1 = A()
@@ -177,12 +180,12 @@ def woof(a):
     assert a0.meow() == 'not meow'
     assert a0.woof() == 'not woof'
     
-    assert a1.woof() == 'woof'
+    assert a1.woof() == (a1, 'woof')
     
     with cute_testing.RaiseAssertor(AttributeError):
         A.meow()
     with cute_testing.RaiseAssertor(AttributeError):
         a1.meow()
         
-    assert A.woof(a0) == 'woof'
+    assert A.woof(a0) == (a0, 'woof')
     
