mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

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

8
Lib/pickletools.py
View file

@ -291,12 +291,12 @@ def read_stringnl(f, decode=True, stripquotes=True):
"""
data = f.readline()
if not data.endswith('\n'):
if not data.endswith(b'\n'):
raise ValueError("no newline found when trying to read stringnl")
data = data[:-1] # lose the newline
if stripquotes:
for q in "'\"":
for q in (b'"', b"'"):
if data.startswith(q):
if not data.endswith(q):
raise ValueError("strinq quote %r not found at both "
@ -427,7 +427,7 @@ def read_unicodestringnl(f):
"""
data = f.readline()
if not data.endswith('\n'):
if not data.endswith(b'\n'):
raise ValueError("no newline found when trying to read "
"unicodestringnl")
data = data[:-1] # lose the newline
@ -497,7 +497,7 @@ def read_decimalnl_short(f):
"""
s = read_stringnl(f, decode=False, stripquotes=False)
if s.endswith("L"):
if s.endswith(b"L"):
raise ValueError("trailing 'L' not allowed in %r" % s)
# It's not necessarily true that the result fits in a Python short int: