[Zope-Checkins] CVS: Zope/lib/python/OFS - ObjectManager.py:1.158.6.1

[Florent Guillaume]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv18988/lib/python/OFS

Modified Files:
      Tag: Zope-2_6-branch
	ObjectManager.py 
Log Message:
Merge from HEAD:
ConflictError was swallowed in ObjectManager by manage_beforeDelete and
_delObject. This could break code expecting to do cleanups before
deletion.


=== Zope/lib/python/OFS/ObjectManager.py 1.158 => 1.158.6.1 ===
--- Zope/lib/python/OFS/ObjectManager.py:1.158	Wed Aug 14 17:42:56 2002
+++ Zope/lib/python/OFS/ObjectManager.py	Sun Nov  2 13:14:44 2003
@@ -27,6 +27,7 @@
 from webdav.Collection import Collection
 from Acquisition import aq_base
 from AccessControl.SecurityInfo import ClassSecurityInfo
+from ZODB.POSException import ConflictError
 from urllib import quote
 from cStringIO import StringIO
 import marshal
@@ -297,6 +298,8 @@
                     object.manage_beforeDelete(item, container)
             except BeforeDeleteException, ob:
                 raise
+            except ConflictError:
+                raise
             except:
                 LOG('Zope',ERROR,'manage_beforeDelete() threw',
                     error=sys.exc_info())
@@ -308,6 +311,8 @@
         try:
             object.manage_beforeDelete(object, self)
         except BeforeDeleteException, ob:
+            raise
+        except ConflictError:
             raise
         except:
             LOG('Zope',ERROR,'manage_beforeDelete() threw',