[pypy-commit] pypy default: import cffi/cb6147abe7af

2016-09-04 Thread arigo
Author: Armin Rigo Branch: Changeset: r86858:c224171fc33e Date: 2016-09-04 13:37 +0200 http://bitbucket.org/pypy/pypy/changeset/c224171fc33e/ Log:import cffi/cb6147abe7af diff --git a/lib_pypy/cffi/backend_ctypes.py b/lib_pypy/cffi/backend_ctypes.py --- a/lib_pypy/cffi/backend_ctypes.py +++

[pypy-commit] cffi default: Skip test if setuptools cannot be imported

2016-09-04 Thread arigo
Author: Armin Rigo Branch: Changeset: r2760:cb6147abe7af Date: 2016-09-04 13:37 +0200 http://bitbucket.org/cffi/cffi/changeset/cb6147abe7af/ Log:Skip test if setuptools cannot be imported diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py --- a/testing/cff

[pypy-commit] pypy default: These specialize.arg() are not valid, because callers inside runicode

2016-09-04 Thread arigo
Author: Armin Rigo Branch: Changeset: r86859:1f8c8d955c04 Date: 2016-09-04 13:47 +0200 http://bitbucket.org/pypy/pypy/changeset/1f8c8d955c04/ Log:These specialize.arg() are not valid, because callers inside runicode may not give a constant at all. See updated test. diff --git a/rpyt

[pypy-commit] pypy buffer-interface: Fix for test_zjit by explicitly disabling the W_MemoryView case here

2016-09-04 Thread arigo
Author: Armin Rigo Branch: buffer-interface Changeset: r86860:73e7b767d5f7 Date: 2016-09-04 14:19 +0200 http://bitbucket.org/pypy/pypy/changeset/73e7b767d5f7/ Log:Fix for test_zjit by explicitly disabling the W_MemoryView case here diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pyp

[pypy-commit] pypy default: Another attempt at fixing the original problem

2016-09-04 Thread arigo
Author: Armin Rigo Branch: Changeset: r86862:74b4b27aaa7b Date: 2016-09-04 14:49 +0200 http://bitbucket.org/pypy/pypy/changeset/74b4b27aaa7b/ Log:Another attempt at fixing the original problem diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py --- a/rpython/rlib/runicode.py ++

[pypy-commit] pypy default: Why final=False here?

2016-09-04 Thread arigo
Author: Armin Rigo Branch: Changeset: r86861:50051cb90662 Date: 2016-09-04 14:39 +0200 http://bitbucket.org/pypy/pypy/changeset/50051cb90662/ Log:Why final=False here? diff --git a/rpython/rtyper/rstr.py b/rpython/rtyper/rstr.py --- a/rpython/rtyper/rstr.py +++ b/rpython/rtyper/rstr.py @@ -

[pypy-commit] pypy release-5.x: Issue #2389: the custom error handler may return a 'pos' that is smaller

2016-09-04 Thread mattip
Author: Matti Picus Branch: release-5.x Changeset: r86864:110c3a4539c8 Date: 2016-09-04 17:55 +0300 http://bitbucket.org/pypy/pypy/changeset/110c3a4539c8/ Log:Issue #2389: the custom error handler may return a 'pos' that is smaller than 'size', in which case we need to continue loopin

[pypy-commit] pypy release-5.x: Issue #2388: the problem is obscure interaction with a different call (I

2016-09-04 Thread mattip
Author: Matti Picus Branch: release-5.x Changeset: r86863:145c1bd68950 Date: 2016-09-04 17:55 +0300 http://bitbucket.org/pypy/pypy/changeset/145c1bd68950/ Log:Issue #2388: the problem is obscure interaction with a different call (I don't know which one) with the signature (string, flo

[pypy-commit] pypy release-5.x: Move the bit checking inside helpers, share it from the two places

2016-09-04 Thread mattip
Author: Matti Picus Branch: release-5.x Changeset: r86865:dfb434142f63 Date: 2016-09-04 17:55 +0300 http://bitbucket.org/pypy/pypy/changeset/dfb434142f63/ Log:Move the bit checking inside helpers, share it from the two places (grafted from ee3a2fbec01afa109be9414e105ea7250a7e1b24) di

[pypy-commit] pypy release-5.x: import cffi/cb6147abe7af

