[pypy-commit] pypy py3k: merged upstream

Author: Alex Gaynor Branch: py3k Changeset: r48954:5c7c60f852c7 Date: 2011-11-08 11:26 -0500 http://bitbucket.org/pypy/pypy/changeset/5c7c60f852c7/ Log:merged upstream diff --git a/pypy/module/_io/test/test_textio.py b/pypy/module/_io/test/test_textio.py --- a/pypy/module/_io/test/test_text

[pypy-commit] pypy py3k: merged upstream

Author: Alex Gaynor Branch: py3k Changeset: r48883:705745d3509c Date: 2011-11-07 15:23 -0500 http://bitbucket.org/pypy/pypy/changeset/705745d3509c/ Log:merged upstream diff --git a/lib-python/conftest.py b/lib-python/conftest.py --- a/lib-python/conftest.py +++ b/lib-python/conftest.py @@ -6