[Zope3-checkins] CVS: Zope3/src/zodb/zeo/tests - multi.py:1.1.2.2

[Barry Warsaw]

Update of /cvs-repository/Zope3/src/zodb/zeo/tests
In directory cvs.zope.org:/tmp/cvs-serv14542/src/zodb/zeo/tests

Modified Files:
      Tag: NameGeddon-branch
	multi.py 
Log Message:
Deunfrakificationlinessification


=== Zope3/src/zodb/zeo/tests/multi.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/zeo/tests/multi.py:1.1.2.1	Mon Dec 23 14:30:53 2002
+++ Zope3/src/zodb/zeo/tests/multi.py	Mon Dec 23 16:52:55 2002
@@ -14,7 +14,7 @@
 """A multi-client test of the ZEO storage server"""
 # XXX This code is currently broken.
 
-import ZODB, ZODB.DB, ZODB.FileStorage, ZODB.POSException
+import ZODB, ZODB.DB, ZODB.FileStorage, ZODB.interfaces
 import persistence
 import PersistentMapping
 from zodb.zeo.tests import forker
@@ -97,7 +97,7 @@
         try:
             s = root[pid] = Stats()
             get_transaction().commit()
-        except ZODB.POSException.ConflictError:
+        except ZODB.interfaces.ConflictError:
             get_transaction().abort()
             time.sleep(CONFLICT_DELAY)
         else:
@@ -113,7 +113,7 @@
             if prev:
                 prev.set_next(r)
             get_transaction().commit()
-        except ZODB.POSException.ConflictError, err:
+        except ZODB.interfaces.ConflictError, err:
             get_transaction().abort()
             time.sleep(CONFLICT_DELAY)
         else: