[Zope-Checkins] CVS: Zope/lib/python/OFS - Traversable.py:1.15.6.5

[Andreas Jung]

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

Modified Files:
      Tag: Zope-2_6-branch
	Traversable.py 
Log Message:

     - Collector #851: Traversable.py: A bare try..except shadowed
       conflict errors


=== Zope/lib/python/OFS/Traversable.py 1.15.6.4 => 1.15.6.5 ===
--- Zope/lib/python/OFS/Traversable.py:1.15.6.4	Wed Feb 26 11:48:59 2003
+++ Zope/lib/python/OFS/Traversable.py	Mon Sep 29 08:39:09 2003
@@ -20,6 +20,7 @@
 from AccessControl import getSecurityManager
 from AccessControl import Unauthorized
 from AccessControl.ZopeGuards import guarded_getattr
+from ZODB.POSException import ConflictError
 from urllib import quote
 
 _marker=[]
@@ -163,6 +164,7 @@
 
             return object
 
+        except ConflictError: raise
         except:
             if default==_marker: raise
             return default