-

cool-RR · cool-RR · commit 172752002592 · 2012-06-22T23:13:52.000+03:00
diff --git a/python_toolbox/caching/cached_property.py b/python_toolbox/caching/cached_property.py
@@ -7,10 +7,11 @@
 See its documentation for more details.
 '''
 
+from python_toolbox import decorator_tools
 from python_toolbox import misc_tools
 
 
-class CachedProperty(misc_tools.OwnNameDiscoveringProperty):
+class CachedProperty(misc_tools.OwnNameDiscoveringDescriptor):
     '''
     A property that is calculated only once for an object, and then cached.
     
@@ -39,7 +40,7 @@ def __init__(self, getter_or_value, doc=None, name=None):
         You may optionally pass in the name that this property has in the
         class; this will save a bit of processing later.
         '''
-        misc_tools.OwnNameDiscoveringProperty.__init__(self, name=name)
+        misc_tools.OwnNameDiscoveringDescriptor.__init__(self, name=name)
         self.getter = getter_or_value if callable(getter_or_value) \
                       else lambda thing: getter_or_value
         self.__doc__ = doc or getattr(self.getter, '__doc__', None)
@@ -58,3 +59,11 @@ def __get__(self, obj, our_type=None):
         return value
 
     
+    def __call__(self, method_function):
+        '''
+        Decorate method to use value of the `CachedProperty` as a context manager.
+        '''
+        def inner(same_method_function, self_obj, *args, **kwargs):
+            with getattr(self_obj, self.get_our_name(self_obj)):
+                return method_function(self_obj, *args, **kwargs)
+        return decorator_tools.decorator(inner, method_function)
diff --git a/python_toolbox/misc_tools/__init__.py b/python_toolbox/misc_tools/__init__.py
@@ -7,6 +7,6 @@
     is_subclass, get_mro_depth_of_method, frange, getted_vars,
     _ascii_variable_pattern, is_legal_ascii_variable_name,
     is_magic_variable_name, get_actual_type, is_number, identity_function,
-    do_nothing, OwnNameDiscoveringProperty, find_clear_place_on_circle
+    do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle
 )
 from . import name_mangling
diff --git a/python_toolbox/misc_tools/misc_tools.py b/python_toolbox/misc_tools/misc_tools.py
@@ -156,10 +156,12 @@ def do_nothing(*args, **kwargs):
     pass
 
         
-class OwnNameDiscoveringProperty(object):
-    ''' '''
+class OwnNameDiscoveringDescriptor(object):
+    '''A descriptor that can discover the name it's bound to on its object.'''
+    
     def __init__(self, name=None):
         '''
+        Construct the `OwnNameDiscoveringDescriptor`.
         
         You may optionally pass in the name that this property has in the
         class; this will save a bit of processing later.
diff --git a/test_python_toolbox/test_caching/test_cached_property.py b/test_python_toolbox/test_caching/test_cached_property.py
@@ -5,8 +5,9 @@
 
 import nose
 
-from python_toolbox.caching import (cache, CachedType,
-                                            CachedProperty)
+from python_toolbox import context_managers
+
+from python_toolbox.caching import cache, CachedType, CachedProperty
 
 
 def counting_func(self):
@@ -155,4 +156,25 @@ class C(object):
         )
         
     assert C.undocced_property.__doc__ is None
-    
+
+    
+def test_decorating():
+    '''Test method-decorating functionality.'''
+    
+    class A(object):
+        reentrant_context_manager = CachedProperty(
+            lambda self: context_managers.ReentrantContextManager()
+        )
+        
+        @reentrant_context_manager
+        def my_method(self, x, y=3):
+            return (x, y, self.reentrant_context_manager.depth)
+        
+    a = A()
+    
+    assert a.my_method(2) == (2, 3, 1)
+    with a.reentrant_context_manager:
+        assert a.my_method(y=7, x=8) == (8, 7, 2)
+        with a.reentrant_context_manager:
+            assert a.my_method(y=7, x=8) == (8, 7, 3)
+        

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`is_subclass, get_mro_depth_of_method, frange, getted_vars,`
`8`	`8`	`_ascii_variable_pattern, is_legal_ascii_variable_name,`
`9`	`9`	`is_magic_variable_name, get_actual_type, is_number, identity_function,`
`10`		`- do_nothing, OwnNameDiscoveringProperty, find_clear_place_on_circle`
	`10`	`+ do_nothing, OwnNameDiscoveringDescriptor, find_clear_place_on_circle`
`11`	`11`	`)`
`12`	`12`	`from . import name_mangling`