[Zope-Checkins] CVS: Zope/lib/python/tempstorage - TemporaryStorage.py:1.2

[Jim Fulton]

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

Modified Files:
	TemporaryStorage.py 
Log Message:
Changed the way conflict errors are caught and reraised to be
consistent with changes in ZODB 3.3.


=== Zope/lib/python/tempstorage/TemporaryStorage.py 1.1 => 1.2 ===
--- Zope/lib/python/tempstorage/TemporaryStorage.py:1.1	Sun Aug 17 16:53:50 2003
+++ Zope/lib/python/tempstorage/TemporaryStorage.py	Fri Nov 28 11:46:50 2003
@@ -128,10 +128,13 @@
             if self._index.has_key(oid):
                 oserial=self._index[oid]
                 if serial != oserial:
-                    data=self.tryToResolveConflict(oid, oserial, serial, data)
-                    if not data:
-                        raise POSException.ConflictError(oid=oid,
-                                                    serials=(oserial, serial))
+                    rdata = self.tryToResolveConflict(oid, oserial,
+                                                      serial, data)
+                    if rdata is None:
+                        raise POSException.ConflictError(
+                            oid=oid, serials=(oserial, serial), data=data)
+                    else:
+                        data = rdata
             else:
                 oserial = serial
             newserial=self._serial