diff --git a/gluon/cache.py b/gluon/cache.py index 1cf9b175..15815af3 100644 --- a/gluon/cache.py +++ b/gluon/cache.py @@ -19,7 +19,6 @@ When web2py is running on Google App Engine, caching will be provided by the GAE memcache (see gluon.contrib.gae_memcache) """ -import traceback import time import portalocker import shelve @@ -278,7 +277,7 @@ class CacheOnDisk(CacheAbstract): storage = shelve.open(self.shelve_name) except: logger.error('corrupted cache file %s, will try rebuild it' - % (self.shelve_name)) + % self.shelve_name) storage = None if not storage and os.path.exists(self.shelve_name): os.unlink(self.shelve_name) @@ -479,7 +478,6 @@ class Cache(object): if not session_ and public_: cache_control += ', public' expires = (current.request.utcnow + datetime.timedelta(seconds=time_expire)).strftime('%a, %d %b %Y %H:%M:%S GMT') - vary = None else: cache_control += ', private' expires = 'Fri, 01 Jan 1990 00:00:00 GMT'