Merge pull request #345 from crimsoncantab/master

related to issue 1708 - bugfix to allow no expiration for gae_memcache
2014-01-14 20:08:28 -08:00
parent 200a953849 378a696bfe
commit c7f6545f8a
1 changed files with 2 additions and 6 deletions
@@ -27,15 +27,11 @@ class MemcacheClient(object):
        time_expire=300,
    ):
        key = '%s/%s' % (self.request.application, key)
-        dt = time_expire
        value = None
        obj = self.client.get(key)
-        if obj and (dt is None or obj[0] > time.time() - dt):
+        if obj:
            value = obj[1]
-        elif f is None:
-            if obj:
-                self.client.delete(key)
-        else:
+        elif f is not None:
            value = f()
            self.client.set(key, (time.time(), value), time=time_expire)
        return value