[pypy-commit] pypy default: Don't replace space fixture with weird CAPI object in cpyext tests

2016-12-14 Thread rlamy
Author: Ronan Lamy Branch: Changeset: r89057:862a6db9bc74 Date: 2016-12-14 15:03 + http://bitbucket.org/pypy/pypy/changeset/862a6db9bc74/ Log:Don't replace space fixture with weird CAPI object in cpyext tests diff --git a/pypy/module/cpyext/test/conftest.py b/pypy/module/cpyext/test/co

[pypy-commit] pypy space-newtext: merge default

2016-12-14 Thread cfbolz
Author: Carl Friedrich Bolz Branch: space-newtext Changeset: r89060:8e5b0b6e8166 Date: 2016-12-14 17:42 +0100 http://bitbucket.org/pypy/pypy/changeset/8e5b0b6e8166/ Log:merge default diff too long, truncating to 2000 out of 11227 lines diff --git a/.hgignore b/.hgignore --- a/.hgignore +++

[pypy-commit] pypy space-newtext: merge default

2016-12-14 Thread cfbolz
Author: Carl Friedrich Bolz Branch: space-newtext Changeset: r89058:66c3c930e1f2 Date: 2016-12-13 16:54 +0100 http://bitbucket.org/pypy/pypy/changeset/66c3c930e1f2/ Log:merge default diff --git a/lib_pypy/_pypy_wait.py b/lib_pypy/_pypy_wait.py --- a/lib_pypy/_pypy_wait.py +++ b/lib_pypy/_pyp

[pypy-commit] pypy space-newtext: a few tweaks

2016-12-14 Thread cfbolz
Author: Carl Friedrich Bolz Branch: space-newtext Changeset: r89059:83148ff60b21 Date: 2016-12-14 17:37 +0100 http://bitbucket.org/pypy/pypy/changeset/83148ff60b21/ Log:a few tweaks diff --git a/pypy/module/_pypyjson/interp_decoder.py b/pypy/module/_pypyjson/interp_decoder.py --- a/pypy/mod

[pypy-commit] pypy default: Simplify the unwrapper_raise/unwrapper_catch mess a little

2016-12-14 Thread rlamy
Author: Ronan Lamy Branch: Changeset: r89061:c36941f291c3 Date: 2016-12-14 17:26 + http://bitbucket.org/pypy/pypy/changeset/c36941f291c3/ Log:Simplify the unwrapper_raise/unwrapper_catch mess a little diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py --- a/pypy/module/c

[pypy-commit] pypy default: Don't register things manually with INTERPLEVEL_API, since they're never called as api.XXX

2016-12-14 Thread rlamy
Author: Ronan Lamy Branch: Changeset: r89062:faa5d87bf2a6 Date: 2016-12-14 17:43 + http://bitbucket.org/pypy/pypy/changeset/faa5d87bf2a6/ Log:Don't register things manually with INTERPLEVEL_API, since they're never called as api.XXX diff --git a/pypy/module/cpyext/pyobject.py b/

[pypy-commit] pypy py3.5: hg merge default

2016-12-14 Thread rlamy
Author: Ronan Lamy Branch: py3.5 Changeset: r89063:8454bbf43352 Date: 2016-12-14 18:13 + http://bitbucket.org/pypy/pypy/changeset/8454bbf43352/ Log:hg merge default diff too long, truncating to 2000 out of 11892 lines diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@

[pypy-commit] pypy py3.5: Update typeobjectdefs.py to match object.h

2016-12-14 Thread rlamy
Author: Ronan Lamy Branch: py3.5 Changeset: r89064:6821bcbfa71b Date: 2016-12-14 20:10 + http://bitbucket.org/pypy/pypy/changeset/6821bcbfa71b/ Log:Update typeobjectdefs.py to match object.h diff --git a/pypy/module/cpyext/typeobjectdefs.py b/pypy/module/cpyext/typeobjectdefs.py --- a/p