-

cool-RR · cool-RR · commit 2c82d3982214 · 2013-10-26T20:24:11.000+03:00
diff --git a/source_py2/python_toolbox/monkeypatching_tools.py b/source_py2/python_toolbox/monkeypatching_tools.py
@@ -56,19 +56,25 @@ def decorator(function):
             if not monkeypatchee_is_a_class:
                 raise NotImplemented("I don't know how to monkeypatch a "
                                      "descriptor onto a non-class object.")
-            ### Getting name of descriptor: ###################################
-            #                                                                 #
-            if isinstance(function, caching.CachedProperty):
-                if not isinstance(function.getter, types.FunctionType):
-                    raise NotImplemented
-                name_ = function.getter.__name__
-            elif isinstance(function, (classmethod, staticmethod)):
-                name_ = function.__func__.__name__
-            else:
-                raise NotImplemented("`monkeypatch_method` doesn't know how "
-                                     "to handle this kind of function.")
-            #                                                                 #
-            ### Finished getting name of descriptor. ##########################
+            if not name:
+                ### Getting name of descriptor: ###############################
+                #                                                             #
+                if isinstance(function, caching.CachedProperty):
+                    if not isinstance(function.getter, types.FunctionType):
+                        raise NotImplemented
+                    name_ = function.getter.__name__
+                elif isinstance(function, (classmethod, staticmethod)):
+                    name_ = function.__func__.__name__
+                elif isinstance(function, property):
+                    name_ = function.fget.__name__
+                else:
+                    raise NotImplemented(
+                        "`monkeypatch_method` doesn't know how to get the "
+                        "name of this kind of function automatically, try "
+                        "manually."
+                    )
+                #                                                             #
+                ### Finished getting name of descriptor. ######################
             setattr(monkeypatchee, name_, function)
             return function
         
diff --git a/source_py2/test_python_toolbox/test_monkeypatching_tools.py b/source_py2/test_python_toolbox/test_monkeypatching_tools.py
@@ -47,6 +47,21 @@ def woof(a):
     del meow, woof
     
     
+def test_monkeypatch_property():
+
+    class A(EqualByIdentity):
+        pass
+
+    @monkeypatching_tools.monkeypatch_method(A)
+    @property
+    def meow(a):
+        return (type(a), 'bark')
+    
+    a0 = A()
+    a1 = A()
+    assert a0.meow == a1.meow == (A, 'bark') 
+    
+    
 def test_monkeypatch_cached_property():
 
     class A(EqualByIdentity):
