Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r46681:45f85f655b26 Date: 2011-08-21 11:09 +0200 http://bitbucket.org/pypy/pypy/changeset/45f85f655b26/
Log: Backout 1f8c162174c6. It fails some tests, in test_stringobject (obvious place). diff --git a/pypy/objspace/std/stringobject.py b/pypy/objspace/std/stringobject.py --- a/pypy/objspace/std/stringobject.py +++ b/pypy/objspace/std/stringobject.py @@ -924,36 +924,35 @@ for i in range(len(s)): c = s[i] - if not '\x20' <= c < '\x7f': - use_bs_char = False # character quoted by backspace + use_bs_char = False # character quoted by backspace - if c == '\\' or c == quote: - bs_char = c - use_bs_char = True - elif c == '\t': - bs_char = 't' - use_bs_char = True - elif c == '\r': - bs_char = 'r' - use_bs_char = True - elif c == '\n': - bs_char = 'n' - use_bs_char = True - else: - n = ord(c) - if i != startslice: - buf.append_slice(s, startslice, i) - startslice = i + 1 - buf.append('\\x') - buf.append("0123456789abcdef"[n>>4]) - buf.append("0123456789abcdef"[n&0xF]) + if c == '\\' or c == quote: + bs_char = c + use_bs_char = True + elif c == '\t': + bs_char = 't' + use_bs_char = True + elif c == '\r': + bs_char = 'r' + use_bs_char = True + elif c == '\n': + bs_char = 'n' + use_bs_char = True + elif not '\x20' <= c < '\x7f': + n = ord(c) + if i != startslice: + buf.append_slice(s, startslice, i) + startslice = i + 1 + buf.append('\\x') + buf.append("0123456789abcdef"[n>>4]) + buf.append("0123456789abcdef"[n&0xF]) - if use_bs_char: - if i != startslice: - buf.append_slice(s, startslice, i) - startslice = i + 1 - buf.append('\\') - buf.append(bs_char) + if use_bs_char: + if i != startslice: + buf.append_slice(s, startslice, i) + startslice = i + 1 + buf.append('\\') + buf.append(bs_char) if len(s) != startslice: buf.append_slice(s, startslice, len(s)) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit