[Zope-Checkins] CVS: Zope/lib/python/OFS - Traversable.py:1.21
Andreas Jung
andreas at andreas-jung.com
Mon Sep 29 08:34:39 EDT 2003
Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv1234/lib/python/OFS
Modified Files:
Traversable.py
Log Message:
- Collector #851: Traversable.py: A bare try..except shadowed
conflict errors
=== Zope/lib/python/OFS/Traversable.py 1.20 => 1.21 ===
--- Zope/lib/python/OFS/Traversable.py:1.20 Tue Jul 8 13:03:52 2003
+++ Zope/lib/python/OFS/Traversable.py Mon Sep 29 08:34:38 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
NotFound = 'NotFound'
@@ -150,6 +151,7 @@
return object
+ except ConflictError: raise
except:
if default==_marker: raise
return default
More information about the Zope-Checkins
mailing list