Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix some problems introduced by the str8 repr change.

This commit is contained in:
Guido van Rossum 2007-06-15 03:35:38 +00:00
parent a092947d26
commit aa588c4699
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/pickle.py
View File

@ -501,7 +501,8 @@ class Pickler:
else: else:
self.write(BINSTRING + pack("<i", n) + bytes(obj)) self.write(BINSTRING + pack("<i", n) + bytes(obj))
else: else:
self.write(STRING + bytes(repr(obj)) + b'\n') # Strip leading 's' due to repr() of str8() returning s'...'
self.write(STRING + bytes(repr(obj).lstrip("s")) + b'\n')
self.memoize(obj) self.memoize(obj)
dispatch[str8] = save_string dispatch[str8] = save_string

4
Lib/test/test_popen.py
View File

@ -18,8 +18,10 @@ if ' ' in python:
python = '"' + python + '"' # quote embedded space for cmdline python = '"' + python + '"' # quote embedded space for cmdline
class PopenTest(unittest.TestCase): class PopenTest(unittest.TestCase):
def _do_test_commandline(self, cmdline, expected): def _do_test_commandline(self, cmdline, expected):
cmd = '%s -c "import sys; print(sys.argv)" %s' % (python, cmdline) cmd = '%s -c "import sys; print(list(map(str, sys.argv)))" %s'
cmd = cmd % (python, cmdline)
data = os.popen(cmd).read() data = os.popen(cmd).read()
got = eval(data)[1:] # strip off argv[0] got = eval(data)[1:] # strip off argv[0]
self.assertEqual(got, expected) self.assertEqual(got, expected)

4
Modules/cPickle.c
View File

@ -1085,6 +1085,10 @@ save_string(Picklerobject *self, PyObject *args, int doput)
goto err; goto err;
repr_str = PyString_AS_STRING((PyStringObject *)repr); repr_str = PyString_AS_STRING((PyStringObject *)repr);
/* Strip leading 's' due to repr() of str8() returning s'...' */
if (repr_str[0] == 's')
repr_str++;
if (self->write_func(self, &string, 1) < 0) if (self->write_func(self, &string, 1) < 0)
goto err; goto err;