[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 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