take account of tseaver review

zopefoundation · Jan 20, 2014 · c302a70 · c302a70
1 parent e4b7070
commit c302a70
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git 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
@@ -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