mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Change Py_BuildValue to generate Unicode objects for

Browse source 
's' and 'c' codes.
Change pickle to dump bytes objects using the 'S'
code, and to load the 'S' code as byte objects.
Change datetime and array to generate and expect
bytes objects in reduce/unreduce.
This commit is contained in:
Martin v. Löwis 2007-07-18 02:28:27 +00:00
parent 6f2df4d5e1
commit 10a60b3ec0
8 changed files with 166 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Lib/pickle.py
View file

@ -506,6 +506,20 @@ 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')
@ -931,12 +945,12 @@ class Unpickler:
break
else:
raise ValueError, "insecure string pickle"
self.append(str8(codecs.escape_decode(rep)[0]))
self.append(bytes(codecs.escape_decode(rep)[0]))
dispatch[STRING[0]] = load_string
def load_binstring(self):
len = mloads(b'i' + self.read(4))
self.append(str8(self.read(len)))
self.append(self.read(len))
dispatch[BINSTRING[0]] = load_binstring
def load_unicode(self):
@ -950,7 +964,7 @@ class Unpickler:
def load_short_binstring(self):
len = ord(self.read(1))
self.append(str8(self.read(len)))
self.append(self.read(len))
dispatch[SHORT_BINSTRING[0]] = load_short_binstring
def load_tuple(self):