From c302a70f60797b6b48b051f1b7ab225ee51ab529 Mon Sep 17 00:00:00 2001 From: Thomas Desvenain Date: Mon, 20 Jan 2014 10:14:29 +0100 Subject: [PATCH] take account of tseaver review --- CHANGES.txt | 1 - src/Products/StandardCacheManagers/RAMCacheManager.py | 10 ++-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index f5d2dbb..ee60a61 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,7 +6,6 @@ Changelog - Avoid a lot of warnings when we try to RAM cache in a context we don't have a Request. - [thomasdesvenain] 2.13.0 (2010-07-11) ------------------- diff --git a/src/Products/StandardCacheManagers/RAMCacheManager.py b/src/Products/StandardCacheManagers/RAMCacheManager.py index 14b0a04..d2fdaa2 100644 --- a/src/Products/StandardCacheManagers/RAMCacheManager.py +++ b/src/Products/StandardCacheManagers/RAMCacheManager.py @@ -290,15 +290,12 @@ def ZCache_get(self, ob, view_name='', keywords=None, ''' Gets a cache entry or returns default. ''' - if not hasattr(ob, 'REQUEST'): - return default - oc = self.getObjectCacheEntries(ob) if oc is None: return default lastmod = ob.ZCacheable_getModTime(mtime_func) - index = oc.aggregateIndex(view_name, ob.REQUEST, + index = oc.aggregateIndex(view_name, getattr(ob, 'REQUEST', None), self.request_vars, keywords) entry = oc.getEntry(lastmod, index) if entry is _marker: @@ -320,9 +317,6 @@ def ZCache_set(self, ob, data, view_name='', keywords=None, ''' Sets a cache entry. ''' - if not hasattr(ob, 'REQUEST'): - return - now = time.time() if self.next_cleanup <= now: self.cleanup() @@ -332,7 +326,7 @@ def ZCache_set(self, ob, data, view_name='', keywords=None, self.writelock.acquire() try: oc = self.getObjectCacheEntries(ob, create=1) - index = oc.aggregateIndex(view_name, ob.REQUEST, + index = oc.aggregateIndex(view_name, getattr(ob, 'REQUEST', None), self.request_vars, keywords) oc.setEntry(lastmod, index, data, view_name) oc.misses = oc.misses + 1