[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r87685:e0d72435262a Date: 2016-10-09 19:59 -0700 http://bitbucket.org/pypy/pypy/changeset/e0d72435262a/ Log:merge default diff --git a/pypy/interpreter/test/test_zzpickle_and_slow.py b/pypy/interpreter/test/test_zzpickle_and_slow.py --- a/pypy/i

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r87681:6434baec5a74 Date: 2016-10-09 18:01 -0700 http://bitbucket.org/pypy/pypy/changeset/6434baec5a74/ Log:merge default diff too long, truncating to 2000 out of 38623 lines diff --git a/lib-python/2.7/BaseHTTPServer.py b/lib-python/2.7/BaseHTT

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r87678:ce7a5c1077b4 Date: 2016-10-09 17:35 -0700 http://bitbucket.org/pypy/pypy/changeset/ce7a5c1077b4/ Log:merge default diff too long, truncating to 2000 out of 2071 lines diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --

[pypy-commit] pypy py3k: merge heads

Author: Ronan Lamy Branch: py3k Changeset: r87598:fa2f1b9c84f4 Date: 2016-10-05 17:04 +0100 http://bitbucket.org/pypy/pypy/changeset/fa2f1b9c84f4/ Log:merge heads diff --git a/pypy/module/cpyext/test/test_memoryobject.py b/pypy/module/cpyext/test/test_memoryobject.py --- a/pypy/module/cpyex

[pypy-commit] pypy py3k: merge

Author: Carl Friedrich Bolz Branch: py3k Changeset: r87588:c7b40fdc5deb Date: 2016-10-05 10:43 +0200 http://bitbucket.org/pypy/pypy/changeset/c7b40fdc5deb/ Log:merge diff too long, truncating to 2000 out of 4446 lines diff --git a/pypy/module/cpyext/include/methodobject.h b/pypy/module/cpy

[pypy-commit] pypy py3k: merge default

Author: Carl Friedrich Bolz Branch: py3k Changeset: r87586:c0c28e08bb1c Date: 2016-10-04 17:53 +0200 http://bitbucket.org/pypy/pypy/changeset/c0c28e08bb1c/ Log:merge default (the methodcall stuff needed a slightly different approach than on default) diff --git a/pypy/doc/wha

[pypy-commit] pypy py3k: merge

Author: Carl Friedrich Bolz Branch: py3k Changeset: r87587:24d05575caeb Date: 2016-10-05 10:42 +0200 http://bitbucket.org/pypy/pypy/changeset/24d05575caeb/ Log:merge diff --git a/pypy/module/cpyext/test/foo.c b/pypy/module/cpyext/test/foo.c --- a/pypy/module/cpyext/test/foo.c +++ b/pypy/modu

[pypy-commit] pypy py3k: merge heads

Author: Armin Rigo Branch: py3k Changeset: r87347:cb1bd427cb74 Date: 2016-09-23 18:39 +0200 http://bitbucket.org/pypy/pypy/changeset/cb1bd427cb74/ Log:merge heads diff --git a/pypy/objspace/test/test_descriptor.py b/pypy/objspace/test/test_descriptor.py --- a/pypy/objspace/test/test_descrip

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r87337:2bac03f27a04 Date: 2016-09-22 19:57 -0700 http://bitbucket.org/pypy/pypy/changeset/2bac03f27a04/ Log:merge default diff --git a/lib_pypy/_winapi.py b/lib_pypy/_winapi.py --- a/lib_pypy/_winapi.py +++ b/lib_pypy/_winapi.py @@ -22,7 +22,10 @

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r86855:83f439eeb461 Date: 2016-09-03 12:07 -0700 http://bitbucket.org/pypy/pypy/changeset/83f439eeb461/ Log:merge default diff --git a/_pytest/python.py b/_pytest/python.py --- a/_pytest/python.py +++ b/_pytest/python.py @@ -498,7 +498,10 @@

[pypy-commit] pypy py3k: merge heads

Author: Armin Rigo Branch: py3k Changeset: r86767:8be5d923f6ae Date: 2016-08-31 10:40 +0200 http://bitbucket.org/pypy/pypy/changeset/8be5d923f6ae/ Log:merge heads diff --git a/pypy/module/__builtin__/test/test_builtin.py b/pypy/module/__builtin__/test/test_builtin.py --- a/pypy/module/__bui

[pypy-commit] pypy py3k: merge default

Author: Richard Plangger Branch: py3k Changeset: r86723:a803524ac2de Date: 2016-08-30 10:12 +0200 http://bitbucket.org/pypy/pypy/changeset/a803524ac2de/ Log:merge default diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -74,6 +74,7 @@ Seo Sanghyeon Ronny Pfannschmidt Ju

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r86672:8d7e62c4cbd9 Date: 2016-08-28 20:10 -0700 http://bitbucket.org/pypy/pypy/changeset/8d7e62c4cbd9/ Log:merge default diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py --- a/rpython/rlib/rposix.py +++ b/rpython/rlib/rposix.py @@ -1

[pypy-commit] pypy py3k: merge default

Author: Richard Plangger Branch: py3k Changeset: r86459:281ace7115cb Date: 2016-08-24 09:59 +0200 http://bitbucket.org/pypy/pypy/changeset/281ace7115cb/ Log:merge default diff --git a/lib_pypy/_ctypes/basics.py b/lib_pypy/_ctypes/basics.py --- a/lib_pypy/_ctypes/basics.py +++ b/lib_pypy/_cty

[pypy-commit] pypy py3k: merge heads

Author: Armin Rigo Branch: py3k Changeset: r86331:47258bd66b35 Date: 2016-08-19 20:34 +0200 http://bitbucket.org/pypy/pypy/changeset/47258bd66b35/ Log:merge heads diff --git a/lib-python/3/test/test_compileall.py b/lib-python/3/test/test_compileall.py --- a/lib-python/3/test/test_compileall

[pypy-commit] pypy py3k: merge heads

Author: Armin Rigo Branch: py3k Changeset: r85880:9e35bf2df23f Date: 2016-07-27 18:15 +0200 http://bitbucket.org/pypy/pypy/changeset/9e35bf2df23f/ Log:merge heads diff too long, truncating to 2000 out of 6304 lines diff --git a/pypy/objspace/std/stringmethods.py b/pypy/objspace/std/stringm

[pypy-commit] pypy py3k: merge branch testing-cleanup-py3k

Author: Ronan Lamy Branch: py3k Changeset: r85310:df6e701d52a2 Date: 2016-06-21 16:54 +0100 http://bitbucket.org/pypy/pypy/changeset/df6e701d52a2/ Log:merge branch testing-cleanup-py3k diff too long, truncating to 2000 out of 2361 lines diff --git a/pypy/interpreter/astcompiler/test/test_co

[pypy-commit] pypy py3k: Merge with upstream.

Author: Mark Young Branch: py3k Changeset: r85279:ae756a654002 Date: 2016-05-29 11:56 -0400 http://bitbucket.org/pypy/pypy/changeset/ae756a654002/ Log:Merge with upstream. diff too long, truncating to 2000 out of 3066 lines diff --git a/lib-python/3/ensurepip/__init__.py b/lib-python/3/ens

[pypy-commit] pypy py3k: Merge with upstream.

Author: Mark Young Branch: py3k Changeset: r85272:abc95a8adea5 Date: 2016-05-24 13:04 -0400 http://bitbucket.org/pypy/pypy/changeset/abc95a8adea5/ Log:Merge with upstream. diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py --- a/pypy/config/pypyoption.py +++ b/pypy/config/pyp

[pypy-commit] pypy py3k: Merge with upstream.

Author: Mark Young Branch: py3k Changeset: r85266:1f829b014269 Date: 2016-05-20 21:22 -0400 http://bitbucket.org/pypy/pypy/changeset/1f829b014269/ Log:Merge with upstream. diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -22,3 +22,4 @@ bbd45126bc691f669c4ebdfbd74456cd274c6b92 r

[pypy-commit] pypy py3k: Merge with upstream I hope.

Author: Mark Young Branch: py3k Changeset: r85267:57b204adccaa Date: 2016-05-22 13:06 -0400 http://bitbucket.org/pypy/pypy/changeset/57b204adccaa/ Log:Merge with upstream I hope. diff --git a/lib-python/3/test/test_descr.py b/lib-python/3/test/test_descr.py --- a/lib-python/3/test/test_descr

[pypy-commit] pypy py3k: Merge with upstream.

Author: Mark Young Branch: py3k Changeset: r85271:96a0f86b3857 Date: 2016-05-23 16:59 -0400 http://bitbucket.org/pypy/pypy/changeset/96a0f86b3857/ Log:Merge with upstream. diff --git a/lib-python/conftest.py b/lib-python/conftest.py --- a/lib-python/conftest.py +++ b/lib-python/conftest.py @

[pypy-commit] pypy py3k: Merge heads

Author: Mark Young Branch: py3k Changeset: r85269:b9b012bb9824 Date: 2016-05-22 14:44 -0400 http://bitbucket.org/pypy/pypy/changeset/b9b012bb9824/ Log:Merge heads diff --git a/lib-python/3/test/test_descr.py b/lib-python/3/test/test_descr.py --- a/lib-python/3/test/test_descr.py +++ b/lib-py

[pypy-commit] pypy py3k: Merge branch 'testing-cleanup-py3k'

Author: Ronan Lamy Branch: py3k Changeset: r85134:8028f6e5a9c9 Date: 2016-06-13 16:35 +0100 http://bitbucket.org/pypy/pypy/changeset/8028f6e5a9c9/ Log:Merge branch 'testing-cleanup-py3k' diff --git a/pypy/conftest.py b/pypy/conftest.py --- a/pypy/conftest.py +++ b/pypy/conftest.py @@ -94,6 +

[pypy-commit] pypy py3k: merge py3k-get_clock_info

Author: Philip Jenvey Branch: py3k Changeset: r84803:7e5d1ee11bb2 Date: 2016-05-28 14:18 -0700 http://bitbucket.org/pypy/pypy/changeset/7e5d1ee11bb2/ Log:merge py3k-get_clock_info adds time.get_clock_info for posix, windows is still a work in progress diff --git a/lib-python

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84716:bf1da7965176 Date: 2016-05-26 12:52 -0700 http://bitbucket.org/pypy/pypy/changeset/bf1da7965176/ Log:merge default diff --git a/lib_pypy/_winapi.py b/lib_pypy/_winapi.py --- a/lib_pypy/_winapi.py +++ b/lib_pypy/_winapi.py @@ -4,6 +4,9 @@

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84693:0d7d00536295 Date: 2016-05-25 20:04 -0700 http://bitbucket.org/pypy/pypy/changeset/0d7d00536295/ Log:merge default diff --git a/lib_pypy/cffi/commontypes.py b/lib_pypy/cffi/commontypes.py --- a/lib_pypy/cffi/commontypes.py +++ b/lib_pypy/c

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84650:09d354bfe1d5 Date: 2016-05-23 18:48 -0700 http://bitbucket.org/pypy/pypy/changeset/09d354bfe1d5/ Log:merge default diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py --- a/rpython/rlib/rposix.py +++ b/rpython/rlib/rposix.py @@ -1

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84646:c42012dd2124 Date: 2016-05-23 16:44 -0700 http://bitbucket.org/pypy/pypy/changeset/c42012dd2124/ Log:merge default diff --git a/rpython/jit/backend/x86/test/test_rx86_32_auto_encoding.py b/rpython/jit/backend/x86/test/test_rx86_32_auto_en

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84605:ba8f19066ea5 Date: 2016-05-22 15:02 -0700 http://bitbucket.org/pypy/pypy/changeset/ba8f19066ea5/ Log:merge default diff --git a/pypy/objspace/fake/objspace.py b/pypy/objspace/fake/objspace.py --- a/pypy/objspace/fake/objspace.py +++ b/pypy

[pypy-commit] pypy py3k: Merge

Author: Raffael Tfirst Branch: py3k Changeset: r84585:69f43473014e Date: 2016-05-22 20:57 +0200 http://bitbucket.org/pypy/pypy/changeset/69f43473014e/ Log:Merge diff --git a/pypy/interpreter/pyparser/gendfa.py b/pypy/interpreter/pyparser/gendfa.py --- a/pypy/interpreter/pyparser/gendfa.py +

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84581:c003d9ab8b20 Date: 2016-05-22 11:19 -0700 http://bitbucket.org/pypy/pypy/changeset/c003d9ab8b20/ Log:merge default diff --git a/pypy/interpreter/astcompiler/test/test_ast.py b/pypy/interpreter/astcompiler/test/test_ast.py --- a/pypy/inter

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84567:e5c6a87e1f71 Date: 2016-05-21 18:12 -0700 http://bitbucket.org/pypy/pypy/changeset/e5c6a87e1f71/ Log:merge default diff --git a/pypy/module/__builtin__/__init__.py b/pypy/module/__builtin__/__init__.py --- a/pypy/module/__builtin__/__init

[pypy-commit] pypy py3k: Merge from upstream.

Author: Mark Young Branch: py3k Changeset: r84464:71dbedca9ddf Date: 2016-05-14 23:16 -0400 http://bitbucket.org/pypy/pypy/changeset/71dbedca9ddf/ Log:Merge from upstream. diff too long, truncating to 2000 out of 8017 lines diff --git a/dotviewer/graphserver.py b/dotviewer/graphserver.py --

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84433:aa1a6a3e01e0 Date: 2016-05-14 11:19 -0700 http://bitbucket.org/pypy/pypy/changeset/aa1a6a3e01e0/ Log:merge default diff --git a/lib-python/2.7/test/test_sys_settrace.py b/lib-python/2.7/test/test_sys_settrace.py --- a/lib-python/2.7/test/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84412:1ba51b01cb26 Date: 2016-05-12 21:51 -0700 http://bitbucket.org/pypy/pypy/changeset/1ba51b01cb26/ Log:merge default diff --git a/rpython/memory/gc/env.py b/rpython/memory/gc/env.py --- a/rpython/memory/gc/env.py +++ b/rpython/memory/gc/env.

[pypy-commit] pypy py3k: merge

Author: Philip Jenvey Branch: py3k Changeset: r84282:77404fa13979 Date: 2016-05-07 15:01 -0700 http://bitbucket.org/pypy/pypy/changeset/77404fa13979/ Log:merge diff --git a/pypy/module/_codecs/interp_codecs.py b/pypy/module/_codecs/interp_codecs.py --- a/pypy/module/_codecs/interp_codecs.py

[pypy-commit] pypy py3k: merge default (oefmt pypy/module/!(_*))

Author: Philip Jenvey Branch: py3k Changeset: r84161:5067460e27d9 Date: 2016-05-02 18:12 -0700 http://bitbucket.org/pypy/pypy/changeset/5067460e27d9/ Log:merge default (oefmt pypy/module/!(_*)) diff too long, truncating to 2000 out of 3288 lines diff --git a/pypy/doc/coding-guide.rst b/pypy

[pypy-commit] pypy py3k: merge default (oefmt pypy/module/_*)

Author: Philip Jenvey Branch: py3k Changeset: r84158:72ab4cdc6bd2 Date: 2016-05-02 17:47 -0700 http://bitbucket.org/pypy/pypy/changeset/72ab4cdc6bd2/ Log:merge default (oefmt pypy/module/_*) diff too long, truncating to 2000 out of 2441 lines diff --git a/pypy/module/__builtin__/compiling.p

[pypy-commit] pypy py3k: merge default (oefmt pypy/{objspace, tool}/)

Author: Philip Jenvey Branch: py3k Changeset: r84156:35dcdbf2fb5d Date: 2016-05-02 17:27 -0700 http://bitbucket.org/pypy/pypy/changeset/35dcdbf2fb5d/ Log:merge default (oefmt pypy/{objspace,tool}/) diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py --- a/pypy/objs

[pypy-commit] pypy py3k: merge default (oefmt pypy/interpreter/)

Author: Philip Jenvey Branch: py3k Changeset: r84154:a4878080a536 Date: 2016-05-02 17:18 -0700 http://bitbucket.org/pypy/pypy/changeset/a4878080a536/ Log:merge default (oefmt pypy/interpreter/) diff --git a/pypy/doc/index-of-release-notes.rst b/pypy/doc/index-of-release-notes.rst --- a/pypy

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r84114:796445937161 Date: 2016-05-01 21:43 -0700 http://bitbucket.org/pypy/pypy/changeset/796445937161/ Log:merge default diff --git a/pypy/module/cppyy/interp_cppyy.py b/pypy/module/cppyy/interp_cppyy.py --- a/pypy/module/cppyy/interp_cppyy.py

[pypy-commit] pypy py3k: Merge branch 'py3k-update'

Author: Ronan Lamy Branch: py3k Changeset: r84111:5947b91767eb Date: 2016-05-01 23:47 +0100 http://bitbucket.org/pypy/pypy/changeset/5947b91767eb/ Log:Merge branch 'py3k-update' diff too long, truncating to 2000 out of 19510 lines diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r83725:df440f20d566 Date: 2016-04-17 17:51 -0700 http://bitbucket.org/pypy/pypy/changeset/df440f20d566/ Log:merge default diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -111,23 +111,24 @@ Simon Burton Martin Matusiak Konst

[pypy-commit] pypy py3k: merge kunalgrover05/pypy/py3.3-hashfix (pull request #402)

Author: Philip Jenvey Branch: py3k Changeset: r83701:32e47f04869f Date: 2016-04-15 18:52 -0700 http://bitbucket.org/pypy/pypy/changeset/32e47f04869f/ Log:merge kunalgrover05/pypy/py3.3-hashfix (pull request #402) use intobject hash function for specialisedtuple diff --git a/pypy/obj

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r83695:3bc87fc47479 Date: 2016-04-15 16:10 -0700 http://bitbucket.org/pypy/pypy/changeset/3bc87fc47479/ Log:merge default diff --git a/pypy/module/_cffi_backend/__init__.py b/pypy/module/_cffi_backend/__init__.py --- a/pypy/module/_cffi_backend/

[pypy-commit] pypy py3k: Merge branch 'follow_symlinks'

Author: Ronan Lamy Branch: py3k Changeset: r83543:3fcb678f1119 Date: 2016-04-06 16:42 +0100 http://bitbucket.org/pypy/pypy/changeset/3fcb678f1119/ Log:Merge branch 'follow_symlinks' Update implementation of many posix functions to support functionalities added in 3.3. diff -

[pypy-commit] pypy py3k: Merge with upstream

Author: Marius Gedminas Branch: py3k Changeset: r77997:404f7178d54f Date: 2015-06-09 19:45 +0300 http://bitbucket.org/pypy/pypy/changeset/404f7178d54f/ Log:Merge with upstream diff too long, truncating to 2000 out of 61469 lines diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r75216:b85a8b82049d Date: 2015-01-02 18:14 -0800 http://bitbucket.org/pypy/pypy/changeset/b85a8b82049d/ Log:merge default diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py --- a/rpython/translator/c/genc.py +++ b/rpython/tr

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r75210:ace68169b31e Date: 2015-01-02 12:39 -0800 http://bitbucket.org/pypy/pypy/changeset/ace68169b31e/ Log:merge default diff too long, truncating to 2000 out of 15159 lines diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -28,7 +2

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74769:f682ccbce64f Date: 2014-11-30 14:12 -0800 http://bitbucket.org/pypy/pypy/changeset/f682ccbce64f/ Log:merge default diff too long, truncating to 2000 out of 3147 lines diff --git a/pypy/module/_cffi_backend/ctypeprim.py b/pypy/module/_cff

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74767:e01964ac6c50 Date: 2014-11-30 11:51 -0800 http://bitbucket.org/pypy/pypy/changeset/e01964ac6c50/ Log:merge default diff too long, truncating to 2000 out of 3374 lines diff --git a/lib-python/2.7/subprocess.py b/lib-python/2.7/subprocess.p

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74549:9a1ca4c16f23 Date: 2014-11-17 10:05 -0800 http://bitbucket.org/pypy/pypy/changeset/9a1ca4c16f23/ Log:merge default diff too long, truncating to 2000 out of 7347 lines diff --git a/lib-python/conftest.py b/lib-python/conftest.py --- a/lib-

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74357:03d54c00a4a8 Date: 2014-11-06 12:11 -0800 http://bitbucket.org/pypy/pypy/changeset/03d54c00a4a8/ Log:merge default diff --git a/README.rst b/README.rst --- a/README.rst +++ b/README.rst @@ -37,4 +37,4 @@ to use virtualenv with the resulti

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74316:2f8363781b3f Date: 2014-10-31 11:30 -0700 http://bitbucket.org/pypy/pypy/changeset/2f8363781b3f/ Log:merge default diff --git a/pypy/objspace/std/formatting.py b/pypy/objspace/std/formatting.py --- a/pypy/objspace/std/formatting.py +++ b/p

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74309:4ca3a10894aa Date: 2014-10-30 15:13 -0700 http://bitbucket.org/pypy/pypy/changeset/4ca3a10894aa/ Log:merge default diff --git a/rpython/jit/backend/llsupport/rewrite.py b/rpython/jit/backend/llsupport/rewrite.py --- a/rpython/jit/backend/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74306:72fb7148be52 Date: 2014-10-30 12:21 -0700 http://bitbucket.org/pypy/pypy/changeset/72fb7148be52/ Log:merge default diff --git a/pypy/module/array/interp_array.py b/pypy/module/array/interp_array.py --- a/pypy/module/array/interp_array.py

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74293:6fa0200792f7 Date: 2014-10-29 17:47 -0700 http://bitbucket.org/pypy/pypy/changeset/6fa0200792f7/ Log:merge default diff too long, truncating to 2000 out of 3708 lines diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py ---

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74267:a245775c1e36 Date: 2014-10-28 10:33 -0700 http://bitbucket.org/pypy/pypy/changeset/a245775c1e36/ Log:merge default diff --git a/pypy/module/select/test/test_select.py b/pypy/module/select/test/test_select.py --- a/pypy/module/select/test/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74242:f70579d34dff Date: 2014-10-26 04:45 -0700 http://bitbucket.org/pypy/pypy/changeset/f70579d34dff/ Log:merge default diff --git a/pypy/module/operator/tscmp.c b/pypy/module/operator/tscmp.c --- a/pypy/module/operator/tscmp.c +++ b/pypy/modul

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74239:8d5158ea78d5 Date: 2014-10-25 12:31 -0700 http://bitbucket.org/pypy/pypy/changeset/8d5158ea78d5/ Log:merge default diff --git a/pypy/config/test/test_pypyoption.py b/pypy/config/test/test_pypyoption.py --- a/pypy/config/test/test_pypyopti

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74197:134020dca51a Date: 2014-10-24 16:10 -0700 http://bitbucket.org/pypy/pypy/changeset/134020dca51a/ Log:merge default diff too long, truncating to 2000 out of 29307 lines diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74145:ba8251a5c237 Date: 2014-10-23 16:26 -0700 http://bitbucket.org/pypy/pypy/changeset/ba8251a5c237/ Log:merge default diff too long, truncating to 2000 out of 5202 lines diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --

[pypy-commit] pypy py3k: merge upstream

Author: Philip Jenvey Branch: py3k Changeset: r74152:a87e6542c186 Date: 2014-10-24 00:29 -0700 http://bitbucket.org/pypy/pypy/changeset/a87e6542c186/ Log:merge upstream diff --git a/pypy/module/posix/interp_nt.py b/pypy/module/posix/interp_nt.py --- a/pypy/module/posix/interp_nt.py +++ b/pyp

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r74007:dfd4a9093328 Date: 2014-10-17 15:45 -0700 http://bitbucket.org/pypy/pypy/changeset/dfd4a9093328/ Log:merge default diff too long, truncating to 2000 out of 3968 lines diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst --

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73936:d971d572758b Date: 2014-10-13 16:23 -0700 http://bitbucket.org/pypy/pypy/changeset/d971d572758b/ Log:merge default diff too long, truncating to 2000 out of 13891 lines diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -3,8 +3,

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73603:45600f667251 Date: 2014-09-17 17:30 -0700 http://bitbucket.org/pypy/pypy/changeset/45600f667251/ Log:merge default diff --git a/pypy/interpreter/pyparser/parsestring.py b/pypy/interpreter/pyparser/parsestring.py --- a/pypy/interpreter/pyp

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73529:201aee996695 Date: 2014-09-13 18:26 -0700 http://bitbucket.org/pypy/pypy/changeset/201aee996695/ Log:merge default diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst --- a/pypy/doc/windows.rst +++ b/pypy/doc/windows.rst @@ -85,10 +85

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73492:8fbe4a728f3e Date: 2014-09-11 15:57 -0700 http://bitbucket.org/pypy/pypy/changeset/8fbe4a728f3e/ Log:merge default diff --git a/pypy/module/_ssl/interp_ssl.py b/pypy/module/_ssl/interp_ssl.py --- a/pypy/module/_ssl/interp_ssl.py +++ b/pypy

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73481:1568c757e7cb Date: 2014-09-11 13:47 -0700 http://bitbucket.org/pypy/pypy/changeset/1568c757e7cb/ Log:merge default diff too long, truncating to 2000 out of 6687 lines diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -35,280 +

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73127:986e16e0e1fc Date: 2014-08-28 15:47 -0700 http://bitbucket.org/pypy/pypy/changeset/986e16e0e1fc/ Log:merge default diff too long, truncating to 2000 out of 34965 lines diff --git a/lib-python/2.7/CGIHTTPServer.py b/lib-python/2.7/CGIHTTPS

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r73071:e15d0862520d Date: 2014-08-26 10:57 -0700 http://bitbucket.org/pypy/pypy/changeset/e15d0862520d/ Log:merge default diff --git a/rpython/jit/backend/x86/callbuilder.py b/rpython/jit/backend/x86/callbuilder.py --- a/rpython/jit/backend/x86/

[pypy-commit] pypy py3k: merge default (bf3e8fa831fd)

Author: Philip Jenvey Branch: py3k Changeset: r73066:9310ca287cdd Date: 2014-08-24 15:54 -0700 http://bitbucket.org/pypy/pypy/changeset/9310ca287cdd/ Log:merge default (bf3e8fa831fd) diff too long, truncating to 2000 out of 5869 lines diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICEN

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72821:57f83c7b11fc Date: 2014-08-15 17:58 -0700 http://bitbucket.org/pypy/pypy/changeset/57f83c7b11fc/ Log:merge default diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst --- a/pypy/doc/faq.rst +++ b/pypy/doc/faq.rst @@ -147,12 +147,25 @@ progra

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72781:92b4b658ae4b Date: 2014-08-12 16:43 -0700 http://bitbucket.org/pypy/pypy/changeset/92b4b658ae4b/ Log:merge default diff --git a/lib_pypy/_tkinter/__init__.py b/lib_pypy/_tkinter/__init__.py --- a/lib_pypy/_tkinter/__init__.py +++ b/lib_pyp

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72756:87910b468690 Date: 2014-08-11 17:12 -0700 http://bitbucket.org/pypy/pypy/changeset/87910b468690/ Log:merge default diff too long, truncating to 2000 out of 10648 lines diff --git a/_pytest/__init__.py b/_pytest/__init__.py --- a/_pytest/_

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72757:2ccf30804e12 Date: 2014-08-11 17:13 -0700 http://bitbucket.org/pypy/pypy/changeset/2ccf30804e12/ Log:merge default diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py --- a/pypy/tool/release/package.py +++ b/pypy/tool/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72671:8afd884adfe3 Date: 2014-08-03 10:49 -0700 http://bitbucket.org/pypy/pypy/changeset/8afd884adfe3/ Log:merge default diff --git a/pypy/module/__builtin__/app_inspect.py b/pypy/module/__builtin__/app_inspect.py --- a/pypy/module/__builtin__/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72652:20b6589f4314 Date: 2014-08-01 18:05 -0700 http://bitbucket.org/pypy/pypy/changeset/20b6589f4314/ Log:merge default diff --git a/pypy/module/__builtin__/app_inspect.py b/pypy/module/__builtin__/app_inspect.py --- a/pypy/module/__builtin__/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72637:33d48832dcfd Date: 2014-08-01 15:21 -0700 http://bitbucket.org/pypy/pypy/changeset/33d48832dcfd/ Log:merge default diff --git a/pypy/doc/coding-guide.rst b/pypy/doc/coding-guide.rst --- a/pypy/doc/coding-guide.rst +++ b/pypy/doc/coding-gui

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72586:02100350c9f0 Date: 2014-07-27 16:49 -0700 http://bitbucket.org/pypy/pypy/changeset/02100350c9f0/ Log:merge default diff --git a/lib_pypy/_curses.py b/lib_pypy/_curses.py --- a/lib_pypy/_curses.py +++ b/lib_pypy/_curses.py @@ -309,11 +309,9

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72475:8064c75eb975 Date: 2014-07-19 11:35 -0700 http://bitbucket.org/pypy/pypy/changeset/8064c75eb975/ Log:merge default diff --git a/pypy/interpreter/test/test_generator.py b/pypy/interpreter/test/test_generator.py --- a/pypy/interpreter/test/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72461:cd0604d4ee65 Date: 2014-07-16 14:05 -0700 http://bitbucket.org/pypy/pypy/changeset/cd0604d4ee65/ Log:merge default diff --git a/lib-python/2.7/xml/sax/saxutils.py b/lib-python/2.7/xml/sax/saxutils.py --- a/lib-python/2.7/xml/sax/saxutils.

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r72451:6934ff2f69be Date: 2014-07-15 22:57 -0700 http://bitbucket.org/pypy/pypy/changeset/6934ff2f69be/ Log:merge default diff --git a/pypy/module/micronumpy/boxes.py b/pypy/module/micronumpy/boxes.py --- a/pypy/module/micronumpy/boxes.py +++ b/p

[pypy-commit] pypy py3k: merge upstream

Author: Philip Jenvey Branch: py3k Changeset: r72428:bf8917ab2b8a Date: 2014-07-12 14:48 -0700 http://bitbucket.org/pypy/pypy/changeset/bf8917ab2b8a/ Log:merge upstream diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py --- a/pypy/goal/targetpypystandalone.py

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r71355:f7d70d54b9d9 Date: 2014-05-06 16:58 -0700 http://bitbucket.org/pypy/pypy/changeset/f7d70d54b9d9/ Log:merge default diff --git a/lib_pypy/_pypy_interact.py b/lib_pypy/_pypy_interact.py --- a/lib_pypy/_pypy_interact.py +++ b/lib_pypy/_pypy_i

[pypy-commit] pypy py3k: merge default

Author: Brian Kearns Branch: py3k Changeset: r71312:9401f74194b9 Date: 2014-05-05 22:43 -0400 http://bitbucket.org/pypy/pypy/changeset/9401f74194b9/ Log:merge default diff --git a/pypy/module/_cffi_backend/cdataobj.py b/pypy/module/_cffi_backend/cdataobj.py --- a/pypy/module/_cffi_backend/c

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r71299:d8096ef0c138 Date: 2014-05-05 18:38 -0700 http://bitbucket.org/pypy/pypy/changeset/d8096ef0c138/ Log:merge default diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst --- a/pypy/doc/release-2.3.0.rst +++ b/pypy/doc/release

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r71300:9c2e85c01eb9 Date: 2014-05-05 18:43 -0700 http://bitbucket.org/pypy/pypy/changeset/9c2e85c01eb9/ Log:merge default diff --git a/pypy/module/_cffi_backend/cdataobj.py b/pypy/module/_cffi_backend/cdataobj.py --- a/pypy/module/_cffi_backend/

[pypy-commit] pypy py3k: merge upstream

Author: Philip Jenvey Branch: py3k Changeset: r71283:01e1b2dbf81e Date: 2014-05-05 12:07 -0700 http://bitbucket.org/pypy/pypy/changeset/01e1b2dbf81e/ Log:merge upstream diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py +++

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r71241:2f47b24c4692 Date: 2014-05-02 11:37 -0700 http://bitbucket.org/pypy/pypy/changeset/2f47b24c4692/ Log:merge default diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst --- a/pypy/doc/release-2.3.0.rst +++ b/pypy/doc/release

[pypy-commit] pypy py3k: merge upstream

Author: Philip Jenvey Branch: py3k Changeset: r71081:e43a6cc83813 Date: 2014-04-29 16:10 -0700 http://bitbucket.org/pypy/pypy/changeset/e43a6cc83813/ Log:merge upstream diff --git a/lib_pypy/_testcapi.py b/lib_pypy/_testcapi.py --- a/lib_pypy/_testcapi.py +++ b/lib_pypy/_testcapi.py @@ -1,4

[pypy-commit] pypy py3k: merge py3k-fix-strategies: re-enables the disabled strategies (issue1471)

Author: Philip Jenvey Branch: py3k Changeset: r70984:092f39d9ab1c Date: 2014-04-25 14:17 -0700 http://bitbucket.org/pypy/pypy/changeset/092f39d9ab1c/ Log:merge py3k-fix-strategies: re-enables the disabled strategies (issue1471) diff --git a/lib_pypy/_testcapi.py b/lib_pypy/_testcapi.

[pypy-commit] pypy py3k: merge default (ea86924e88fb)

Author: Philip Jenvey Branch: py3k Changeset: r70952:e0ce5503a026 Date: 2014-04-24 16:58 -0700 http://bitbucket.org/pypy/pypy/changeset/e0ce5503a026/ Log:merge default (ea86924e88fb) diff --git a/lib-python/2.7/test/test_itertools.py b/lib-python/2.7/test/test_itertools.py --- a/lib-python/

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r70734:f10a4d4b1837 Date: 2014-04-17 16:53 -0700 http://bitbucket.org/pypy/pypy/changeset/f10a4d4b1837/ Log:merge default diff --git a/pypy/objspace/std/test/test_celldict.py b/pypy/objspace/std/test/test_celldict.py --- a/pypy/objspace/std/test

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r70597:fe69dee13c0f Date: 2014-04-11 17:10 -0700 http://bitbucket.org/pypy/pypy/changeset/fe69dee13c0f/ Log:merge default diff --git a/pypy/doc/_ref.txt b/pypy/doc/_ref.txt --- a/pypy/doc/_ref.txt +++ b/pypy/doc/_ref.txt @@ -1,3 +1,6 @@ +.. This

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r70541:ec295dbad48a Date: 2014-04-10 11:35 -0700 http://bitbucket.org/pypy/pypy/changeset/ec295dbad48a/ Log:merge default diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py --- a/pypy/config/pypyoption.py +++ b/pypy/config/pypyopt

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r70519:7eafa2968379 Date: 2014-04-09 11:58 -0700 http://bitbucket.org/pypy/pypy/changeset/7eafa2968379/ Log:merge default diff --git a/pypy/module/posix/test/test_posix2.py b/pypy/module/posix/test/test_posix2.py --- a/pypy/module/posix/test/tes

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r70502:b7063430977e Date: 2014-04-09 11:32 -0700 http://bitbucket.org/pypy/pypy/changeset/b7063430977e/ Log:merge default diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst --- a/pypy/doc/faq.rst +++ b/pypy/doc/faq.rst @@ -459,6 +459,19 @@ .. _`

[pypy-commit] pypy py3k: merge default

Author: Philip Jenvey Branch: py3k Changeset: r70403:10edbabbaae9 Date: 2014-04-02 11:22 -0700 http://bitbucket.org/pypy/pypy/changeset/10edbabbaae9/ Log:merge default diff --git a/lib-python/2.7/test/test_argparse.py b/lib-python/2.7/test/test_argparse.py --- a/lib-python/2.7/test/test_arg

  1   2   3   >