[Zope-CVS] CVS: Products/BTreeFolder2 - BTreeFolder2.py:1.20 CHANGES.txt:1.2

[Florent Guillaume]

Update of /cvs-repository/Products/BTreeFolder2
In directory cvs.zope.org:/tmp/cvs-serv4144

Modified Files:
	BTreeFolder2.py CHANGES.txt 
Log Message:
ConflictError was swallowed by _delObject. This could break code
expecting to do cleanups before deletion.


=== Products/BTreeFolder2/BTreeFolder2.py 1.19 => 1.20 ===
--- Products/BTreeFolder2/BTreeFolder2.py:1.19	Sat Jan 10 11:02:35 2004
+++ Products/BTreeFolder2/BTreeFolder2.py	Mon Jan 26 16:57:11 2004
@@ -29,6 +29,7 @@
 from BTrees.OOBTree import OOBTree
 from BTrees.OIBTree import OIBTree, union
 from BTrees.Length import Length
+from ZODB.POSException import ConflictError
 from OFS.ObjectManager import BadRequestException, BeforeDeleteException
 from OFS.Folder import Folder
 from AccessControl import getSecurityManager, ClassSecurityInfo
@@ -435,6 +436,8 @@
         try:
             object.manage_beforeDelete(object, self)
         except BeforeDeleteException, ob:
+            raise
+        except ConflictError:
             raise
         except:
             LOG('Zope', ERROR, 'manage_beforeDelete() threw',


=== Products/BTreeFolder2/CHANGES.txt 1.1 => 1.2 ===
--- Products/BTreeFolder2/CHANGES.txt:1.1	Wed Aug 27 11:32:37 2003
+++ Products/BTreeFolder2/CHANGES.txt	Mon Jan 26 16:57:11 2004
@@ -1,3 +1,7 @@
+Version CVS
+
+  - ConflictError was swallowed by _delObject. This could break code
+    expecting to do cleanups before deletion.
 
 Version 1.0