[Zodb-checkins] CVS: ZODB3/ZODB - DemoStorage.py:1.18.12.5

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB
In directory cvs.zope.org:/tmp/cvs-serv15868

Modified Files:
      Tag: zodb33-devel-branch
	DemoStorage.py 
Log Message:
Update one more storage's ConflictError.


=== ZODB3/ZODB/DemoStorage.py 1.18.12.4 => 1.18.12.5 ===
--- ZODB3/ZODB/DemoStorage.py:1.18.12.4	Tue Oct 28 16:28:32 2003
+++ ZODB3/ZODB/DemoStorage.py	Thu Oct 30 15:31:03 2003
@@ -250,7 +250,8 @@
                     nv=old
 
                 if serial != oserial:
-                    raise POSException.ConflictError(serials=(oserial, serial))
+                    raise POSException.ConflictError(
+                        oid=oid, serials=(oserial, serial), data=data)
 
             serial=self._serial
             r=[oid, serial, old, version and (version, nv) or None, data]