2016-09-04 Thread mattip
Author: Matti Picus Branch: release-5.x Changeset: r86867:dfa482ad3f4c Date: 2016-09-04 17:55 +0300 http://bitbucket.org/pypy/pypy/changeset/dfa482ad3f4c/ Log:import cffi/cb6147abe7af (grafted from c224171fc33e53442553735d23896c4cd2d51b34) diff --git a/lib_pypy/cffi/backend_ctypes.py

[pypy-commit] pypy release-5.x: import cffi/b81ca61b6de6

2016-09-04 Thread mattip
Author: Matti Picus Branch: release-5.x Changeset: r86866:b29dd462f6ed Date: 2016-09-04 17:55 +0300 http://bitbucket.org/pypy/pypy/changeset/b29dd462f6ed/ Log:import cffi/b81ca61b6de6 (grafted from fdd46325fe3d2c1d29496931411c453c0af576a2) diff --git a/lib_pypy/cffi.egg-info/PKG-INFO

[pypy-commit] pypy union-side-effects: Disallow unions of char and unichar, since they make the annotator inconsistent

2016-09-04 Thread rlamy
Author: Ronan Lamy Branch: union-side-effects Changeset: r86868:ec11787ac32c Date: 2016-09-04 16:27 +0100 http://bitbucket.org/pypy/pypy/changeset/ec11787ac32c/ Log:Disallow unions of char and unichar, since they make the annotator inconsistent diff --git a/rpython/annotator/binaryop

[pypy-commit] pypy default: Explicitly detect that we found OpenSSL 1.1, and abort with a message

2016-09-04 Thread arigo
Author: Armin Rigo Branch: Changeset: r86869:48ca2469fc30 Date: 2016-09-04 17:48 +0200 http://bitbucket.org/pypy/pypy/changeset/48ca2469fc30/ Log:Explicitly detect that we found OpenSSL 1.1, and abort with a message as explicit as possible, hopefully better than an obscure cr

[pypy-commit] pypy release-5.x: Explicitly detect that we found OpenSSL 1.1, and abort with a message

2016-09-04 Thread mattip
Author: Matti Picus Branch: release-5.x Changeset: r86870:050d84dd7899 Date: 2016-09-04 21:10 +0300 http://bitbucket.org/pypy/pypy/changeset/050d84dd7899/ Log:Explicitly detect that we found OpenSSL 1.1, and abort with a message as explicit as possible, hopefully better than an obscur

[pypy-commit] pypy union-side-effects: Add test for constants

2016-09-04 Thread rlamy
Author: Ronan Lamy Branch: union-side-effects Changeset: r86871:6cee69266cee Date: 2016-09-04 19:31 +0100 http://bitbucket.org/pypy/pypy/changeset/6cee69266cee/ Log:Add test for constants diff --git a/rpython/annotator/test/test_model.py b/rpython/annotator/test/test_model.py --- a/rpython/

[pypy-commit] pypy union-side-effects: hg merge default

2016-09-04 Thread rlamy
Author: Ronan Lamy Branch: union-side-effects Changeset: r86872:be656798450c Date: 2016-09-04 19:34 +0100 http://bitbucket.org/pypy/pypy/changeset/be656798450c/ Log:hg merge default diff --git a/lib_pypy/cffi.egg-info/PKG-INFO b/lib_pypy/cffi.egg-info/PKG-INFO --- a/lib_pypy/cffi.egg-info/PK

[pypy-commit] pypy union-side-effects: Explicitly forbid comparisons between str and unicode

2016-09-04 Thread rlamy
Author: Ronan Lamy Branch: union-side-effects Changeset: r86873:e1f64f1f25cc Date: 2016-09-05 00:16 +0100 http://bitbucket.org/pypy/pypy/changeset/e1f64f1f25cc/ Log:Explicitly forbid comparisons between str and unicode diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.p

[pypy-commit] pypy union-side-effects: Fix str vs unicode correctness issues

2016-09-04 Thread rlamy
Author: Ronan Lamy Branch: union-side-effects Changeset: r86874:350957bdef41 Date: 2016-09-05 03:24 +0100 http://bitbucket.org/pypy/pypy/changeset/350957bdef41/ Log:Fix str vs unicode correctness issues diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py --- a/py