[pypy-commit] pypy py3.5-newtext: oops, fix

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90139:b1e1f945f231 Date: 2017-02-15 08:43 +0100 http://bitbucket.org/pypy/pypy/changeset/b1e1f945f231/ Log:oops, fix diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py ++

[pypy-commit] pypy py3.5-newtext: hg merge 5f267995aab4 (keeping wrap and wrap_not_rpython separate)

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90138:a13e864fa592 Date: 2017-02-15 08:41 +0100 http://bitbucket.org/pypy/pypy/changeset/a13e864fa592/ Log:hg merge 5f267995aab4 (keeping wrap and wrap_not_rpython separate) diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/

[pypy-commit] pypy space-newtext: fix comment: one of us is confused

2017-02-14 Thread arigo
Author: Armin Rigo Branch: space-newtext Changeset: r90137:e2d28a5f4464 Date: 2017-02-15 08:35 +0100 http://bitbucket.org/pypy/pypy/changeset/e2d28a5f4464/ Log:fix comment: one of us is confused diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/inter

[pypy-commit] pypy py3.5-newtext: hg merge f8751e58e3a8

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90136:9f5282f3a6a8 Date: 2017-02-15 08:32 +0100 http://bitbucket.org/pypy/pypy/changeset/9f5282f3a6a8/ Log:hg merge f8751e58e3a8 diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseob

[pypy-commit] pypy py3.5-newtext: hg merge 6673bc3db17b

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90133:d09311567d06 Date: 2017-02-15 08:13 +0100 http://bitbucket.org/pypy/pypy/changeset/d09311567d06/ Log:hg merge 6673bc3db17b diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py --- a/pypy/module/_io/interp_

[pypy-commit] pypy py3.5-newtext: hg merge 8dfca1a083c6

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90134:78d15c73cfad Date: 2017-02-15 08:16 +0100 http://bitbucket.org/pypy/pypy/changeset/78d15c73cfad/ Log:hg merge 8dfca1a083c6 diff --git a/pypy/module/cppyy/converter.py b/pypy/module/cppyy/converter.py --- a/pypy/module/cppyy/converter

[pypy-commit] pypy py3.5-newtext: hg merge 2e449c823765

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90132:0d12eeeab7ce Date: 2017-02-15 08:10 +0100 http://bitbucket.org/pypy/pypy/changeset/0d12eeeab7ce/ Log:hg merge 2e449c823765 diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py --- a/pypy/interpreter/error.py +++ b/pypy/

[pypy-commit] pypy space-newtext: test and fix

2017-02-14 Thread arigo
Author: Armin Rigo Branch: space-newtext Changeset: r90135:292e20099929 Date: 2017-02-15 08:31 +0100 http://bitbucket.org/pypy/pypy/changeset/292e20099929/ Log:test and fix diff --git a/pypy/module/struct/formatiterator.py b/pypy/module/struct/formatiterator.py --- a/pypy/module/struct/form

[pypy-commit] extradoc extradoc: publicity for the leysin sprint

2017-02-14 Thread arigo
Author: Armin Rigo Branch: extradoc Changeset: r5780:bef93e5951ca Date: 2017-02-15 07:34 +0100 http://bitbucket.org/pypy/extradoc/changeset/bef93e5951ca/ Log:publicity for the leysin sprint diff --git a/talk/swisspython2017/revdb/chalet1_004.jpg b/talk/swisspython2017/revdb/chalet1_004.jpg

[pypy-commit] pypy py3.5-newtext: hg merge dedd16a4f65a

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90130:6d55b94fef3a Date: 2017-02-14 18:59 +0100 http://bitbucket.org/pypy/pypy/changeset/6d55b94fef3a/ Log:hg merge dedd16a4f65a diff --git a/pypy/interpreter/test/test_typedef.py b/pypy/interpreter/test/test_typedef.py --- a/pypy/interpr

[pypy-commit] pypy py3.5-newtext: hg merge 511d80a64542

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90131:8d50fdd3bda5 Date: 2017-02-14 19:01 +0100 http://bitbucket.org/pypy/pypy/changeset/8d50fdd3bda5/ Log:hg merge 511d80a64542 diff --git a/pypy/module/_md5/interp_md5.py b/pypy/module/_md5/interp_md5.py --- a/pypy/module/_md5/interp_md5

[pypy-commit] pypy py3.5-newtext: hg merge be088827c1c4

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90129:3ad4f6634212 Date: 2017-02-14 18:57 +0100 http://bitbucket.org/pypy/pypy/changeset/3ad4f6634212/ Log:hg merge be088827c1c4 diff --git a/pypy/module/cppyy/converter.py b/pypy/module/cppyy/converter.py --- a/pypy/module/cppyy/converter

[pypy-commit] pypy py3.5-newtext: fix

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90128:c944c1708d09 Date: 2017-02-14 18:55 +0100 http://bitbucket.org/pypy/pypy/changeset/c944c1708d09/ Log:fix diff --git a/pypy/module/_cffi_backend/cffi1_module.py b/pypy/module/_cffi_backend/cffi1_module.py --- a/pypy/module/_cffi_back

[pypy-commit] pypy py3.5-newtext: fix

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90127:9ea292d316da Date: 2017-02-14 18:51 +0100 http://bitbucket.org/pypy/pypy/changeset/9ea292d316da/ Log:fix diff --git a/pypy/module/_csv/interp_csv.py b/pypy/module/_csv/interp_csv.py --- a/pypy/module/_csv/interp_csv.py +++ b/pypy/mod

[pypy-commit] pypy py3.5-newtext: fix

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90126:5d34edcd4e19 Date: 2017-02-14 18:39 +0100 http://bitbucket.org/pypy/pypy/changeset/5d34edcd4e19/ Log:fix diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py --- a/pypy/objspace/std/objspace.py +++ b/pypy/objspa

[pypy-commit] pypy py3.5-newtext: hg merge 036370c1dfd7 (probably buggy)

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90125:451198f306e0 Date: 2017-02-14 18:36 +0100 http://bitbucket.org/pypy/pypy/changeset/451198f306e0/ Log:hg merge 036370c1dfd7 (probably buggy) diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/i

[pypy-commit] pypy py3.5-newtext: hg merge ffa1b618069f

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90124:ce468b82d2f3 Date: 2017-02-14 18:17 +0100 http://bitbucket.org/pypy/pypy/changeset/ce468b82d2f3/ Log:hg merge ffa1b618069f diff --git a/pypy/module/cppyy/converter.py b/pypy/module/cppyy/converter.py --- a/pypy/module/cppyy/converter

[pypy-commit] pypy py3.5-newtext: hg merge df80a32ac30f

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90123:986a8facd2f0 Date: 2017-02-14 18:13 +0100 http://bitbucket.org/pypy/pypy/changeset/986a8facd2f0/ Log:hg merge df80a32ac30f diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py --- a/pypy/goal/targetpypy

[pypy-commit] pypy py3.5-newtext: hg merge 0292533aef1d

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90122:9482cbbe738a Date: 2017-02-14 18:10 +0100 http://bitbucket.org/pypy/pypy/changeset/9482cbbe738a/ Log:hg merge 0292533aef1d diff --git a/pypy/module/_socket/interp_socket.py b/pypy/module/_socket/interp_socket.py --- a/pypy/module/_s

[pypy-commit] pypy py3.5-newtext: hg merge 97de008631bc

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90121:353187813fc8 Date: 2017-02-14 18:08 +0100 http://bitbucket.org/pypy/pypy/changeset/353187813fc8/ Log:hg merge 97de008631bc diff --git a/pypy/interpreter/astcompiler/ast.py b/pypy/interpreter/astcompiler/ast.py --- a/pypy/interpreter

[pypy-commit] pypy space-newtext: This class only ever contains an empty list

2017-02-14 Thread arigo
Author: Armin Rigo Branch: space-newtext Changeset: r90120:1e5e474fe89b Date: 2017-02-14 17:54 +0100 http://bitbucket.org/pypy/pypy/changeset/1e5e474fe89b/ Log:This class only ever contains an empty list diff --git a/pypy/interpreter/astcompiler/ast.py b/pypy/interpreter/astcompiler/ast.py

[pypy-commit] pypy py3.5-newtext: hg merge d1caa90c2615

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90119:ffee6934a103 Date: 2017-02-14 17:46 +0100 http://bitbucket.org/pypy/pypy/changeset/ffee6934a103/ Log:hg merge d1caa90c2615 diff --git a/pypy/module/_jitlog/interp_jitlog.py b/pypy/module/_jitlog/interp_jitlog.py --- a/pypy/module/_j

[pypy-commit] pypy py3.5-newtext: hg merge 111d8e1779ff

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90118:b39d70ae1e8e Date: 2017-02-14 17:43 +0100 http://bitbucket.org/pypy/pypy/changeset/b39d70ae1e8e/ Log:hg merge 111d8e1779ff diff --git a/pypy/module/cpyext/bytearrayobject.py b/pypy/module/cpyext/bytearrayobject.py --- a/pypy/module/

[pypy-commit] pypy space-newtext: fix some newbytes/newtext mistakes (they show up as conflicts in case

2017-02-14 Thread arigo
Author: Armin Rigo Branch: space-newtext Changeset: r90117:177cb9a0a3c2 Date: 2017-02-14 17:43 +0100 http://bitbucket.org/pypy/pypy/changeset/177cb9a0a3c2/ Log:fix some newbytes/newtext mistakes (they show up as conflicts in case the py3.5 branch already did the replacement choosing t

[pypy-commit] pypy py3.5: merge heads

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5 Changeset: r90116:b30c111d304e Date: 2017-02-14 17:36 +0100 http://bitbucket.org/pypy/pypy/changeset/b30c111d304e/ Log:merge heads diff --git a/pypy/module/_codecs/locale.py b/pypy/module/_codecs/locale.py --- a/pypy/module/_codecs/locale.py +++ b/pypy/module

[pypy-commit] pypy py3.5-newtext: hg merge c5c3e2fb39a6

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90115:a675735c36bf Date: 2017-02-14 17:36 +0100 http://bitbucket.org/pypy/pypy/changeset/a675735c36bf/ Log:hg merge c5c3e2fb39a6 diff too long, truncating to 2000 out of 4500 lines diff --git a/pypy/module/_cffi_backend/allocator.py b/py

[pypy-commit] pypy py3.5: fix

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5 Changeset: r90114:f1c5de555036 Date: 2017-02-14 17:28 +0100 http://bitbucket.org/pypy/pypy/changeset/f1c5de555036/ Log:fix diff --git a/pypy/module/cpyext/pyfile.py b/pypy/module/cpyext/pyfile.py --- a/pypy/module/cpyext/pyfile.py +++ b/pypy/module/cpyext/pyf

[pypy-commit] pypy py3.5-newtext: hg merge a3f02433a915

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90113:6c401ebf28ef Date: 2017-02-14 17:04 +0100 http://bitbucket.org/pypy/pypy/changeset/6c401ebf28ef/ Log:hg merge a3f02433a915 diff --git a/pypy/module/_multiprocessing/interp_semaphore.py b/pypy/module/_multiprocessing/interp_semaphore

[pypy-commit] pypy py3.5-newtext: hg merge 35acc5809da1

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90112:f9ea8c5f2f1e Date: 2017-02-14 16:54 +0100 http://bitbucket.org/pypy/pypy/changeset/f9ea8c5f2f1e/ Log:hg merge 35acc5809da1 diff --git a/pypy/module/_locale/interp_locale.py b/pypy/module/_locale/interp_locale.py --- a/pypy/module/_l

[pypy-commit] pypy py3.5-newtext: hg merge de24352afe1b

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90111:77a934df9a3a Date: 2017-02-14 16:26 +0100 http://bitbucket.org/pypy/pypy/changeset/77a934df9a3a/ Log:hg merge de24352afe1b diff --git a/pypy/module/_continuation/interp_continuation.py b/pypy/module/_continuation/interp_continuation

[pypy-commit] pypy py3.5-newtext: hg merge ee5ad76cdf97

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90110:cf2f4a07e7c1 Date: 2017-02-14 15:53 +0100 http://bitbucket.org/pypy/pypy/changeset/cf2f4a07e7c1/ Log:hg merge ee5ad76cdf97 diff --git a/pypy/module/struct/formatiterator.py b/pypy/module/struct/formatiterator.py --- a/pypy/module/st

[pypy-commit] pypy space-newtext: tweaks

2017-02-14 Thread arigo
Author: Armin Rigo Branch: space-newtext Changeset: r90108:a4d3c68d1442 Date: 2017-02-14 12:09 +0100 http://bitbucket.org/pypy/pypy/changeset/a4d3c68d1442/ Log:tweaks diff --git a/pypy/interpreter/pyparser/error.py b/pypy/interpreter/pyparser/error.py --- a/pypy/interpreter/pyparser/error.p

[pypy-commit] pypy py3.5-newtext: hg merge 22c094827f52

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90109:e3793974f52a Date: 2017-02-14 12:35 +0100 http://bitbucket.org/pypy/pypy/changeset/e3793974f52a/ Log:hg merge 22c094827f52 diff too long, truncating to 2000 out of 3536 lines diff --git a/pypy/interpreter/gateway.py b/pypy/interpret

[pypy-commit] pypy py3.5-newtext: hg merge e725a8848ced

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90107:ebb8f9173578 Date: 2017-02-14 11:27 +0100 http://bitbucket.org/pypy/pypy/changeset/ebb8f9173578/ Log:hg merge e725a8848ced diff --git a/pypy/module/_pickle_support/maker.py b/pypy/module/_pickle_support/maker.py --- a/pypy/module/_p

[pypy-commit] pypy py3.5-newtext: hg merge fea7fb1fd7fb

2017-02-14 Thread arigo
Author: Armin Rigo Branch: py3.5-newtext Changeset: r90106:af812ba25374 Date: 2017-02-14 11:24 +0100 http://bitbucket.org/pypy/pypy/changeset/af812ba25374/ Log:hg merge fea7fb1fd7fb diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py --- a/pypy/module/array/in

[pypy-commit] pypy.org extradoc: update the values

2017-02-14 Thread arigo
Author: Armin Rigo Branch: extradoc Changeset: r861:90149bca1ec5 Date: 2017-02-14 10:13 +0100 http://bitbucket.org/pypy/pypy.org/changeset/90149bca1ec5/ Log:update the values diff --git a/don1.html b/don1.html --- a/don1.html +++ b/don1.html @@ -9,13 +9,13 @@ $(function() { $("#pro