[Zope3-checkins] CVS: ZODB4/ZODB - Connection.py:1.75 fsIndex.py:1.5 fsdump.py:1.5 fsrecover.py:1.6

[Jeremy Hylton]

Update of /cvs-repository/ZODB4/ZODB
In directory cvs.zope.org:/tmp/cvs-serv12992/ZODB

Modified Files:
	Connection.py fsIndex.py fsdump.py fsrecover.py 
Log Message:
U64 -> u64 conversion.



=== ZODB4/ZODB/Connection.py 1.74 => 1.75 ===
 from ZODB.ConflictResolution import ResolvedSerial
 from ZODB.IConnection import IConnection
 from ZODB.POSException import ConflictError
-from ZODB.utils import U64
 from Transaction import get_transaction
 
 from Persistence.Cache import Cache


=== ZODB4/ZODB/fsIndex.py 1.4 => 1.5 ===
 # 
 # We use p64 to convert integers to 8-byte strings and lop off the two
 # high-order bytes when saving. On loading data, we add the leading
-# bytes back before using U64 to convert the data back to (long)
+# bytes back before using u64 to convert the data back to (long)
 # integers.
 
 from Persistence.BTrees._fsBTree import fsBTree as _fsBTree


=== ZODB4/ZODB/fsdump.py 1.4 => 1.5 ===
 ##############################################################################
 from ZODB.FileStorage import FileIterator
 from ZODB.TimeStamp import TimeStamp
-from ZODB.utils import U64
+from ZODB.utils import u64
 from ZODB.tests.StorageTestBase import zodb_unpickle
 
 from cPickle import Unpickler
@@ -55,10 +55,10 @@
     for trans in iter:
         if with_offset:
             print >> file, "Trans #%05d tid=%016x time=%s offset=%d" % \
-                  (i, U64(trans.tid), str(TimeStamp(trans.tid)), trans._pos)
+                  (i, u64(trans.tid), str(TimeStamp(trans.tid)), trans._pos)
         else:
             print >> file, "Trans #%05d tid=%016x time=%s" % \
-                  (i, U64(trans.tid), str(TimeStamp(trans.tid)))
+                  (i, u64(trans.tid), str(TimeStamp(trans.tid)))
         print >> file, "\tstatus=%s user=%s description=%s" % \
               (`trans.status`, trans.user, trans.description)
         j = 0
@@ -78,7 +78,7 @@
             else:
                 version = ''
             print >> file, "  data #%05d oid=%016x %sclass=%s" % \
-                  (j, U64(rec.oid), version, fullclass)
+                  (j, u64(rec.oid), version, fullclass)
             j += 1
         print >> file
         i += 1


=== ZODB4/ZODB/fsrecover.py 1.5 => 1.6 ===
             
 import getopt, ZODB.FileStorage, struct, time
 from struct import unpack
-from ZODB.utils import t32, p64, U64
+from ZODB.utils import t32, p64, u64
 from ZODB.TimeStamp import TimeStamp
 from cPickle import loads
 from ZODB.FileStorage import RecordIterator
@@ -105,7 +105,7 @@
     tid, stl, status, ul, dl, el = unpack(">8s8scHHH",h)
     if el < 0: el=t32-el
 
-    tl=U64(stl)
+    tl=u64(stl)
 
     if status=='c': raise EOF
 
@@ -173,7 +173,7 @@
                 pos = pos + l
                 break
             s=l+1
-            tl=U64(data[s:s+8])
+            tl=u64(data[s:s+8])
             if tl < pos:
                 return pos + s + 8
 
@@ -280,7 +280,7 @@
         try:
             for r in transaction:
                 oid=r.oid
-                if verbose > 1: print U64(oid), r.version, len(r.data)
+                if verbose > 1: print u64(oid), r.version, len(r.data)
                 pre=preget(oid, None)
                 s=ofs.store(oid, pre, r.data, r.version, transaction)
                 preindex[oid]=s