Author: Matti Picus <[email protected]>
Branch: unicode-utf8-py3
Changeset: r95099:afe9a3fb0c6b
Date: 2018-09-11 23:33 +0300
http://bitbucket.org/pypy/pypy/changeset/afe9a3fb0c6b/
Log: fix merge
diff --git a/pypy/objspace/std/unicodeobject.py
b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -1222,7 +1222,7 @@
try:
rutf8.check_ascii(utf8)
except rutf8.CheckError as a:
- eh = unicodehelper.encode_error_handler(space)
+ eh = unicodehelper.encode_error_handler(space)
eh(None, "ascii", "ordinal not in range(128)", utf8,
a.pos, a.pos + 1)
assert False, "always raises"
@@ -1260,7 +1260,6 @@
"use codecs.decode() to decode to arbitrary types",
encoding,
w_retval)
- w_retval)
return w_retval
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
