-

cool-RR · cool-RR · commit b0ff8efc906a · 2012-12-25T16:23:12.000+02:00
diff --git a/python_toolbox/caching/__init__.py b/python_toolbox/caching/__init__.py
@@ -5,6 +5,6 @@
 
 # todo: examine thread-safety
 
-from .cache import cache
+from .decorators import cache
 from .cached_type import CachedType
 from .cached_property import CachedProperty
diff --git a/python_toolbox/caching/decorators.py b/python_toolbox/caching/decorators.py
@@ -23,6 +23,15 @@ class CLEAR_ENTIRE_CACHE(object):
     '''Sentinel object for clearing the entire cache'''
 
 
+def _get_now():
+    '''
+    Get the current datetime.
+    
+    This is specified as a function to make testing easier.
+    '''
+    return datetime_module.datetime.now()
+
+
 @decorator_tools.helpful_decorator_builder
 def cache(max_size=infinity, time_to_keep=None):
     '''
@@ -89,7 +98,7 @@ def remove_expired_entries():
                     cutting_point = binary_search.binary_search_by_index(
                         cached._cache.keys(),
                         sorting_key_function,
-                        datetime_module.datetime.now(), 
+                        _get_now(), 
                         rounding=binary_search.LOW
                     )
                     if cutting_point is not None:
@@ -107,7 +116,7 @@ def cached(function, *args, **kwargs):
                         value = function(*args, **kwargs)
                         cached._cache[sleek_call_args] = (
                             value,
-                            datetime_module.datetime.now()
+                            _get_now()
                         )
                         cached._cache.sort(key=sorting_key_function)
                         return value
diff --git a/test_python_toolbox/test_caching/test_cache.py b/test_python_toolbox/test_caching/test_cache.py
@@ -11,6 +11,7 @@
 
 import nose.tools
 
+from python_toolbox import caching
 from python_toolbox.caching import cache
 from python_toolbox import temp_value_setting
 from python_toolbox import cute_testing
@@ -206,25 +207,25 @@ def _mock_now():
         return fixed_time
     
     with temp_value_setting.TempValueSetter(
-                                 (datetime_module.datetime, 'now'), _mock_now):
-        assert map(f, 'abc') == (1, 2, 3)
+                                  (caching.decorators, '_get_now'), _mock_now):
+        assert map(f, 'abc') == [1, 2, 3]
         fixed_time += datetime_module.timedelta(days=100)
-        assert map(f, 'abc') == (1, 2, 3)
-        assert map(f, 'def') == (4, 5, 6)
+        assert map(f, 'abc') == [1, 2, 3]
+        assert map(f, 'def') == [4, 5, 6]
         fixed_time += datetime_module.timedelta(days=100)
-        assert map(f, 'abc') == (1, 2, 3)
-        assert map(f, 'def') == (4, 5, 6)
+        assert map(f, 'abc') == [1, 2, 3]
+        assert map(f, 'def') == [4, 5, 6]
         fixed_time += datetime_module.timedelta(days=100)
-        assert map(f, 'abc') == (1, 2, 3)
-        assert map(f, 'def') == (4, 5, 6)
+        assert map(f, 'abc') == [1, 2, 3]
+        assert map(f, 'def') == [4, 5, 6]
         fixed_time += datetime_module.timedelta(days=100)
-        assert map(f, 'abc') == (7, 8, 9)
-        assert map(f, 'def') == (4, 5, 6)
+        assert map(f, 'abc') == [7, 8, 9]
+        assert map(f, 'def') == [4, 5, 6]
         fixed_time += datetime_module.timedelta(days=100)
-        assert map(f, 'abc') == (7, 8, 9)
-        assert map(f, 'def') == (10, 11, 12)
+        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 map(f, 'abcdef') == [13, 14, 15, 16, 17, 18]
         assert f(a='d', b='meow') == 19
         
