-

cool-RR · cool-RR · commit cdbf34be86d0 · 2013-01-26T02:36:11.000+02:00
diff --git a/python_toolbox/caching/cached_property.py b/python_toolbox/caching/cached_property.py
@@ -27,9 +27,14 @@ def _get_personality(self):
                 return 'Nice person'
         
             personality = CachedProperty(_get_personality)
-    
+            
+    You can also put in a value as the first argument if you'd like to have it
+    returned instead of using a getter. (It can be a totally static value like
+    `0`). If this value happens to be a callable but you'd still like it to be
+    used as a static value, use `force_value_not_getter=True`.
     '''
-    def __init__(self, getter_or_value, doc=None, name=None):
+    def __init__(self, getter_or_value, doc=None, name=None,
+                 force_value_not_getter=False):
         '''
         Construct the cached property.
         
@@ -41,8 +46,10 @@ def __init__(self, getter_or_value, doc=None, name=None):
         class; this will save a bit of processing later.
         '''
         misc_tools.OwnNameDiscoveringDescriptor.__init__(self, name=name)
-        self.getter = getter_or_value if callable(getter_or_value) \
-                      else lambda thing: getter_or_value
+        if callable(getter_or_value) and not force_value_not_getter:
+            self.getter = getter_or_value
+        else:
+            self.getter = lambda thing: getter_or_value
         self.__doc__ = doc or getattr(self.getter, '__doc__', None)
         
         
diff --git a/test_python_toolbox/test_caching/test_cached_property.py b/test_python_toolbox/test_caching/test_cached_property.py
@@ -177,4 +177,12 @@ def my_method(self, x, y=3):
         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)
-        
+        
+def test_force_value_not_getter():
+    class A(object):
+        personality = CachedProperty(counting_func,
+                                     force_value_not_getter=True)
+        
+    a = A()
+    assert a.personality == counting_func == a.personality == counting_func
+    
