Log message for revision 113714: Use the API, thx sidnei! Changed: U Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py U Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py
-=- Modified: Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py =================================================================== --- Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py 2010-06-20 11:12:44 UTC (rev 113713) +++ Zope/trunk/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py 2010-06-20 12:24:02 UTC (rev 113714) @@ -174,9 +174,7 @@ security.declarePrivate('_remove_data') def _remove_data(self): - cid = self.__cacheid - if cid in caches: - caches.pop(self.__cacheid) + caches.pop(self.__cacheid, None) security.declarePrivate('_resetCacheId') def _resetCacheId(self): Modified: Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py =================================================================== --- Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py 2010-06-20 11:12:44 UTC (rev 113713) +++ Zope/trunk/src/Products/StandardCacheManagers/RAMCacheManager.py 2010-06-20 12:24:02 UTC (rev 113714) @@ -382,9 +382,7 @@ security.declarePrivate('_remove_data') def _remove_data(self): - cid = self.__cacheid - if cid in caches: - caches.pop(cid) + caches.pop(self.__cacheid, None) security.declarePrivate('_resetCacheId') def _resetCacheId(self): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins