Changeset e7862421fa4b2c8d8a5759e89dbfa53f0fbda97f for pyxcb

Timestamp:

01/03/2009 05:28:40 PM (19 months ago)

Author:

Friedrich Weber <fred@…>

Children:

6fd23d00b34f187e402f49614fcc3f5c69d3fae0

Parents:

7b6203a415e9073eb38fc7b42431d4525cccb28a

git-committer:

Friedrich Weber <fred@samurai-x.org> / 2009-01-03T17:28:40Z+0100

Message:

pyxcb: nicer cached_property implementation

Files:

• pyxcb/pyxcb/util.py (modified) (1 diff)

pyxcb/pyxcb/util.py

@@ -31 +31 @@
 log = logging.getLogger(__name__)
 
-CACHE_KEYWORD = '_cached'
 # There is operator.methodcaller in Python 2.6!
 methodcaller = lambda method: lambda value: getattr(value, method)()
 
-def cached(func):
-    # TODO: UGLY UGLY UGLY
-    def do_cache(self, *args, **kwargs):
-        if CACHE_KEYWORD not in func.func_dict: # table does not exist
-            func.func_dict[CACHE_KEYWORD] = {}
-        if self not in func.func_dict[CACHE_KEYWORD]:
-            func.func_dict[CACHE_KEYWORD][self] = func(self, *args, **kwargs)
-        return func.func_dict[CACHE_KEYWORD][self]
-    return do_cache
+def cached_property(func):
+    """
+        `property`, but cached;
 
-def cached_property(func):
-    return property(cached(func))
+        taken from http://code.activestate.com/recipes/576563/ - thanks.
+    """
+    def getter(self):
+        try:
+            return self._property_cache[func]
+        except AttributeError:
+            self._property_cache = {}
+            self._property_cache[func] = ret = func(self)
+            return ret
+        except KeyError:
+            self._property_cache[func] = ret = func(self)
+            return ret
+    return property(getter)
 
 def reverse_dict(d):