[Zodb-checkins] CVS: ZODB4/src/zodb/tests - undo.py:1.3

[Barry Warsaw]

Update of /cvs-repository/ZODB4/src/zodb/tests
In directory cvs.zope.org:/tmp/cvs-serv27419/src/zodb/tests

Modified Files:
	undo.py 
Log Message:
> I believe we're ready to merge back to the head.

merging the opaque-pickles-branch back into the head



=== ZODB4/src/zodb/tests/undo.py 1.2 => 1.3 ===
--- ZODB4/src/zodb/tests/undo.py:1.2	Wed Dec 25 09:12:21 2002
+++ ZODB4/src/zodb/tests/undo.py	Thu Mar 13 16:32:29 2003
@@ -4,8 +4,9 @@
 import unittest
 
 from zodb import interfaces
+from zodb.interfaces import ZERO
 from zodb.ztransaction import Transaction
-from zodb.utils import u64, p64, z64
+from zodb.utils import u64, p64
 from zodb.db import DB
 from zodb.storage.tests.minpo import MinPO
 from zodb.storage.tests.base import zodb_pickle, zodb_unpickle
@@ -136,7 +137,7 @@
                                  map(MinPO, (31, 32, 51, 52)))
         oid1 = self._storage.new_oid()
         oid2 = self._storage.new_oid()
-        revid1 = revid2 = z64
+        revid1 = revid2 = ZERO
         # Store two objects in the same transaction
         t = Transaction()
         self._storage.tpc_begin(t)
@@ -192,7 +193,7 @@
                                                (30, 31, 32, 50, 51, 52)))
         oid1 = self._storage.new_oid()
         oid2 = self._storage.new_oid()
-        revid1 = revid2 = z64
+        revid1 = revid2 = ZERO
         # Store two objects in the same transaction
         d = self._multi_obj_transaction([(oid1, revid1, p30),
                                          (oid2, revid2, p50),
@@ -348,7 +349,7 @@
         oid1 = oid
         revid1 = revid_c
         oid2 = self._storage.new_oid()
-        revid2 = z64
+        revid2 = ZERO
         p81, p82, p91, p92 = map(zodb_pickle,
                                  map(MinPO, (81, 82, 91, 92)))