[pypy-commit] pypy stdlib-2.7.9: add test_ensurepip

2014-12-14 Thread pjenvey
Author: Philip Jenvey Branch: stdlib-2.7.9 Changeset: r74936:cc6be548db9d Date: 2014-12-14 14:57 -0800 http://bitbucket.org/pypy/pypy/changeset/cc6be548db9d/ Log:add test_ensurepip diff --git a/lib-python/conftest.py b/lib-python/conftest.py --- a/lib-python/conftest.py +++ b/lib-python/conf

[pypy-commit] pypy stdlib-2.7.9: Added the needed spaceconfig

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74935:ec3a44263c5b Date: 2014-12-14 12:17 -0800 http://bitbucket.org/pypy/pypy/changeset/ec3a44263c5b/ Log:Added the needed spaceconfig diff --git a/pypy/module/_sre/test/test_app_sre.py b/pypy/module/_sre/test/test_app_sre.py --- a/pypy/

[pypy-commit] pypy stdlib-2.7.9: Implement _hashlib.openssl_md_meth_names, needed by hashlib.py

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: stdlib-2.7.9 Changeset: r74934:1d1bd5f19364 Date: 2011-10-22 00:24 +0200 http://bitbucket.org/pypy/pypy/changeset/1d1bd5f19364/ Log:Implement _hashlib.openssl_md_meth_names, needed by hashlib.py diff --git a/pypy/module/_hashlib/__init__.py b/pypy/module/

[pypy-commit] pypy default: formatting

2014-12-14 Thread fijal
Author: Maciej Fijalkowski Branch: Changeset: r74933:f2fc3729ff99 Date: 2014-12-14 21:16 +0200 http://bitbucket.org/pypy/pypy/changeset/f2fc3729ff99/ Log:formatting diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/metainterp/optimizeopt/unroll.py --- a/rpython/jit/me

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in distutils/sysconfig.py

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74932:2bc79e0008d8 Date: 2014-12-14 10:51 -0800 http://bitbucket.org/pypy/pypy/changeset/2bc79e0008d8/ Log:Resolved merge conflicts in distutils/sysconfig.py diff --git a/lib-python/2.7/distutils/sysconfig.py b/lib-python/2.7/distutils/sy

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_file2k.py

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74931:06eaf68b7f7c Date: 2014-12-14 10:46 -0800 http://bitbucket.org/pypy/pypy/changeset/06eaf68b7f7c/ Log:Resolved merge conflicts in test_file2k.py diff --git a/lib-python/2.7/test/test_file2k.py b/lib-python/2.7/test/test_file2k.py ---

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74930:460cc2dd9310 Date: 2014-12-14 10:45 -0800 http://bitbucket.org/pypy/pypy/changeset/460cc2dd9310/ Log:Resolved merge conflicts in test_ssl.py diff --git a/lib-python/2.7/test/test_socket.py b/lib-python/2.7/test/test_socket.py --- a/

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74929:39a0aacf4e67 Date: 2014-12-14 10:43 -0800 http://bitbucket.org/pypy/pypy/changeset/39a0aacf4e67/ Log:Resolved merge conflicts in test_ssl.py diff --git a/lib-python/2.7/test/test_hash.py b/lib-python/2.7/test/test_hash.py --- a/lib-p

[pypy-commit] pypy py3.3: Try to fix the encoding bootstrap issue.

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: py3.3 Changeset: r74927:7470b99dce17 Date: 2014-12-14 19:12 +0100 http://bitbucket.org/pypy/pypy/changeset/7470b99dce17/ Log:Try to fix the encoding bootstrap issue. Now pypy starts with LANG=C. diff --git a/pypy/module/_codecs/interp_codecs.py b

[pypy-commit] pypy py3.3: Add method TkApp.merge()

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: py3.3 Changeset: r74923:97d75d169b30 Date: 2014-10-30 22:18 +0100 http://bitbucket.org/pypy/pypy/changeset/97d75d169b30/ Log:Add method TkApp.merge() diff --git a/lib_pypy/_tkinter/app.py b/lib_pypy/_tkinter/app.py --- a/lib_pypy/_tkinter/app.py +++ b/lib

[pypy-commit] pypy py3.3: hg merge heads

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: py3.3 Changeset: r74928:362d1c6f3870 Date: 2014-12-14 19:41 +0100 http://bitbucket.org/pypy/pypy/changeset/362d1c6f3870/ Log:hg merge heads diff too long, truncating to 2000 out of 4604 lines diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoptio

[pypy-commit] pypy py3.3: Start to define posix._have_functions

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: py3.3 Changeset: r74925:e563bf673157 Date: 2014-11-01 12:01 +0100 http://bitbucket.org/pypy/pypy/changeset/e563bf673157/ Log:Start to define posix._have_functions diff --git a/pypy/module/posix/__init__.py b/pypy/module/posix/__init__.py --- a/pypy/module

[pypy-commit] pypy py3.3: In import errors, hide frames from importlib._bootstrap

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: py3.3 Changeset: r74924:97034435e2d0 Date: 2014-11-01 10:54 +0100 http://bitbucket.org/pypy/pypy/changeset/97034435e2d0/ Log:In import errors, hide frames from importlib._bootstrap diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py --- a/p

[pypy-commit] pypy py3.3: Add a negative test for win32

2014-12-14 Thread amauryfa
Author: Amaury Forgeot d'Arc Branch: py3.3 Changeset: r74926:29979a710c73 Date: 2014-11-01 12:02 +0100 http://bitbucket.org/pypy/pypy/changeset/29979a710c73/ Log:Add a negative test for win32 diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py --- a/py

[pypy-commit] pypy stdlib-2.7.9: Resolved merge conflicts in test_ssl.py

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74922:5eed2065b581 Date: 2014-12-14 10:40 -0800 http://bitbucket.org/pypy/pypy/changeset/5eed2065b581/ Log:Resolved merge conflicts in test_ssl.py diff --git a/lib-python/2.7/test/test_ssl.py b/lib-python/2.7/test/test_ssl.py --- a/lib-pyt

[pypy-commit] pypy stdlib-2.7.9: Attempted to resolve merge conflicts in ssl.py

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74921:8c0194b34140 Date: 2014-12-14 10:38 -0800 http://bitbucket.org/pypy/pypy/changeset/8c0194b34140/ Log:Attempted to resolve merge conflicts in ssl.py diff --git a/lib-python/2.7/ssl.py b/lib-python/2.7/ssl.py --- a/lib-python/2.7/ssl.p

[pypy-commit] pypy default: Fixed typo in the stdlib upgrade guide

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: Changeset: r74920:799a6016cf54 Date: 2014-12-14 10:36 -0800 http://bitbucket.org/pypy/pypy/changeset/799a6016cf54/ Log:Fixed typo in the stdlib upgrade guide diff --git a/lib-python/stdlib-upgrade.txt b/lib-python/stdlib-upgrade.txt --- a/lib-python/stdlib-upgrad

[pypy-commit] pypy stdlib-2.7.9: Merged in stdlib/vendor. There are merge conflict markers right now

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: stdlib-2.7.9 Changeset: r74919:140cc8c53bcd Date: 2014-12-14 10:34 -0800 http://bitbucket.org/pypy/pypy/changeset/140cc8c53bcd/ Log:Merged in stdlib/vendor. There are merge conflict markers right now diff too long, truncating to 2000 out of 24844 lines diff --git

[pypy-commit] pypy vendor/stdlib: Upgrade 2.7 stdlib to 2.7.9

2014-12-14 Thread alex_gaynor
Author: Alex Gaynor Branch: vendor/stdlib Changeset: r74918:4ecd94a66a87 Date: 2014-12-14 10:31 -0800 http://bitbucket.org/pypy/pypy/changeset/4ecd94a66a87/ Log:Upgrade 2.7 stdlib to 2.7.9 diff too long, truncating to 2000 out of 24016 lines diff --git a/lib-python/2.7/CGIHTTPServer.py b/li

[pypy-commit] pypy optresult: hack unrolling enough to pass the first actual test

2014-12-14 Thread fijal
Author: Maciej Fijalkowski Branch: optresult Changeset: r74917:2713ea9e60e2 Date: 2014-12-14 20:05 +0200 http://bitbucket.org/pypy/pypy/changeset/2713ea9e60e2/ Log:hack unrolling enough to pass the first actual test diff --git a/rpython/jit/metainterp/optimizeopt/unroll.py b/rpython/jit/met

[pypy-commit] pypy vmprof: disable those warnings

2014-12-14 Thread fijal
Author: Maciej Fijalkowski Branch: vmprof Changeset: r74916:d64556a99c18 Date: 2014-12-14 19:36 +0200 http://bitbucket.org/pypy/pypy/changeset/d64556a99c18/ Log:disable those warnings diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py --- a/pypy/module/

[pypy-commit] pypy vmprof: typo

2014-12-14 Thread fijal
Author: Maciej Fijalkowski Branch: vmprof Changeset: r74915:e6e97f3bddbc Date: 2014-12-14 19:13 +0200 http://bitbucket.org/pypy/pypy/changeset/e6e97f3bddbc/ Log:typo diff --git a/pypy/module/_vmprof/interp_vmprof.py b/pypy/module/_vmprof/interp_vmprof.py --- a/pypy/module/_vmprof/interp_vmp

[pypy-commit] pypy vmprof: Implement the correct handling of get_virtual_ip in the presence of

2014-12-14 Thread fijal
Author: Maciej Fijalkowski Branch: vmprof Changeset: r74914:3c0a8b430ed5 Date: 2014-12-14 19:04 +0200 http://bitbucket.org/pypy/pypy/changeset/3c0a8b430ed5/ Log:Implement the correct handling of get_virtual_ip in the presence of virtualizables. Added a hack that will give you the vabl

[pypy-commit] pypy no-silent-merging-of-int-types: No longer silently merge different int types in RPython.

2014-12-14 Thread arigo
Author: Armin Rigo Branch: no-silent-merging-of-int-types Changeset: r74913:bdfb89396304 Date: 2014-12-14 17:41 +0100 http://bitbucket.org/pypy/pypy/changeset/bdfb89396304/ Log:No longer silently merge different int types in RPython. diff --git a/rpython/annotator/binaryop.py b/rpython/annot

[pypy-commit] pypy default: Obviously, adding ll_prepare_dict_update() exposed a latent bug

2014-12-14 Thread arigo
Author: Armin Rigo Branch: Changeset: r74912:ef301ae5ae96 Date: 2014-12-14 17:23 +0100 http://bitbucket.org/pypy/pypy/changeset/ef301ae5ae96/ Log:Obviously, adding ll_prepare_dict_update() exposed a latent bug diff --git a/rpython/rtyper/lltypesystem/rordereddict.py b/rpython/rtyper/lltype

[pypy-commit] pypy default: more tweaks, with the goal that we can say 'SomeDict = SomeOrderedDict' in annotation/model.py

2014-12-14 Thread arigo
Author: Armin Rigo Branch: Changeset: r74911:ae2c0310c9c9 Date: 2014-12-14 14:39 +0100 http://bitbucket.org/pypy/pypy/changeset/ae2c0310c9c9/ Log:more tweaks, with the goal that we can say 'SomeDict = SomeOrderedDict' in annotation/model.py diff --git a/rpython/rtyper/lltypesystem/r

[pypy-commit] pypy default: Add stress tests for rordereddict, copied from rdict. Kill an unused function.

2014-12-14 Thread arigo
Author: Armin Rigo Branch: Changeset: r74910:b30951625595 Date: 2014-12-14 13:23 + http://bitbucket.org/pypy/pypy/changeset/b30951625595/ Log:Add stress tests for rordereddict, copied from rdict. Kill an unused function. diff --git a/rpython/rtyper/lltypesystem/rordereddict.py

[pypy-commit] pypy default: Import a recent tweak from rdict to rordereddict.

2014-12-14 Thread arigo
Author: Armin Rigo Branch: Changeset: r74909:b25002d820a5 Date: 2014-12-14 13:44 +0100 http://bitbucket.org/pypy/pypy/changeset/b25002d820a5/ Log:Import a recent tweak from rdict to rordereddict. Support rtype_newdict() making possibly-ordered dicts. diff --git a/rpython/rtyper/llty

[pypy-commit] pypy object-dtype: start fighting with object dtype

2014-12-14 Thread fijal
Author: Maciej Fijalkowski Branch: object-dtype Changeset: r74908:f72d18cb824c Date: 2014-12-14 12:42 +0200 http://bitbucket.org/pypy/pypy/changeset/f72d18cb824c/ Log:start fighting with object dtype diff --git a/pypy/module/micronumpy/boxes.py b/pypy/module/micronumpy/boxes.py --- a/pypy/mo