[pypy-commit] pypy py3.6: merge py3.5 into branch

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r95343:dd77cb64ae34
Date: 2018-11-18 21:12 -0800
http://bitbucket.org/pypy/pypy/changeset/dd77cb64ae34/

Log:	merge py3.5 into branch

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
@@ -539,7 +539,7 @@
     elif space.isinstance_w(w_obj, space.w_bytearray):   # Python 2.x specific
         raise oefmt(space.w_TypeError, "decoding bytearray is not supported")
     else:
-        s = space.buffer_w(w_obj, 0)
+        s = space.charbuf_w(w_obj)
     return _pyunicode_decode(space, s, encoding, errors)