[prev in list] [next in list] [prev in thread] [next in thread] 

List:       zope-cvs
Subject:    [Zope-Checkins] SVN: Zope/branches/2.12/ Avoid problems in removing
From:       Hanno Schlichting <hannosch () hannosch ! eu>
Date:       2010-06-30 8:08:26
Message-ID: 20100630080826.B66C5941C3 () cvs ! zope ! org
[Download RAW message or body]

Log message for revision 114000:
  Avoid problems in removing cache managers introduced in Zope 2.12.8.
  

Changed:
  U   Zope/branches/2.12/doc/CHANGES.rst
  U   Zope/branches/2.12/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
  U   Zope/branches/2.12/src/Products/StandardCacheManagers/RAMCacheManager.py

-=-
Modified: Zope/branches/2.12/doc/CHANGES.rst
===================================================================
--- Zope/branches/2.12/doc/CHANGES.rst	2010-06-30 07:59:37 UTC (rev 113999)
+++ Zope/branches/2.12/doc/CHANGES.rst	2010-06-30 08:08:26 UTC (rev 114000)
@@ -11,6 +11,8 @@
 Bugs Fixed
 ++++++++++
 
+- Avoid problems in removing cache managers introduced in Zope 2.12.8.
+
 - LP #143531: Fix broken object so they give access to their state.
 
 - LP #578326: Issue a warning if someone specifies a non-public permission

Modified: Zope/branches/2.12/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py
 ===================================================================
--- Zope/branches/2.12/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py	2010-06-30 \
                07:59:37 UTC (rev 113999)
+++ Zope/branches/2.12/src/Products/StandardCacheManagers/AcceleratedHTTPCacheManager.py	2010-06-30 \
08:08:26 UTC (rev 114000) @@ -174,7 +174,7 @@
 
     security.declarePrivate('_remove_data')
     def _remove_data(self):
-        caches.pop(self.__cacheid)
+        caches.pop(self.__cacheid, None)
 
     security.declarePrivate('_resetCacheId')
     def _resetCacheId(self):

Modified: Zope/branches/2.12/src/Products/StandardCacheManagers/RAMCacheManager.py
===================================================================
--- Zope/branches/2.12/src/Products/StandardCacheManagers/RAMCacheManager.py	2010-06-30 \
                07:59:37 UTC (rev 113999)
+++ Zope/branches/2.12/src/Products/StandardCacheManagers/RAMCacheManager.py	2010-06-30 \
08:08:26 UTC (rev 114000) @@ -382,7 +382,7 @@
 
     security.declarePrivate('_remove_data')
     def _remove_data(self):
-        caches.pop(self.__cacheid)
+        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


[prev in list] [next in list] [prev in thread] [next in thread]