[pypy-commit] pypy py3k-osxfix: merge py3k

2016-05-24 Thread pjenvey
Author: Philip Jenvey Branch: py3k-osxfix Changeset: r84681:929007c8d2d9 Date: 2016-05-24 23:14 -0700 http://bitbucket.org/pypy/pypy/changeset/929007c8d2d9/ Log:merge py3k diff --git a/lib-python/3/importlib/_bootstrap.py b/lib-python/3/importlib/_bootstrap.py --- a/lib-python/3/importlib/_

[pypy-commit] pypy py3k-osxfix: merge py3k

2016-05-24 Thread pjenvey
Author: Philip Jenvey Branch: py3k-osxfix Changeset: r84679:a14a659b4d58 Date: 2016-05-24 22:51 -0700 http://bitbucket.org/pypy/pypy/changeset/a14a659b4d58/ Log:merge py3k diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py --- a/pypy/config/pypyoption.py +++ b/pypy/config/pyp