Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r93525:9ae4bd0c4555
Date: 2017-12-20 22:01 +0000
http://bitbucket.org/pypy/pypy/changeset/9ae4bd0c4555/
Log: Fix 'errors' arg in PyUnicode_Decode()
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py
b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/pypy/module/cpyext/test/test_unicodeobject.py
+++ b/pypy/module/cpyext/test/test_unicodeobject.py
@@ -631,8 +631,9 @@
def test_decode(self, space):
b_text = rffi.str2charp('caf\x82xx')
b_encoding = rffi.str2charp('cp437')
- assert space.unicode_w(
- PyUnicode_Decode(space, b_text, 4, b_encoding, None)) == u'caf\xe9'
+ b_errors = rffi.str2charp('strict')
+ assert space.unicode_w(PyUnicode_Decode(
+ space, b_text, 4, b_encoding, b_errors)) == u'caf\xe9'
w_text = PyUnicode_FromEncodedObject(space, space.newbytes("test"),
b_encoding, None)
assert space.isinstance_w(w_text, space.w_unicode)
diff --git a/pypy/module/cpyext/unicodeobject.py
b/pypy/module/cpyext/unicodeobject.py
--- a/pypy/module/cpyext/unicodeobject.py
+++ b/pypy/module/cpyext/unicodeobject.py
@@ -492,7 +492,7 @@
w_str = space.newbytes(rffi.charpsize2str(s, size))
w_encoding = space.newtext(rffi.charp2str(encoding))
if errors:
- w_errors = space.newbytes(rffi.charp2str(errors))
+ w_errors = space.newtext(rffi.charp2str(errors))
else:
w_errors = None
return space.call_method(w_str, 'decode', w_encoding, w_errors)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
