-

Ram Rachum · Ram Rachum · commit 383bc98be9e5 · 2011-02-06T00:35:45.000-05:00
diff --git a/garlicsim/garlicsim/general_misc/caching/cache.py b/garlicsim/garlicsim/general_misc/caching/cache.py
@@ -57,14 +57,15 @@ def f(a, b=2):
                         'used `@cache`, while you should have used '
                         '`@cache()`' % max_size)
 
-    if max_size == infinity:
+    def decorator(function):
         
-        def decorator(function):
-            # In case we're being given a function that is already cached:
-            if getattr(function, 'is_cached', False): return function
+        # In case we're being given a function that is already cached:
+        if getattr(function, 'is_cached', False): return function
+        
+        if max_size == infinity:
             
             cache_dict = {}
-            
+
             def cached(function, *args, **kwargs):
                 sleek_call_args = \
                     SleekCallArgs(cache_dict, function, *args, **kwargs)
@@ -74,12 +75,8 @@ def cached(function, *args, **kwargs):
                     cached._cache[sleek_call_args] = value = \
                           function(*args, **kwargs)
                     return value
-        
-    else: # max_size < infinity
-        
-        def decorator(function): 
-            # In case we're being given a function that is already cached:
-            if getattr(function, 'is_cached', False): return function
+    
+        else: # max_size < infinity
             
             cache_dict = OrderedDict()
             
@@ -100,12 +97,13 @@ def cached(function, *args, **kwargs):
         cached._cache = cache_dict
         cached.is_cached = True
         
+        result = decorator_tools.decorator(cached, function)
+        
         def cache_clear():
             '''Clear the cache, deleting all saved results.'''
-            cache.clear()
-            
-        result = decorator_tools.decorator(cached, function)
-        result.cache_clear = cached._cache.clear
+            cached._cache.clear()    
+        result.cache_clear = cache_clear
+        
         return result
         
     return decorator
diff --git a/garlicsim/test_garlicsim/test_general_misc/test_caching/test_cache.py b/garlicsim/test_garlicsim/test_general_misc/test_caching/test_cache.py
@@ -179,4 +179,7 @@ def test_api():
         result_2 = cached_function(1)
         
         assert cached_function(1) == result_2 == cached_function(1)
-        assert result_1 != result_2 == cached_function(1) != result_1
+        assert result_1 != result_2 == cached_function(1) != result_1
+        
+        # Asserting we're not using `dict.clear` or something:
+        assert cached_function.cache_clear.__name__ == 'cache_clear'
