[Zope-Checkins] CVS: StandaloneZODB/ZODB - utils.py:1.6

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZODB
In directory cvs.zope.org:/tmp/cvs-serv25657

Modified Files:
	utils.py 
Log Message:
Revert previous checkin; caused massive test failures.


=== StandaloneZODB/ZODB/utils.py 1.5 => 1.6 ===
 def p64(v, pack=struct.pack):
     """Pack an integer or long into a 8-byte string"""
-    if v < t32:
-        h = 0
+    if v < t32: h=0
     else:
-        h, v = divmod(v, t32)
+        h=v/t32
+        v=v%t32
     return pack(">II", h, v)
 
 def u64(v, unpack=struct.unpack):
     """Unpack an 8-byte string into a 64-bit (or long) integer"""
-    # XXX this seems to be just a slower version of U64()
     h, v = unpack(">ii", v)
-    if v < 0:
-        v = t32 + v
+    if v < 0: v=t32+v
     if h:
-        if h < 0:
-            h = t32 + h
-        v = (h << 32) + v
+        if h < 0: h=t32+h
+        v=h*t32+v
     return v
 
 def U64(v, unpack=struct.unpack):
     """Same as u64 but always returns a long."""
     h, v = unpack(">II", v)
     if h:
-        v = (h << 32) + v
+        v=h*t32+v
     return v
 
 def cp(f1, f2, l):
@@ -132,7 +129,6 @@
                  time=time.time, gmtime=time.gmtime):
     t=time()
     ts=TimeStamp(gmtime(t)[:5]+(t%60,))
-    if old is not None:
-        return ts.laterThan(old)
+    if old is not None: return ts.laterThan(than)