Task #10801: Support instance methods

LCS/PyCommon/cache.py

@@ -20,7 +20,9 @@
 #
 # $id: __init__.py 1568 2015-09-18 15:21:11z loose $
 
-class cache(dict):
+import functools
+
+class cache(object):
     """ A simple cache for function call return values in Python 2. 
 
         Use:
@@ -36,12 +38,16 @@ class cache(dict):
 
     def __init__(self, func):
         self.func = func
+        self.cache = {}
 
     def __call__(self, *args, **kwargs):
         key = "%s %s" % (args, kwargs) # we can't hash on (args,kwargs) directly
 
-        if key not in self:
-            self[key] = self.func(*args, **kwargs)
+        if key not in self.cache:
+            self.cache[key] = self.func(*args, **kwargs)
 
-        return self[key]
+        return self.cache[key]
 
+    def __get__(self, obj, objtype):
+        """ Support instance methods. """
+        return functools.partial(self.__call__, obj)