mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-10 00:43:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 18

More str/bytes fixes.

Browse source
This commit is contained in:
Guido van Rossum 2007-08-27 23:18:54 +00:00
parent e22905a06c
commit 26d95c3d07
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/pickle.py
View file

@ -843,7 +843,7 @@ class Unpickler:
def load_proto(self):
proto = ord(self.read(1))
if not 0 <= proto <= 2:
raise ValueError, "unsupported pickle protocol: %d" % proto
raise ValueError("unsupported pickle protocol: %d" % proto)
dispatch[PROTO[0]] = load_proto
def load_persid(self):
@ -920,14 +920,14 @@ class Unpickler:
def load_string(self):
rep = self.readline()[:-1]
for q in "\"'": # double or single quote
for q in (b'"', b"'"): # double or single quote
if rep.startswith(q):
if not rep.endswith(q):
raise ValueError, "insecure string pickle"
raise ValueError("insecure string pickle")
rep = rep[len(q):-len(q)]
break
else:
raise ValueError, "insecure string pickle"
raise ValueError("insecure string pickle")
self.append(str(codecs.escape_decode(rep)[0], "latin-1"))
dispatch[STRING[0]] = load_string
@ -1014,8 +1014,8 @@ class Unpickler:
try:
value = klass(*args)
except TypeError as err:
raise TypeError, "in constructor for %s: %s" % (
klass.__name__, str(err)), sys.exc_info()[2]
raise TypeError("in constructor for %s: %s" %
(klass.__name__, str(err)), sys.exc_info()[2])
self.append(value)
def load_inst(self):