-

cool-RR · cool-RR · commit 8a32a75515dd · 2012-12-25T16:16:58.000+02:00
diff --git a/python_toolbox/caching/cache.py b/python_toolbox/caching/cache.py
@@ -82,12 +82,12 @@ def decorator(function):
 
                 cache_dict = OrderedDict()
                 sorting_key_function = lambda sleek_call_args: \
-                                              cached._cache[sleek_call_args][0]
+                                              cached._cache[sleek_call_args][1]
 
                 
                 def remove_expired_entries():
                     cutting_point = binary_search.binary_search_by_index(
-                        cached._cache,
+                        cached._cache.keys(),
                         sorting_key_function,
                         datetime_module.datetime.now(), 
                         rounding=binary_search.LOW
diff --git a/test_python_toolbox/test_caching/test_cache.py b/test_python_toolbox/test_caching/test_cache.py
@@ -191,7 +191,9 @@ def test_double_caching():
     
     
 def test_time_to_keep():
-    f = cache(time_to_keep={'years': 1})(counting_func)
+    f = cache(time_to_keep={'days': 356})(counting_func)
+    
+    assert f('zero') == 0 # Just to get rid of zero
     
     assert f('a') == 1
     assert f('b') == 2
@@ -221,7 +223,8 @@ def _mock_now():
         fixed_time += datetime_module.timedelta(days=100)
         assert map(f, 'abc') == (7, 8, 9)
         assert map(f, 'def') == (10, 11, 12)
+        assert f(a='d') == f(a='d', b=2) == f('d') == 10
         fixed_time += datetime_module.timedelta(days=1000)
         assert map(f, 'abcdef') == (13, 14, 15, 16, 17, 18)
-    
-    
+        assert f(a='d', b='meow') == 19
+        
