[pypy-commit] pypy py3k: merge branch testing-cleanup-py3k

2016-06-21 Thread rlamy
Author: Ronan Lamy Branch: py3k Changeset: r85310:df6e701d52a2 Date: 2016-06-21 16:54 +0100 http://bitbucket.org/pypy/pypy/changeset/df6e701d52a2/ Log:merge branch testing-cleanup-py3k diff too long, truncating to 2000 out of 2361 lines diff --git a/pypy/interpreter/astcompiler/test/test_co

[pypy-commit] pypy py3k: Merge branch 'testing-cleanup-py3k'

2016-06-13 Thread rlamy
Author: Ronan Lamy Branch: py3k Changeset: r85134:8028f6e5a9c9 Date: 2016-06-13 16:35 +0100 http://bitbucket.org/pypy/pypy/changeset/8028f6e5a9c9/ Log:Merge branch 'testing-cleanup-py3k' diff --git a/pypy/conftest.py b/pypy/conftest.py --- a/pypy/conftest.py +++ b/pypy/conftest.py @@ -94,6 +