[pypy-commit] pypy py3.6: fix merge

2020-02-03 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r98652:2311bec2bb7f Date: 2020-02-03 21:53 +0200 http://bitbucket.org/pypy/pypy/changeset/2311bec2bb7f/ Log:fix merge diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py --- a/pypy/module/posix/test/test_pos

[pypy-commit] pypy py3.6: fix merge

2019-08-05 Thread rlamy
Author: Ronan Lamy Branch: py3.6 Changeset: r97065:05f51882e7bd Date: 2019-08-05 17:10 +0100 http://bitbucket.org/pypy/pypy/changeset/05f51882e7bd/ Log:fix merge diff --git a/lib-python/3/test/test_compile.py b/lib-python/3/test/test_compile.py --- a/lib-python/3/test/test_compile.py +++ b/

[pypy-commit] pypy py3.6: fix merge

2019-05-27 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96702:5c4489ede2be Date: 2019-05-27 17:36 +0300 http://bitbucket.org/pypy/pypy/changeset/5c4489ede2be/ Log:fix merge diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py --- a/lib_pypy/_cffi_ssl/_stdssl/__

[pypy-commit] pypy py3.6: fix merge

2019-05-27 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96700:3ddfc6aee731 Date: 2019-05-27 14:18 +0300 http://bitbucket.org/pypy/pypy/changeset/3ddfc6aee731/ Log:fix merge diff --git a/lib_pypy/_cffi_ssl/_stdssl/error.py b/lib_pypy/_cffi_ssl/_stdssl/error.py --- a/lib_pypy/_cffi_ssl/_stdssl/error.py

[pypy-commit] pypy py3.6: fix merge

2019-05-26 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96693:f91bbed46ef7 Date: 2019-05-27 07:37 +0300 http://bitbucket.org/pypy/pypy/changeset/f91bbed46ef7/ Log:fix merge diff --git a/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py b/lib_pypy/_cffi_ssl/_stdssl/win32_extra.py --- a/lib_pypy/_cffi_ssl/_std

[pypy-commit] pypy py3.6: fix merge

2019-05-24 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96667:385db1f245d0 Date: 2019-05-24 10:05 +0300 http://bitbucket.org/pypy/pypy/changeset/385db1f245d0/ Log:fix merge diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py b/lib_pypy/_cffi_ssl/_stdssl/__init__.py --- a/lib_pypy/_cffi_ssl/_stdssl/__

[pypy-commit] pypy py3.6: fix merge, tests

2019-02-18 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96060:6bfc3b49077d Date: 2019-02-17 18:17 +0200 http://bitbucket.org/pypy/pypy/changeset/6bfc3b49077d/ Log:fix merge, tests diff --git a/pypy/interpreter/test/test_unicodehelper.py b/pypy/interpreter/test/test_unicodehelper.py --- a/pypy/interpr

[pypy-commit] pypy py3.6: fix merge

2019-02-13 Thread mattip
Author: Matti Picus Branch: py3.6 Changeset: r96010:c3059a6a2591 Date: 2019-02-14 00:51 +0200 http://bitbucket.org/pypy/pypy/changeset/c3059a6a2591/ Log:fix merge diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py --- a/pypy/module/_codecs/interp_codecs

[pypy-commit] pypy py3.6: fix merge problem

2018-05-11 Thread cfbolz
Author: Carl Friedrich Bolz-Tereick Branch: py3.6 Changeset: r94522:d09a53f84bea Date: 2018-05-11 12:58 +0200 http://bitbucket.org/pypy/pypy/changeset/d09a53f84bea/ Log:fix merge problem diff --git a/lib-python/3/test/test_inspect.py b/lib-python/3/test/test_inspect.py --- a/lib-python/3/te