[pypy-commit] pypy small-unroll-improvements: fix translation - turns out a mixin doesn't work

2014-04-16 Thread cfbolz
Author: Carl Friedrich Bolz Branch: small-unroll-improvements Changeset: r70647:f96b890d7ea5 Date: 2014-04-16 09:57 +0200 http://bitbucket.org/pypy/pypy/changeset/f96b890d7ea5/ Log:fix translation - turns out a mixin doesn't work diff --git a/rpython/jit/metainterp/optimizeopt/virtualstate.p

[pypy-commit] pypy default: Fix for 6dac6407412f. Very obscure.

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70648:a82950d1732e Date: 2014-04-16 10:32 +0200 http://bitbucket.org/pypy/pypy/changeset/a82950d1732e/ Log:Fix for 6dac6407412f. Very obscure. diff --git a/pypy/module/__pypy__/app_signal.py b/pypy/module/__pypy__/app_signal.py --- a/pypy/module/__pyp

[pypy-commit] pypy default: Fix link (thanks Ryan on pull request #229)

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70649:6fbffc03e832 Date: 2014-04-16 11:22 +0200 http://bitbucket.org/pypy/pypy/changeset/6fbffc03e832/ Log:Fix link (thanks Ryan on pull request #229) diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst --- a/pypy/doc/faq.rst +++ b/pypy/doc/faq.rst @@ -31

[pypy-commit] pypy default: Yet another attempt to unravel the mess that 6dac6407412f exposed.

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70650:867cc494a9fa Date: 2014-04-16 11:10 + http://bitbucket.org/pypy/pypy/changeset/867cc494a9fa/ Log:Yet another attempt to unravel the mess that 6dac6407412f exposed. This makes space.allocate_lock() raise CannotHaveLock if we're

[pypy-commit] pypy issue1514: Apply pypy-import.diff3 from issue1514. Change the logic a bit

2014-04-16 Thread arigo
Author: Armin Rigo Branch: issue1514 Changeset: r70652:f96656bbecc9 Date: 2014-04-16 14:44 +0200 http://bitbucket.org/pypy/pypy/changeset/f96656bbecc9/ Log:Apply pypy-import.diff3 from issue1514. Change the logic a bit to be closer to the original (in particular, add the object to

[pypy-commit] pypy issue1514: A branch to run the tests in

2014-04-16 Thread arigo
Author: Armin Rigo Branch: issue1514 Changeset: r70651:7b0312827183 Date: 2014-04-16 14:39 +0200 http://bitbucket.org/pypy/pypy/changeset/7b0312827183/ Log:A branch to run the tests in ___ pypy-commit mailing list pypy-commit@python.org https://mai

[pypy-commit] pypy default: someone forgot those

2014-04-16 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r70653:6c60fdb521ad Date: 2014-04-16 14:48 +0200 http://bitbucket.org/pypy/pypy/changeset/6c60fdb521ad/ Log:someone forgot those diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators.py --- a/pypy/module/micronumpy

[pypy-commit] pypy default: a more questionable unrolling here

2014-04-16 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r70654:054e2cc2266a Date: 2014-04-16 15:13 +0200 http://bitbucket.org/pypy/pypy/changeset/054e2cc2266a/ Log:a more questionable unrolling here diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py --- a/pypy/module/micro

[pypy-commit] pypy issue1514: hg merge default

2014-04-16 Thread arigo
Author: Armin Rigo Branch: issue1514 Changeset: r70655:8edf0636e375 Date: 2014-04-16 15:27 +0200 http://bitbucket.org/pypy/pypy/changeset/8edf0636e375/ Log:hg merge default diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py

[pypy-commit] pypy default: Unsure of this fix, but should help fix translation

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70656:28f12116ef3d Date: 2014-04-16 15:53 +0200 http://bitbucket.org/pypy/pypy/changeset/28f12116ef3d/ Log:Unsure of this fix, but should help fix translation diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py --- a/pypy/mod

[pypy-commit] pypy issue1514: hg merge default

2014-04-16 Thread arigo
Author: Armin Rigo Branch: issue1514 Changeset: r70657:faf6b124f8f7 Date: 2014-04-16 15:53 +0200 http://bitbucket.org/pypy/pypy/changeset/faf6b124f8f7/ Log:hg merge default diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py --- a/pypy/module/micronumpy/types.py ++

[pypy-commit] pypy default: Fix the skipping condition (it was "skip always" by mistake)

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70658:3a448de2c18d Date: 2014-04-16 16:02 +0200 http://bitbucket.org/pypy/pypy/changeset/3a448de2c18d/ Log:Fix the skipping condition (it was "skip always" by mistake) diff --git a/rpython/rlib/test/test_rlocale.py b/rpython/rlib/test/test_rlocale.py

[pypy-commit] pypy default: jit.isconstant(float)

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70659:31fa36a1d761 Date: 2014-04-16 16:20 +0200 http://bitbucket.org/pypy/pypy/changeset/31fa36a1d761/ Log:jit.isconstant(float) diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py --- a/rpython/jit/metainterp/blackh

[pypy-commit] pypy issue1514: hg merge default

2014-04-16 Thread arigo
Author: Armin Rigo Branch: issue1514 Changeset: r70660:aed75d5736d6 Date: 2014-04-16 16:20 +0200 http://bitbucket.org/pypy/pypy/changeset/aed75d5736d6/ Log:hg merge default diff --git a/rpython/jit/metainterp/blackhole.py b/rpython/jit/metainterp/blackhole.py --- a/rpython/jit/metainterp/bl

[pypy-commit] pypy default: hg merge issue1514

2014-04-16 Thread arigo
Author: Armin Rigo Branch: Changeset: r70665:c2c709110379 Date: 2014-04-16 17:38 +0200 http://bitbucket.org/pypy/pypy/changeset/c2c709110379/ Log:hg merge issue1514 Support strange manipulations of sys.modules (thanks yamt) involving deleting built-in modules from sys.modul

[pypy-commit] pypy stmgc-c7: Kill what remains of the previous approach to abort_info

2014-04-16 Thread arigo
Author: Armin Rigo Branch: stmgc-c7 Changeset: r70663:de599561d2a5 Date: 2014-04-16 17:32 +0200 http://bitbucket.org/pypy/pypy/changeset/de599561d2a5/ Log:Kill what remains of the previous approach to abort_info diff --git a/pypy/interpreter/executioncontext.py b/pypy/interpreter/executionc

[pypy-commit] pypy stmgc-c7: Use stm stack markers

2014-04-16 Thread arigo
Author: Armin Rigo Branch: stmgc-c7 Changeset: r70661:7ea6e9a3e2b8 Date: 2014-04-16 17:30 +0200 http://bitbucket.org/pypy/pypy/changeset/7ea6e9a3e2b8/ Log:Use stm stack markers diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py --- a/rpython/jit/backend

[pypy-commit] pypy stmgc-c7: import stmgc/918b1901b1f9

2014-04-16 Thread arigo
Author: Armin Rigo Branch: stmgc-c7 Changeset: r70662:4ca36098b3de Date: 2014-04-16 17:31 +0200 http://bitbucket.org/pypy/pypy/changeset/4ca36098b3de/ Log:import stmgc/918b1901b1f9 diff --git a/rpython/translator/stm/src_stm/revision b/rpython/translator/stm/src_stm/revision --- a/rpython/t

[pypy-commit] pypy issue1514: ready for merge

2014-04-16 Thread arigo
Author: Armin Rigo Branch: issue1514 Changeset: r70664:3dff2f025058 Date: 2014-04-16 17:36 +0200 http://bitbucket.org/pypy/pypy/changeset/3dff2f025058/ Log:ready for merge ___ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/

[pypy-commit] pypy default: silence import RuntimeWarning

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70666:e370d5d04364 Date: 2014-04-16 12:18 -0400 http://bitbucket.org/pypy/pypy/changeset/e370d5d04364/ Log:silence import RuntimeWarning diff --git a/pypy/module/micronumpy/app_numpy.py b/pypy/module/micronumpy/app_numpy.py --- a/pypy/module/micronu

[pypy-commit] pypy default: fix whatsnew

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70667:db4a8be80c49 Date: 2014-04-16 12:43 -0400 http://bitbucket.org/pypy/pypy/changeset/db4a8be80c49/ Log:fix whatsnew diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head

[pypy-commit] pypy default: update micronumpy test_zjit

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70668:5191bc7c4184 Date: 2014-04-16 13:26 -0400 http://bitbucket.org/pypy/pypy/changeset/5191bc7c4184/ Log:update micronumpy test_zjit diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py --- a/pypy/module

[pypy-commit] pypy default: eliminate duplicate getarrayitem_gc in numpy iterator next

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70669:4b3a31de60d3 Date: 2014-04-16 18:22 -0400 http://bitbucket.org/pypy/pypy/changeset/4b3a31de60d3/ Log:eliminate duplicate getarrayitem_gc in numpy iterator next diff --git a/pypy/module/micronumpy/iterators.py b/pypy/module/micronumpy/iterators

[pypy-commit] pypy default: os.path.isdir calls nt.isdir on win32 which is not rpython after PyWin is installed to host python

2014-04-16 Thread mattip
Author: Matti Picus Branch: Changeset: r70672:5494b1aac76f Date: 2014-04-16 06:07 +0300 http://bitbucket.org/pypy/pypy/changeset/5494b1aac76f/ Log:os.path.isdir calls nt.isdir on win32 which is not rpython after PyWin is installed to host python diff --git a/pypy/module/imp/importin

[pypy-commit] pypy numpypy-nditer: implement op_dtypes

2014-04-16 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70671:0dca5996f880 Date: 2014-04-16 23:10 +0300 http://bitbucket.org/pypy/pypy/changeset/0dca5996f880/ Log:implement op_dtypes diff --git a/pypy/module/micronumpy/nditer.py b/pypy/module/micronumpy/nditer.py --- a/pypy/module/micronumpy/

[pypy-commit] pypy default: merge default into branch

2014-04-16 Thread mattip
Author: Matti Picus Branch: Changeset: r70673:bace5e5bd016 Date: 2014-04-16 23:10 +0300 http://bitbucket.org/pypy/pypy/changeset/bace5e5bd016/ Log:merge default into branch diff --git a/pypy/module/micronumpy/__init__.py b/pypy/module/micronumpy/__init__.py --- a/pypy/module/micronumpy/__i

[pypy-commit] pypy numpypy-nditer: disable 'external_loop' and 'buffering' flags pending future refactor, fix translation

2014-04-16 Thread mattip
Author: Matti Picus Branch: numpypy-nditer Changeset: r70670:873c97659fd1 Date: 2014-04-16 05:57 +0300 http://bitbucket.org/pypy/pypy/changeset/873c97659fd1/ Log:disable 'external_loop' and 'buffering' flags pending future refactor, fix translation diff --git a/pypy/module/micronumpy

[pypy-commit] pypy default: revert part of 310dcc241b1f: go back to having the module in sys.modules before

2014-04-16 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r70674:a7023a962605 Date: 2014-04-16 16:17 -0700 http://bitbucket.org/pypy/pypy/changeset/a7023a962605/ Log:revert part of 310dcc241b1f: go back to having the module in sys.modules before init, otherwise py3k runs into trouble while bo

[pypy-commit] pypy default: merge upstream

2014-04-16 Thread pjenvey
Author: Philip Jenvey Branch: Changeset: r70676:c7c7b54e61a0 Date: 2014-04-16 16:34 -0700 http://bitbucket.org/pypy/pypy/changeset/c7c7b54e61a0/ Log:merge upstream diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py --- a/pypy/module/imp/importing.py +++ b/pypy/module/i

[pypy-commit] pypy default: Backed out merge changeset: bace5e5bd016

2014-04-16 Thread mattip
Author: Matti Picus Branch: Changeset: r70677:6dbec8d4abec Date: 2014-04-17 02:35 +0300 http://bitbucket.org/pypy/pypy/changeset/6dbec8d4abec/ Log:Backed out merge changeset: bace5e5bd016 Backed out merge revision to its first parent (5494b1aac76f) diff --git a/pypy/module/micronum

[pypy-commit] pypy default: merge heads - back out premature merge of nditer

2014-04-16 Thread mattip
Author: Matti Picus Branch: Changeset: r70678:16be85246762 Date: 2014-04-17 02:38 +0300 http://bitbucket.org/pypy/pypy/changeset/16be85246762/ Log:merge heads - back out premature merge of nditer diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/int

[pypy-commit] pypy default: fix whatsnew

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70679:cf13db4663c3 Date: 2014-04-16 19:48 -0400 http://bitbucket.org/pypy/pypy/changeset/cf13db4663c3/ Log:fix whatsnew diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --- a/pypy/doc/whatsnew-head.rst +++ b/pypy/doc/whatsnew-head

[pypy-commit] pypy default: enable another test_zjit

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70680:dd3c87c0ab56 Date: 2014-04-16 21:18 -0400 http://bitbucket.org/pypy/pypy/changeset/dd3c87c0ab56/ Log:enable another test_zjit diff --git a/pypy/module/micronumpy/test/test_zjit.py b/pypy/module/micronumpy/test/test_zjit.py --- a/pypy/module/mi

[pypy-commit] pypy default: test with tzname rather than tzset for win32 compat

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70681:19e7e8192d2e Date: 2014-04-16 23:36 -0400 http://bitbucket.org/pypy/pypy/changeset/19e7e8192d2e/ Log:test with tzname rather than tzset for win32 compat diff --git a/pypy/module/imp/test/test_import.py b/pypy/module/imp/test/test_import.py ---

[pypy-commit] pypy default: add a test_zjit for pow

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70683:f2bdd3baf2d1 Date: 2014-04-17 01:26 -0400 http://bitbucket.org/pypy/pypy/changeset/f2bdd3baf2d1/ Log:add a test_zjit for pow diff --git a/pypy/module/micronumpy/compile.py b/pypy/module/micronumpy/compile.py --- a/pypy/module/micronumpy/compil

[pypy-commit] pypy default: support astype in micronumpy compile

2014-04-16 Thread bdkearns
Author: Brian Kearns Branch: Changeset: r70682:be03fa07697d Date: 2014-04-17 01:22 -0400 http://bitbucket.org/pypy/pypy/changeset/be03fa07697d/ Log:support astype in micronumpy compile diff --git a/pypy/module/micronumpy/compile.py b/pypy/module/micronumpy/compile.py --- a/pypy/module/micr