-

cool-RR · cool-RR · commit 8a027e58f408 · 2013-01-26T02:31:08.000+02:00
diff --git a/python_toolbox/caching/cached_property.py b/python_toolbox/caching/cached_property.py
@@ -61,7 +61,7 @@ def __get__(self, obj, our_type=None):
     
     def __call__(self, method_function):
         '''
-        Decorate method to use value of the `CachedProperty` as a context manager.
+        Decorate method to use value of `CachedProperty` as a context manager.
         '''
         def inner(same_method_function, self_obj, *args, **kwargs):
             with getattr(self_obj, self.get_our_name(self_obj)):
diff --git a/python_toolbox/monkeypatching_tools.py b/python_toolbox/monkeypatching_tools.py
@@ -4,7 +4,9 @@
 '''Tools for monkeypatching.'''
 
 import types
+
 from python_toolbox import decorator_tools
+from python_toolbox import caching
 
 
 @decorator_tools.helpful_decorator_builder
@@ -27,14 +29,25 @@ def my_method(a):
         
     You may use the `name` argument to specify a method name different from the
     function's name.
+    
+    You can also use this to monkeypatch a `CachedProperty` into a class.
     '''
     def decorator(function):
         # Note that unlike most decorators, this decorator retuns the function
         # it was given without modifying it. It modifies the class only.
-        name_ = name or function.__name__
-        new_method = types.MethodType(function, None, class_)
-        # todo: Last line was: `new_method = types.MethodType(function,
-        # class_)`, is subtly wrong, make tests to prove
-        setattr(class_, name_, new_method)
-        return function
+        if isinstance(function, types.FunctionType):
+            name_ = name or function.__name__
+            new_method = types.MethodType(function, None, class_)
+            # todo: Last line was: `new_method = types.MethodType(function,
+            # class_)`, is subtly wrong, make tests to prove
+            setattr(class_, name_, new_method)
+            return function
+        else:
+            assert isinstance(function, caching.CachedProperty)
+            cached_property = function
+            if not isinstance(cached_property.getter, types.FunctionType):
+                raise NotImplemented
+            name_ = cached_property.getter.__name__
+            setattr(class_, name_, cached_property)
+            return cached_property
     return decorator
diff --git a/test_python_toolbox/test_monkeypatching_tools.py b/test_python_toolbox/test_monkeypatching_tools.py
@@ -5,9 +5,12 @@
 
 from __future__ import with_statement
 
+import uuid
+
 from python_toolbox import cute_testing
 
 from python_toolbox import monkeypatching_tools
+from python_toolbox import caching
 
 
 def test():
@@ -35,6 +38,27 @@ def woof(a):
     del meow, woof
     
     
+def test_monkeypatch_cached_property():
+
+    class A(object):
+        pass
+
+    @monkeypatching_tools.monkeypatch_method(A)
+    @caching.CachedProperty
+    def meow(a):
+        return (type(a), uuid.uuid4().hex)
+    
+    a0 = A()
+    assert a0.meow == a0.meow == a0.meow == a0.meow
+    
+    a1 = A()
+    assert a1.meow == a1.meow == a1.meow == a1.meow
+    
+    assert a0.meow != a1.meow
+    assert a0.meow[0] == a1.meow[0] == A
+    
+    
+    
 def test_helpful_message_when_forgetting_parentheses():
     '''Test user gets a helpful exception when when forgetting parentheses.'''
 
