[pypy-commit] pypy unicode-utf8-py3: if encode errorhandler returns bytes, do not check it

2018-11-20 Thread mattip
Author: Matti Picus Branch: unicode-utf8-py3 Changeset: r95346:6c473117814d Date: 2018-11-20 00:24 -0800 http://bitbucket.org/pypy/pypy/changeset/6c473117814d/ Log:if encode errorhandler returns bytes, do not check it diff --git a/pypy/interpreter/unicodehelper.py b/pypy/interpreter/unicode

[pypy-commit] pypy unicode-utf8-py3: fix logic, fix interface for _multibytecodec

2018-11-20 Thread mattip
Author: Matti Picus Branch: unicode-utf8-py3 Changeset: r95345:1b408df3f46d Date: 2018-11-19 23:57 -0800 http://bitbucket.org/pypy/pypy/changeset/1b408df3f46d/ Log:fix logic, fix interface for _multibytecodec diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_cod

[pypy-commit] pypy default: Compatibility with pytest 4.0

2018-11-20 Thread rlamy
Author: Ronan Lamy Branch: Changeset: r95348:d19ac6eec77b Date: 2018-11-20 18:59 + http://bitbucket.org/pypy/pypy/changeset/d19ac6eec77b/ Log:Compatibility with pytest 4.0 diff --git a/extra_tests/cffi_tests/cffi1/test_parse_c_type.py b/extra_tests/cffi_tests/cffi1/test_parse_c_type.py

[pypy-commit] pypy unicode-utf8-py3: remove debug cruft

2018-11-20 Thread mattip
Author: Matti Picus Branch: unicode-utf8-py3 Changeset: r95349:ffc6c900709e Date: 2018-11-20 11:51 -0800 http://bitbucket.org/pypy/pypy/changeset/ffc6c900709e/ Log:remove debug cruft diff --git a/pypy/objspace/std/unicodeobject.py b/pypy/objspace/std/unicodeobject.py --- a/pypy/objspace/std

[pypy-commit] pypy py3.6: (Ryan Hileman, alcarithemad) fix problem with variable annotations and ternary

2018-11-20 Thread cfbolz
Author: Carl Friedrich Bolz-Tereick Branch: py3.6 Changeset: r95350:c761510af951 Date: 2018-11-20 21:33 +0100 http://bitbucket.org/pypy/pypy/changeset/c761510af951/ Log:(Ryan Hileman, alcarithemad) fix problem with variable annotations and ternary expressions fixes issue 2916

[pypy-commit] pypy py3tests: hg merge apptest-file

2018-11-20 Thread rlamy
Author: Ronan Lamy Branch: py3tests Changeset: r95354:c2e1ab58d77d Date: 2018-11-20 20:46 + http://bitbucket.org/pypy/pypy/changeset/c2e1ab58d77d/ Log:hg merge apptest-file diff --git a/pypy/module/_cffi_backend/test/test_c.py b/pypy/module/_cffi_backend/test/test_c.py --- a/pypy/module

[pypy-commit] pypy apptest-file: hg merge default

2018-11-20 Thread rlamy
Author: Ronan Lamy Branch: apptest-file Changeset: r95352:57be52e5 Date: 2018-11-20 20:25 + http://bitbucket.org/pypy/pypy/changeset/57be52e5/ Log:hg merge default diff --git a/extra_tests/__init__.py b/extra_tests/__init__.py new file mode 100644 diff --git a/pypy/module/test_li

[pypy-commit] pypy py3.5: hg merge default

2018-11-20 Thread rlamy
Author: Ronan Lamy Branch: py3.5 Changeset: r95351:5811240c082f Date: 2018-11-20 20:25 + http://bitbucket.org/pypy/pypy/changeset/5811240c082f/ Log:hg merge default diff --git a/extra_tests/cffi_tests/cffi1/test_parse_c_type.py b/extra_tests/cffi_tests/cffi1/test_parse_c_type.py --- a/e

[pypy-commit] pypy py3tests: hg merge py3.5

2018-11-20 Thread rlamy
Author: Ronan Lamy Branch: py3tests Changeset: r95353:5bc653be8f68 Date: 2018-11-20 20:26 + http://bitbucket.org/pypy/pypy/changeset/5bc653be8f68/ Log:hg merge py3.5 diff --git a/extra_tests/__init__.py b/extra_tests/__init__.py new file mode 100644 diff --git a/pypy/module/test_lib_pypy

[pypy-commit] cffi default: Add compatibility with pytest 4.0 without breaking older pytests

2018-11-20 Thread arigo
Author: Armin Rigo Branch: Changeset: r3171:828c24a88bf6 Date: 2018-11-21 07:49 +0200 http://bitbucket.org/cffi/cffi/changeset/828c24a88bf6/ Log:Add compatibility with pytest 4.0 without breaking older pytests diff --git a/testing/cffi1/test_parse_c_type.py b/testing/cffi1/test_parse_c_typ