Author: Philip Jenvey <[email protected]>
Branch: py3k-stdlib-2.7.6-merge
Changeset: r69831:1392e99d3610
Date: 2014-03-09 12:43 -0700
http://bitbucket.org/pypy/pypy/changeset/1392e99d3610/
Log: fix for the last merge
diff --git a/pypy/interpreter/pyparser/parsestring.py
b/pypy/interpreter/pyparser/parsestring.py
--- a/pypy/interpreter/pyparser/parsestring.py
+++ b/pypy/interpreter/pyparser/parsestring.py
@@ -74,7 +74,7 @@
v = unicodehelper.decode_utf8(space, substr)
return space.wrap(v)
- v = PyString_DecodeEscape(space, substr, 'strict', enc)
+ v = PyString_DecodeEscape(space, substr, 'strict', encoding)
return space.wrapbytes(v)
def hexbyte(val):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
