[Zope-Checkins] CVS: Zope2 - Connection.py:1.49

[chrism@serenade.digicool.com]

Update of /cvs-repository/Zope2/lib/python/ZODB
In directory serenade.digicool.com:/home/chrism/sandboxes/TrunkBranch/lib/python/ZODB

Modified Files:
	Connection.py 
Log Message:
Added exception handler for conflict error in setstate (better error messages this way).



--- Updated File Connection.py in package Zope2/lib/python/ZODB --
--- Connection.py	2001/03/28 20:55:39	1.48
+++ Connection.py	2001/04/02 14:54:54	1.49
@@ -548,8 +548,9 @@
                     get_transaction().register(self)
                     raise ConflictError(`oid`, `object.__class__`)
 
+        except ConflictError:
+            raise
         except:
-            t, v =sys.exc_info()[:2]
             LOG('ZODB',ERROR, "Couldn't load state for %s" % `oid`,
                 error=sys.exc_info())
             raise



--- Updated File Connection.py in package Zope2 --
--- Connection.py	2001/03/28 20:55:39	1.48
+++ Connection.py	2001/04/02 14:54:54	1.49
@@ -548,8 +548,9 @@
                     get_transaction().register(self)
                     raise ConflictError(`oid`, `object.__class__`)
 
+        except ConflictError:
+            raise
         except:
-            t, v =sys.exc_info()[:2]
             LOG('ZODB',ERROR, "Couldn't load state for %s" % `oid`,
                 error=sys.exc_info())
             raise