Author: Armin Rigo <ar...@tunes.org> Branch: py3.5 Changeset: r90189:50d92acc1afa Date: 2017-02-19 10:04 +0100 http://bitbucket.org/pypy/pypy/changeset/50d92acc1afa/
Log: hg merge default diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head.rst @@ -151,3 +151,11 @@ it is the standard ``OrderedDict.move_to_end()`` method, but the behavior is also available on Python 2.x or for the ``dict`` type by calling ``__pypy__.move_to_end(dict, key, last=True)``. + +.. branch: space-newtext + +Internal refactoring of ``space.wrap()``, which is now replaced with +explicitly-typed methods. Notably, there are now ``space.newbytes()`` +and ``space.newtext()``: these two methods are identical on PyPy 2.7 but +not on PyPy 3.x. The latter is used to get an app-level unicode string +by decoding the RPython string, assumed to be utf-8. diff --git a/pypy/module/_cffi_backend/ffi_obj.py b/pypy/module/_cffi_backend/ffi_obj.py --- a/pypy/module/_cffi_backend/ffi_obj.py +++ b/pypy/module/_cffi_backend/ffi_obj.py @@ -174,7 +174,7 @@ m1, s12, m2, s23, m3, w_x) - @unwrap_spec(module_name='text', _version=int, _types='text') + @unwrap_spec(module_name='text', _version=int, _types='bytes') def descr_init(self, module_name='?', _version=-1, _types='', w__globals=None, w__struct_unions=None, w__enums=None, w__typenames=None, w__includes=None): diff --git a/rpython/rlib/test/test_rposix.py b/rpython/rlib/test/test_rposix.py --- a/rpython/rlib/test/test_rposix.py +++ b/rpython/rlib/test/test_rposix.py @@ -492,7 +492,7 @@ class TestPosixAscii(BasePosixUnicodeOrAscii): def _get_filename(self): - return str(udir.join('test_open_ascii')) + return unicode(udir.join('test_open_ascii')) @rposix_requires('openat') def test_openat(self): _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit