diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/pickle.py | 22 | ||||
| -rw-r--r-- | Lib/test/pickletester.py | 60 |
2 files changed, 64 insertions, 18 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index 92b4802..ba0e38b 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -553,6 +553,7 @@ class Pickler: self.write(LONG1 + chr(n) + bytes) else: self.write(LONG4 + pack("<i", n) + bytes) + return self.write(LONG + `obj` + '\n') dispatch[LongType] = save_long @@ -1042,13 +1043,13 @@ class Unpickler: def load_long1(self): n = ord(self.read(1)) bytes = self.read(n) - return decode_long(bytes) + self.append(decode_long(bytes)) dispatch[LONG1] = load_long1 def load_long4(self): n = mloads('i' + self.read(4)) bytes = self.read(n) - return decode_long(bytes) + self.append(decode_long(bytes)) dispatch[LONG4] = load_long4 def load_float(self): @@ -1404,24 +1405,31 @@ def encode_long(x): njunkchars = 2 + ashex.endswith('L') nibbles = len(ashex) - njunkchars if nibbles & 1: - # need an even # of nibbles for unhexlify + # Extend to a full byte. nibbles += 1 nbits = nibbles * 4 x += 1L << nbits assert x > 0 ashex = hex(x) - if x >> (nbits - 1) == 0: + njunkchars = 2 + ashex.endswith('L') + newnibbles = len(ashex) - njunkchars + if newnibbles < nibbles: + ashex = "0x" + "0" * (nibbles - newnibbles) + ashex[2:] + if int(ashex[2], 16) < 8: # "looks positive", so need a byte of sign bits - ashex = "0xff" + x[2:] + ashex = "0xff" + ashex[2:] if ashex.endswith('L'): ashex = ashex[2:-1] else: ashex = ashex[2:] - assert len(ashex) & 1 == 0 + assert len(ashex) & 1 == 0, (x, ashex) binary = _binascii.unhexlify(ashex) return binary[::-1] +# XXX OOPS! This is still quadratic-time. While hex(n) is linear-time +# XXX in the # of digits in n, long(s, 16) is still quadratic-time +# XXX in len(s). def decode_long(data): r"""Decode a long from a two's complement little-endian binary string. @@ -1445,7 +1453,7 @@ def decode_long(data): if nbytes == 0: return 0L ashex = _binascii.hexlify(data[::-1]) - n = long(ashex, 16) + n = long(ashex, 16) # quadratic time if data[-1] >= '\x80': n -= 1L << (nbytes * 8) return n diff --git a/Lib/test/pickletester.py b/Lib/test/pickletester.py index 8211dcf..6615307 100644 --- a/Lib/test/pickletester.py +++ b/Lib/test/pickletester.py @@ -1,6 +1,11 @@ import unittest from test.test_support import TestFailed, have_unicode, TESTFN +# Tests that try a number of pickle protocols should have a +# for proto in protocols: +# kind of outer loop. Bump the 3 to 4 if/when protocol 3 is invented. +protocols = range(3) + class C: def __cmp__(self, other): return cmp(self.__dict__, other.__dict__) @@ -28,6 +33,9 @@ class metaclass(type): class use_metaclass(object): __metaclass__ = metaclass +# DATA and BINDATA are the protocol 0 and protocol 1 pickles of the object +# returned by create_data(). + # break into multiple strings to avoid confusing font-lock-mode DATA = """(lp1 I0 @@ -210,20 +218,22 @@ class AbstractPickleTests(unittest.TestCase): def test_unicode(self): endcases = [unicode(''), unicode('<\\u>'), unicode('<\\\u1234>'), unicode('<\n>'), unicode('<\\>')] - for u in endcases: - p = self.dumps(u) - u2 = self.loads(p) - self.assertEqual(u2, u) + for proto in protocols: + for u in endcases: + p = self.dumps(u, proto) + u2 = self.loads(p) + self.assertEqual(u2, u) def test_ints(self): import sys - n = sys.maxint - while n: - for expected in (-n, n): - s = self.dumps(expected) - n2 = self.loads(s) - self.assertEqual(expected, n2) - n = n >> 1 + for proto in protocols: + n = sys.maxint + while n: + for expected in (-n, n): + s = self.dumps(expected, proto) + n2 = self.loads(s) + self.assertEqual(expected, n2) + n = n >> 1 def test_maxint64(self): maxint64 = (1L << 63) - 1 @@ -235,6 +245,34 @@ class AbstractPickleTests(unittest.TestCase): data = 'I' + str(maxint64) + 'JUNK\n.' self.assertRaises(ValueError, self.loads, data) + def test_long(self): + for proto in protocols: + # 256 bytes is where LONG4 begins + for nbits in 1, 8, 8*254, 8*255, 8*256, 8*257: + nbase = 1L << nbits + for npos in nbase-1, nbase, nbase+1: + for n in npos, -npos: + pickle = self.dumps(n, proto) + got = self.loads(pickle) + self.assertEqual(n, got) + # Try a monster. This is quadratic-time in protos 0 & 1, so don't + # bother with those. + # XXX Damn. pickle.py is still quadratic-time here, due to + # XXX long(string, 16). cPickle runs this in an eyeblink, but I + # XXX gave up waiting for pickle.py to get beyond "loading". Giving + # XXX up for now. + return + print "building long" + nbase = long("deadbeeffeedface", 16) + nbase += nbase << 1000000 + for n in nbase, -nbase: + print "dumping" + p = self.dumps(n, 2) + print "loading" + got = self.loads(p) + print "checking" + self.assertEqual(n, got) + def test_reduce(self): pass |