[Zope3-checkins] CVS: Zope3/src/zodb - db.py:1.9.2.2

Jeremy Hylton jeremy@zope.com
Mon, 3 Mar 2003 18:25:12 -0500


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

Modified Files:
      Tag: jeremy-atomic-invalidation-branch
	db.py 
Log Message:
Make sure invalidate() always receives a Set().


=== Zope3/src/zodb/db.py 1.9.2.1 => 1.9.2.2 ===
--- Zope3/src/zodb/db.py:1.9.2.1	Sat Mar  1 21:35:25 2003
+++ Zope3/src/zodb/db.py	Mon Mar  3 18:25:11 2003
@@ -28,7 +28,7 @@
 from zodb.connection import Connection
 from zodb.serialize import getDBRoot
 from zodb.ztransaction import Transaction
-from zodb.utils import z64
+from zodb.utils import z64, Set
 
 from transaction import get_transaction
 from transaction.interfaces import IDataManager
@@ -360,8 +360,8 @@
         self._dest = dest
 
     def _prepare(self, txn):
-        self._oids = self._storage.commitVersion(self._version, self._dest,
-                                                 txn)
+        self._oids = Set(self._storage.commitVersion(self._version, self._dest,
+                                                     txn))
 
     def commit(self, txn):
         super(CommitVersion, self).commit(txn)
@@ -379,7 +379,7 @@
         self._version = version
 
     def _prepare(self, txn):
-        self._oids = self._storage.abortVersion(self._version, txn)
+        self._oids = Set(self._storage.abortVersion(self._version, txn))
 
     def commit(self, txn):
         super(AbortVersion, self).commit(txn)
@@ -393,7 +393,7 @@
         self._tid = tid
 
     def _prepare(self, txn):
-        self._oids = self._storage.undo(self._tid, txn)
+        self._oids = Set(self._storage.undo(self._tid, txn))
 
     def commit(self, txn):
         super(TransactionalUndo, self).commit(txn)