Merge branch 'master' of https://github.com/neoecos/flask-cache into …

…neoecos-master
thadeusb · Apr 21, 2014 · 14720e9 · 14720e9
2 parents 386c05b + 072aadc
commit 14720e9
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/flask_cache/__init__.py b/flask_cache/__init__.py
@@ -276,7 +276,7 @@ def _memvname(self, funcname):
     def memoize_make_version_hash(self):
         return base64.b64encode(uuid.uuid4().bytes)[:6].decode('utf-8')
 
-    def memoize_make_cache_key(self, make_name=None):
+    def memoize_make_cache_key(self, make_name=None, timeout=None):
         """
         Function used to create the cache_key for memoized functions.
         """
@@ -288,7 +288,7 @@ def make_cache_key(f, *args, **kwargs):
 
             if version_data is None:
                 version_data = self.memoize_make_version_hash()
-                self.cache.set(version_key, version_data)
+                self.cache.set(version_key, version_data, timeout=timeout)
 
             cache_key = hashlib.md5()
 
@@ -458,7 +458,8 @@ def decorated_function(*args, **kwargs):
 
             decorated_function.uncached = f
             decorated_function.cache_timeout = timeout
-            decorated_function.make_cache_key = self.memoize_make_cache_key(make_name)
+            decorated_function.make_cache_key = self.memoize_make_cache_key(
+                                                make_name, timeout)
             decorated_function.delete_memoized = lambda: self.delete_memoized(f)
 
             return decorated_function