mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix test_pickle, by reverting the string opcodes (S, T, U) to returning

Browse source 
strings, in Latin-1.  Bytes are once more pickled through bytes.__reduce__,
but now it returns "latin-1" as the second parameter.

Unfortunately this breaks datetime pickling.  I'll have to investigate
further; reverting Martin's changes doesn't seem to help.
This commit is contained in:
Guido van Rossum 2007-07-19 22:19:35 +00:00
parent 00058aa28c
commit f93254d299
2 changed files with 6 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/pickle.py
View file

@ -506,20 +506,6 @@ class Pickler:
self.memoize(obj)
dispatch[str8] = save_string
def save_bytes(self, obj):
# Like save_string
if self.bin:
n = len(obj)
if n < 256:
self.write(SHORT_BINSTRING + bytes([n]) + bytes(obj))
else:
self.write(BINSTRING + pack("<i", n) + bytes(obj))
else:
# Strip leading 'b'
self.write(STRING + bytes(repr(obj).lstrip("b")) + b'\n')
self.memoize(obj)
dispatch[bytes] = save_bytes
def save_unicode(self, obj, pack=struct.pack):
if self.bin:
encoded = obj.encode('utf-8')
@ -945,12 +931,12 @@ class Unpickler:
break
else:
raise ValueError, "insecure string pickle"
self.append(bytes(codecs.escape_decode(rep)[0]))
self.append(str(codecs.escape_decode(rep)[0], "latin-1"))
dispatch[STRING[0]] = load_string
def load_binstring(self):
len = mloads(b'i' + self.read(4))
self.append(self.read(len))
self.append(str(self.read(len), "latin-1"))
dispatch[BINSTRING[0]] = load_binstring
def load_unicode(self):
@ -964,7 +950,7 @@ class Unpickler:
def load_short_binstring(self):
len = ord(self.read(1))
self.append(self.read(len))
self.append(str(self.read(len), "latin-1"))
dispatch[SHORT_BINSTRING[0]] = load_short_binstring
def load_tuple(self):