-

Ram Rachum · Ram Rachum · commit 87419a86a9f3 · 2011-02-06T00:29:04.000-05:00
diff --git a/garlicsim/garlicsim/general_misc/caching/__init__.py b/garlicsim/garlicsim/general_misc/caching/__init__.py
@@ -3,6 +3,7 @@
 
 '''Defines various caching tools.'''
 
+# todo: examine thread-safety
 
 from .cache import cache
 from .cached_type import CachedType
diff --git a/garlicsim/garlicsim/general_misc/caching/cache.py b/garlicsim/garlicsim/general_misc/caching/cache.py
@@ -7,6 +7,7 @@
 See its documentation for more details.
 '''
 # blocktodo: test double-caching of function
+# todo: examine thread-safety
 
 import functools
 
@@ -73,13 +74,6 @@ def cached(function, *args, **kwargs):
                     cached._cache[sleek_call_args] = value = \
                           function(*args, **kwargs)
                     return value
-                
-            cached._cache = cache_dict
-            cached.is_cached = True
-            
-            result = decorator_tools.decorator(cached, function)
-            result.cache_clear = cached._cache.clear
-            return result
         
     else: # max_size < infinity
         
@@ -103,11 +97,15 @@ def cached(function, *args, **kwargs):
                         cached._cache.popitem(last=False)
                     return value
                     
-            cached._cache = cache_dict
-            cached.is_cached = True
+        cached._cache = cache_dict
+        cached.is_cached = True
+        
+        def cache_clear():
+            '''Clear the cache, deleting all saved results.'''
+            cache.clear()
             
-            result = decorator_tools.decorator(cached, function)
-            result.cache_clear = cached._cache.clear
-            return result
+        result = decorator_tools.decorator(cached, function)
+        result.cache_clear = cached._cache.clear
+        return result
         
     return decorator
