[Zope-Checkins] CVS: Zope/lib/python/Products/TemporaryFolder - TemporaryStorage.py:1.8

[Jeremy Hylton]

Update of /cvs-repository/Zope/lib/python/Products/TemporaryFolder
In directory cvs.zope.org:/tmp/cvs-serv25659

Modified Files:
	TemporaryStorage.py 
Log Message:
Update TemporaryStorage to use new constructor for ConflictError


=== Zope/lib/python/Products/TemporaryFolder/TemporaryStorage.py 1.7 => 1.8 ===
             data = self._conflict_cache.get((oid, serial), marker)
             if data is marker:
-                raise POSException.ConflictError, (oid, serial)
+                # XXX Need 2 serialnos to pass them to ConflictError--
+                # the old and the new
+                raise POSException.ConflictError(oid=oid)
             else:
                 return data[0] # data here is actually (data, t)
         finally:
@@ -125,7 +127,8 @@
                 if serial != oserial:
                     data=self.tryToResolveConflict(oid, oserial, serial, data)
                     if not data:
-                        raise POSException.ConflictError, (serial,oserial)
+                        raise POSException.ConflictError(oid=oid,
+                                                    serials=(oserial, serial))
             else:
                 oserial = serial
             newserial=self._serial