Add simpler implementations of p64() and u64() for Python 2.2.

src/ZODB/utils.py

@@ -83,11 +83,29 @@
 # 
 ##############################################################################
 
+import sys
 import TimeStamp, time, struct
 
-t32 = 1L << 32
+if sys.version >= (2, 2):
 
-def p64(v, pack=struct.pack):
+    # Note that the distinction between ints and longs is blurred in
+    # Python 2.2.  So make u64() and U64() the same.
+
+    def p64(v, pack=struct.pack):
+        """Pack an integer or long into a 8-byte string"""
+        return pack(">Q", v)
+
+    def u64(v, unpack=struct.unpack):
+        """Unpack an 8-byte string into a 64-bit long integer."""
+        return unpack(">Q", v)[0]
+
+    U64 = u64
+
+else:
+
+    t32 = 1L << 32
+
+    def p64(v, pack=struct.pack):
         """Pack an integer or long into a 8-byte string"""
         if v < t32:
             h = 0
@@ -95,8 +113,8 @@ def p64(v, pack=struct.pack):
             h, v = divmod(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"""
+    def u64(v, unpack=struct.unpack):
+        """Unpack an 8-byte string into a 64-bit (or long) integer."""
         h, v = unpack(">ii", v)
         if v < 0:
             v = t32 + v
@@ -106,7 +124,7 @@ def u64(v, unpack=struct.unpack):
             v = (long(h) << 32) + v
         return v
 
-def U64(v, unpack=struct.unpack):
+    def U64(v, unpack=struct.unpack):
         """Same as u64 but always returns a long."""
         h, v = unpack(">II", v)
         if h: