[pypy-commit] pypy py3.5: Fix merge and reduce diff

Author: Ronan Lamy Branch: py3.5 Changeset: r95648:59d7c3f4eb6d Date: 2019-01-16 16:26 + http://bitbucket.org/pypy/pypy/changeset/59d7c3f4eb6d/ Log:Fix merge and reduce diff diff --git a/pypy/module/__pypy__/test/test_builders.py b/pypy/module/__pypy__/test/test_builders.py ---

[pypy-commit] pypy py3.5: fix merge, PyUnicode_FromEncodedObject already tested in test_decode

Author: Matti Picus Branch: py3.5 Changeset: r95303:861c793cead8 Date: 2018-11-12 13:39 -0800 http://bitbucket.org/pypy/pypy/changeset/861c793cead8/ Log:fix merge, PyUnicode_FromEncodedObject already tested in test_decode diff --git a/pypy/module/cpyext/test/test_unicodeobject.py

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

Author: Matti Picus Branch: py3.5 Changeset: r94242:4e6fcbd80661 Date: 2018-04-05 08:43 +0300 http://bitbucket.org/pypy/pypy/changeset/4e6fcbd80661/ Log:fix merge diff --git a/pypy/interpreter/pyparser/pyparse.py b/pypy/interpreter/pyparser/pyparse.py ---

[pypy-commit] pypy py3.5: fix merge, minimize diff to default

Author: Matti Picus Branch: py3.5 Changeset: r94141:fcce464367d8 Date: 2018-03-27 01:05 +0300 http://bitbucket.org/pypy/pypy/changeset/fcce464367d8/ Log:fix merge, minimize diff to default diff --git a/pypy/module/cpyext/test/test_typeobject.py

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

Author: Matti Picus Branch: py3.5 Changeset: r93688:db253d82be12 Date: 2018-01-20 19:24 +0200 http://bitbucket.org/pypy/pypy/changeset/db253d82be12/ Log:fix merge diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py ---

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

Author: Matti Picus Branch: py3.5 Changeset: r93687:a7d7fd1b9931 Date: 2018-01-19 17:00 +0200 http://bitbucket.org/pypy/pypy/changeset/a7d7fd1b9931/ Log:fix merge diff --git a/pypy/interpreter/timeutils.py b/pypy/interpreter/timeutils.py ---

[pypy-commit] pypy py3.5: fix merge quirks, document merged branch

Author: Matti Picus Branch: py3.5 Changeset: r92886:81a7e5dcbc2d Date: 2017-10-30 19:10 +0200 http://bitbucket.org/pypy/pypy/changeset/81a7e5dcbc2d/ Log:fix merge quirks, document merged branch diff --git a/pypy/doc/whatsnew-pypy3-head.rst

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

Author: Ronan Lamy Branch: py3.5 Changeset: r92496:8b44bf979649 Date: 2017-09-29 00:18 +0200 http://bitbucket.org/pypy/pypy/changeset/8b44bf979649/ Log:fix merge diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py --- a/pypy/module/cpyext/api.py +++

[pypy-commit] pypy py3.5: fix merge issues

Author: Ronan Lamy Branch: py3.5 Changeset: r92316:2db2c4a66195 Date: 2017-09-04 14:51 +0100 http://bitbucket.org/pypy/pypy/changeset/2db2c4a66195/ Log:fix merge issues diff --git a/lib-python/3/ctypes/test/test_byteswap.py b/lib-python/3/ctypes/test/test_byteswap.py

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

Author: Ronan Lamy Branch: py3.5 Changeset: r92275:f3328bccb6b2 Date: 2017-08-28 18:28 +0100 http://bitbucket.org/pypy/pypy/changeset/f3328bccb6b2/ Log:fix merge diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py --- a/pypy/module/cpyext/api.py +++

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

Author: Matti Picus Branch: py3.5 Changeset: r91637:8474e41c4b75 Date: 2017-06-22 23:23 +0300 http://bitbucket.org/pypy/pypy/changeset/8474e41c4b75/ Log:fix merge diff --git a/pypy/module/cpyext/dictobject.py b/pypy/module/cpyext/dictobject.py ---

[pypy-commit] pypy py3.5: fix merge issues: before the merge, the code (not the tests) was

Author: Armin Rigo Branch: py3.5 Changeset: r90195:0f157eedb3b2 Date: 2017-02-19 12:36 +0100 http://bitbucket.org/pypy/pypy/changeset/0f157eedb3b2/ Log:fix merge issues: before the merge, the code (not the tests) was identical in pypy2 and pypy3, so just make it

[pypy-commit] pypy py3.5: fix merge in test_memoryobject.py

Author: Ronan Lamy Branch: py3.5 Changeset: r89313:5fee3be01d9e Date: 2017-01-02 19:44 + http://bitbucket.org/pypy/pypy/changeset/5fee3be01d9e/ Log:fix merge in test_memoryobject.py diff --git a/pypy/module/cpyext/test/test_memoryobject.py