[Zope3-checkins] CVS: Zope3/src/zodb - connection.py:1.7.4.4

[Jeremy Hylton]

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

Modified Files:
      Tag: opaque-pickles-branch
	connection.py 
Log Message:
Fix merge problem: z64 -> ZERO.


=== Zope3/src/zodb/connection.py 1.7.4.3 => 1.7.4.4 ===
--- Zope3/src/zodb/connection.py:1.7.4.3	Wed Mar 12 16:32:58 2003
+++ Zope3/src/zodb/connection.py	Wed Mar 12 16:50:47 2003
@@ -51,7 +51,7 @@
 from zodb.interfaces import *
 from zodb.serialize import ConnectionObjectReader, ObjectWriter
 from zodb.storage.interfaces import IStorage
-from zodb.utils import p64, u64, Set, z64
+from zodb.utils import p64, u64, Set
 
 from transaction import get_transaction
 from transaction.interfaces import IDataManager, IRollback, TransactionError
@@ -594,7 +594,7 @@
         self._file.seek(self._pos)
         l = len(data)
         if serial is None:
-            serial = z64
+            serial = ZERO
         self._file.write(oid + serial + p64(l))
         self._file.write(data)
         self._tindex[oid] = self._pos