Author: Armin Rigo
Branch: py3k
Changeset: r87625:7ff655490876
Date: 2016-10-08 12:27 +0200
http://bitbucket.org/pypy/pypy/changeset/7ff655490876/
Log:hg merge default
diff --git a/pypy/module/faulthandler/dumper.py
b/pypy/module/faulthandler/dumper.py
--- a/pypy/module/faulthandler/dumper.
Author: Ronan Lamy
Branch: py3k
Changeset: r87614:b9150b667bb5
Date: 2016-10-06 16:45 +0100
http://bitbucket.org/pypy/pypy/changeset/b9150b667bb5/
Log:hg merge default
diff --git a/pypy/module/cpyext/test/test_bytesobject.py
b/pypy/module/cpyext/test/test_bytesobject.py
--- a/pypy/module/cp
Author: Ronan Lamy
Branch: py3k
Changeset: r87601:943171b0ad54
Date: 2016-10-05 18:38 +0100
http://bitbucket.org/pypy/pypy/changeset/943171b0ad54/
Log:hg merge default
diff --git a/lib-python/2.7/test/test_timeit.py
b/lib-python/2.7/test/test_timeit.py
--- a/lib-python/2.7/test/test_timeit.
Author: Ronan Lamy
Branch: py3k
Changeset: r87558:41c743345092
Date: 2016-10-03 20:24 +0100
http://bitbucket.org/pypy/pypy/changeset/41c743345092/
Log:hg merge default
diff --git a/rpython/jit/backend/x86/runner.py
b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
Author: Manuel Jacob
Branch: py3k
Changeset: r87537:6d29b5118ea6
Date: 2016-10-03 05:54 +0200
http://bitbucket.org/pypy/pypy/changeset/6d29b5118ea6/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whats
Author: Armin Rigo
Branch: py3k
Changeset: r87498:aaa04894afde
Date: 2016-10-01 12:22 +0200
http://bitbucket.org/pypy/pypy/changeset/aaa04894afde/
Log:hg merge default
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mail
Author: Armin Rigo
Branch: py3k
Changeset: r87488:160c8ded58c9
Date: 2016-10-01 10:46 +0200
http://bitbucket.org/pypy/pypy/changeset/160c8ded58c9/
Log:hg merge default
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++
Author: Armin Rigo
Branch: py3k
Changeset: r87485:863ec7aea4f4
Date: 2016-10-01 10:37 +0200
http://bitbucket.org/pypy/pypy/changeset/863ec7aea4f4/
Log:hg merge default
diff --git a/pypy/module/__pypy__/__init__.py b/pypy/module/__pypy__/__init__.py
--- a/pypy/module/__pypy__/__init__.py
+++
Author: Ronan Lamy
Branch: py3k
Changeset: r87480:76f2e04a21be
Date: 2016-09-30 19:30 +0100
http://bitbucket.org/pypy/pypy/changeset/76f2e04a21be/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsne
Author: Ronan Lamy
Branch: py3k
Changeset: r87450:db0da9ef9eca
Date: 2016-09-29 17:46 +0100
http://bitbucket.org/pypy/pypy/changeset/db0da9ef9eca/
Log:hg merge default
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -40,4 +40,4 @@
# http://lists.gnu.org/archive/html/help-m
Author: Armin Rigo
Branch: py3k
Changeset: r87314:03f142546f64
Date: 2016-09-22 12:07 +0200
http://bitbucket.org/pypy/pypy/changeset/03f142546f64/
Log:hg merge default
diff --git a/rpython/jit/backend/test/zll_stress.py
b/rpython/jit/backend/test/zll_stress.py
--- a/rpython/jit/backend/test
Author: Armin Rigo
Branch: py3k
Changeset: r87293:f854ee56f616
Date: 2016-09-21 22:33 +0200
http://bitbucket.org/pypy/pypy/changeset/f854ee56f616/
Log:hg merge default
diff --git a/rpython/doc/jit/backend.rst b/rpython/doc/jit/backend.rst
new file mode 100644
--- /dev/null
+++ b/rpython/doc/
Author: Armin Rigo
Branch: py3k
Changeset: r87276:ec5c171f3870
Date: 2016-09-21 17:10 +0200
http://bitbucket.org/pypy/pypy/changeset/ec5c171f3870/
Log:hg merge default
diff --git a/pypy/module/_cffi_backend/test/test_ffi_obj.py
b/pypy/module/_cffi_backend/test/test_ffi_obj.py
--- a/pypy/mod
Author: Armin Rigo
Branch: py3k
Changeset: r87266:c7615cd6e615
Date: 2016-09-21 14:21 +0200
http://bitbucket.org/pypy/pypy/changeset/c7615cd6e615/
Log:hg 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
Author: Armin Rigo
Branch: py3k
Changeset: r87265:5d068bf3a13d
Date: 2016-09-21 14:20 +0200
http://bitbucket.org/pypy/pypy/changeset/5d068bf3a13d/
Log:hg merge default
diff too long, truncating to 2000 out of 2019 lines
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py
b/lib-python/2
Author: Armin Rigo
Branch: py3k
Changeset: r87085:a65846c5dec3
Date: 2016-09-13 19:06 +0200
http://bitbucket.org/pypy/pypy/changeset/a65846c5dec3/
Log:hg merge default
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/meta
Author: Armin Rigo
Branch: py3k
Changeset: r87062:5f216ce9b438
Date: 2016-09-13 10:31 +0200
http://bitbucket.org/pypy/pypy/changeset/5f216ce9b438/
Log:hg merge default
diff --git a/pypy/module/cpyext/memoryobject.py
b/pypy/module/cpyext/memoryobject.py
--- a/pypy/module/cpyext/memoryobject.
Author: Armin Rigo
Branch: py3k
Changeset: r87046:81579d630803
Date: 2016-09-12 16:49 +0200
http://bitbucket.org/pypy/pypy/changeset/81579d630803/
Log:hg merge default
diff --git a/pypy/module/cpyext/sequence.py b/pypy/module/cpyext/sequence.py
--- a/pypy/module/cpyext/sequence.py
+++ b/pypy
Author: Ronan Lamy
Branch: py3k
Changeset: r87007:fbcb88bba801
Date: 2016-09-11 20:26 +0100
http://bitbucket.org/pypy/pypy/changeset/fbcb88bba801/
Log:hg merge default
diff --git a/pypy/doc/release-pypy2.7-v5.4.1.rst
b/pypy/doc/release-pypy2.7-v5.4.1.rst
--- a/pypy/doc/release-pypy2.7-v5.4.
Author: Ronan Lamy
Branch: py3k
Changeset: r86916:37c0e5dcf737
Date: 2016-09-07 05:15 +0100
http://bitbucket.org/pypy/pypy/changeset/37c0e5dcf737/
Log:hg merge default
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -30,3 +30,6 @@
68bb3510d8212ae9efb687e12e58c09d29e74f87 relea
Author: Armin Rigo
Branch: py3k
Changeset: r86794:adcb5fc61bbe
Date: 2016-08-31 22:57 +0200
http://bitbucket.org/pypy/pypy/changeset/adcb5fc61bbe/
Log:hg merge default
diff --git a/rpython/rlib/rsre/rsre_core.py b/rpython/rlib/rsre/rsre_core.py
--- a/rpython/rlib/rsre/rsre_core.py
+++ b/rpyt
Author: Armin Rigo
Branch: py3k
Changeset: r86766:c080e77ee085
Date: 2016-08-31 10:40 +0200
http://bitbucket.org/pypy/pypy/changeset/c080e77ee085/
Log:hg merge default
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py
b/lib-python/2.7/distutils/sysconfig_pypy.py
--- a/lib-python/2.7/d
Author: Ronan Lamy
Branch: py3k
Changeset: r86750:2498fb9ffc58
Date: 2016-08-30 19:01 +0100
http://bitbucket.org/pypy/pypy/changeset/2498fb9ffc58/
Log:hg merge default
diff --git a/pypy/module/__builtin__/descriptor.py
b/pypy/module/__builtin__/descriptor.py
--- a/pypy/module/__builtin__/de
Author: Armin Rigo
Branch: py3k
Changeset: r86714:04cb05574b89
Date: 2016-08-29 21:20 +0200
http://bitbucket.org/pypy/pypy/changeset/04cb05574b89/
Log:hg merge default
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -6
Author: Armin Rigo
Branch: py3k
Changeset: r86710:5e30f5104630
Date: 2016-08-29 21:02 +0200
http://bitbucket.org/pypy/pypy/changeset/5e30f5104630/
Log:hg merge default
with suitable refactorings of 990f5b2322e1 for py3k
diff --git a/lib_pypy/_ctypes/function.py b/lib_pypy/_ctypes/fu
Author: Armin Rigo
Branch: py3k
Changeset: r86697:57ccc10e7bfc
Date: 2016-08-29 16:13 +0200
http://bitbucket.org/pypy/pypy/changeset/57ccc10e7bfc/
Log:hg merge default
diff --git a/rpython/rlib/rsre/rsre_char.py b/rpython/rlib/rsre/rsre_char.py
--- a/rpython/rlib/rsre/rsre_char.py
+++ b/rpyt
Author: Armin Rigo
Branch: py3k
Changeset: r86693:478944df2b79
Date: 2016-08-29 14:36 +0200
http://bitbucket.org/pypy/pypy/changeset/478944df2b79/
Log:hg merge default
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,5 @@
c09c19272c990a0611b17569a0085ad1ab00c8ff relea
Author: Ronan Lamy
Branch: py3k
Changeset: r86665:feaeb98a9faa
Date: 2016-08-28 22:57 +0100
http://bitbucket.org/pypy/pypy/changeset/feaeb98a9faa/
Log:hg merge default
diff --git a/pypy/module/_sre/__init__.py b/pypy/module/_sre/__init__.py
--- a/pypy/module/_sre/__init__.py
+++ b/pypy/modul
Author: Armin Rigo
Branch: py3k
Changeset: r86656:b1f759cbec09
Date: 2016-08-28 21:58 +0200
http://bitbucket.org/pypy/pypy/changeset/b1f759cbec09/
Log:hg merge default
(in particular, 9332dfa6e22e does not apply any more)
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@
Author: Armin Rigo
Branch: py3k
Changeset: r86625:0d0c1fea2c5b
Date: 2016-08-27 22:13 +0200
http://bitbucket.org/pypy/pypy/changeset/0d0c1fea2c5b/
Log:hg merge default
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/
Author: Armin Rigo
Branch: py3k
Changeset: r86612:782495d7d9eb
Date: 2016-08-27 19:15 +0200
http://bitbucket.org/pypy/pypy/changeset/782495d7d9eb/
Log:hg merge default
diff --git a/pypy/module/marshal/interp_marshal.py
b/pypy/module/marshal/interp_marshal.py
--- a/pypy/module/marshal/interp
Author: Armin Rigo
Branch: py3k
Changeset: r86605:471b3d7456a2
Date: 2016-08-27 16:49 +0200
http://bitbucket.org/pypy/pypy/changeset/471b3d7456a2/
Log:hg merge default
diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py
--- a/pypy/doc/conf.py
+++ b/pypy/doc/conf.py
@@ -58,16 +58,16 @@
# Gene
Author: Ronan Lamy
Branch: py3k
Changeset: r86453:36d4233f4e5c
Date: 2016-08-23 16:46 +0100
http://bitbucket.org/pypy/pypy/changeset/36d4233f4e5c/
Log:hg merge default
diff --git a/pypy/module/pypyjit/test_pypy_c/test_ffi.py
b/pypy/module/pypyjit/test_pypy_c/test_ffi.py
--- a/pypy/module/py
Author: Armin Rigo
Branch: py3k
Changeset: r86429:e9ed73a4cb14
Date: 2016-08-23 00:40 +0200
http://bitbucket.org/pypy/pypy/changeset/e9ed73a4cb14/
Log:hg merge default
diff --git a/rpython/jit/backend/llgraph/runner.py
b/rpython/jit/backend/llgraph/runner.py
--- a/rpython/jit/backend/llgrap
Author: Armin Rigo
Branch: py3k
Changeset: r86427:7b46c6327f13
Date: 2016-08-22 22:05 +0200
http://bitbucket.org/pypy/pypy/changeset/7b46c6327f13/
Log:hg merge default
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi
Author: Armin Rigo
Branch: py3k
Changeset: r86394:fb2a0382b7eb
Date: 2016-08-22 10:11 +0200
http://bitbucket.org/pypy/pypy/changeset/fb2a0382b7eb/
Log:hg merge default
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -6
Author: Armin Rigo
Branch: py3k
Changeset: r86382:6f96b85e2f64
Date: 2016-08-21 21:11 +0200
http://bitbucket.org/pypy/pypy/changeset/6f96b85e2f64/
Log:hg merge default
diff --git a/pypy/module/posix/interp_posix.py
b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
Author: Armin Rigo
Branch: py3k
Changeset: r86375:52ba32002a16
Date: 2016-08-21 18:59 +0200
http://bitbucket.org/pypy/pypy/changeset/52ba32002a16/
Log:hg merge default
diff --git a/pypy/module/_cffi_backend/test/test_re_python.py
b/pypy/module/_cffi_backend/test/test_re_python.py
--- a/pypy
Author: Ronan Lamy
Branch: py3k
Changeset: r86298:71a1d16e20d5
Date: 2016-08-18 23:39 +0100
http://bitbucket.org/pypy/pypy/changeset/71a1d16e20d5/
Log:hg merge default
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/
Author: Armin Rigo
Branch: py3k
Changeset: r86293:b34a037a6866
Date: 2016-08-18 22:12 +0200
http://bitbucket.org/pypy/pypy/changeset/b34a037a6866/
Log:hg merge default
diff --git a/pypy/interpreter/astcompiler/assemble.py
b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/ast
Author: Ronan Lamy
Branch: py3k
Changeset: r86278:69541f67e745
Date: 2016-08-18 15:56 +0100
http://bitbucket.org/pypy/pypy/changeset/69541f67e745/
Log:hg merge default
diff --git a/lib_pypy/resource.py b/lib_pypy/resource.py
--- a/lib_pypy/resource.py
+++ b/lib_pypy/resource.py
@@ -86,7 +86,
Author: Ronan Lamy
Branch: py3k
Changeset: r86200:f2a780e47063
Date: 2016-08-15 16:43 +0100
http://bitbucket.org/pypy/pypy/changeset/f2a780e47063/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsne
Author: Ronan Lamy
Branch: py3k
Changeset: r86144:b053ff5c2d6d
Date: 2016-08-11 16:19 +0100
http://bitbucket.org/pypy/pypy/changeset/b053ff5c2d6d/
Log:hg merge default
diff too long, truncating to 2000 out of 4035 lines
diff --git a/include/PyPy.h b/include/PyPy.h
--- a/include/PyPy.h
+++ b
Author: Ronan Lamy
Branch: py3k
Changeset: r85926:1df40eed7b9c
Date: 2016-07-30 14:17 +0100
http://bitbucket.org/pypy/pypy/changeset/1df40eed7b9c/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsne
Author: Ronan Lamy
Branch: py3k
Changeset: r85884:2f965b88873d
Date: 2016-07-27 22:01 +0100
http://bitbucket.org/pypy/pypy/changeset/2f965b88873d/
Log:hg merge default
diff too long, truncating to 2000 out of 5937 lines
diff --git a/lib-python/2.7/test/test_hash.py b/lib-python/2.7/test/tes
Author: Ronan Lamy
Branch: py3k
Changeset: r85869:bb148d9bb7e9
Date: 2016-07-26 20:40 +0100
http://bitbucket.org/pypy/pypy/changeset/bb148d9bb7e9/
Log:hg merge default
diff --git a/dotviewer/graphparse.py b/dotviewer/graphparse.py
--- a/dotviewer/graphparse.py
+++ b/dotviewer/graphparse.py
@
Author: Ronan Lamy
Branch: py3k
Changeset: r85461:e0d9ed6c5aff
Date: 2016-06-29 20:56 +0100
http://bitbucket.org/pypy/pypy/changeset/e0d9ed6c5aff/
Log:hg merge default
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mail
Author: Ronan Lamy
Branch: py3k
Changeset: r85450:62e370af096e
Date: 2016-06-29 16:00 +0100
http://bitbucket.org/pypy/pypy/changeset/62e370af096e/
Log:hg merge default
diff --git a/pypy/interpreter/astcompiler/tools/asdl_py.py
b/pypy/interpreter/astcompiler/tools/asdl_py.py
--- a/pypy/inter
Author: Ronan Lamy
Branch: py3k
Changeset: r85411:111ead0c2445
Date: 2016-06-27 18:37 +0100
http://bitbucket.org/pypy/pypy/changeset/111ead0c2445/
Log:hg merge default
diff --git a/pypy/doc/config/commandline.txt b/pypy/doc/config/commandline.txt
--- a/pypy/doc/config/commandline.txt
+++ b/p
Author: Ronan Lamy
Branch: py3k
Changeset: r85315:fb39f32b33f1
Date: 2016-06-21 17:54 +0100
http://bitbucket.org/pypy/pypy/changeset/fb39f32b33f1/
Log:hg merge default
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -26,3 +26,4 @@
40497617ae91caa1a394d8be6f9cd2de31cb0628 relea
Author: Ronan Lamy
Branch: py3k
Changeset: r85135:fef0c44d0976
Date: 2016-06-13 16:50 +0100
http://bitbucket.org/pypy/pypy/changeset/fef0c44d0976/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsne
Author: Ronan Lamy
Branch: py3k
Changeset: r85040:ba87481c5e04
Date: 2016-06-08 19:26 +0100
http://bitbucket.org/pypy/pypy/changeset/ba87481c5e04/
Log:hg merge default
diff too long, truncating to 2000 out of 3831 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -25,3 +25
Author: Ronan Lamy
Branch: py3k
Changeset: r84916:ef5a7f148b27
Date: 2016-06-04 02:58 +0100
http://bitbucket.org/pypy/pypy/changeset/ef5a7f148b27/
Log:hg merge default
Port cpyext changes to bytearray
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.p
Author: Ronan Lamy
Branch: py3k
Changeset: r84911:b56f881df46b
Date: 2016-06-03 19:55 +0100
http://bitbucket.org/pypy/pypy/changeset/b56f881df46b/
Log:hg merge default (f731f9ef48f8)
diff --git a/pypy/doc/release-pypy2.7-v5.3.0.rst
b/pypy/doc/release-pypy2.7-v5.3.0.rst
new file mode 100644
Author: Ronan Lamy
Branch: py3k
Changeset: r84885:1de2e9ff0c99
Date: 2016-06-02 17:04 +0100
http://bitbucket.org/pypy/pypy/changeset/1de2e9ff0c99/
Log:hg merge default
diff too long, truncating to 2000 out of 5903 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -23,3 +23
Author: Manuel Jacob
Branch: py3k
Changeset: r84538:df5facd61ba8
Date: 2016-05-20 18:54 +0200
http://bitbucket.org/pypy/pypy/changeset/df5facd61ba8/
Log:hg merge default (+ fixes)
Some tests still fail. E.g. test_verbose_flag_* in
pypy/module/imp/test/test_import.py and test_
Author: Ronan Lamy
Branch: py3k
Changeset: r84408:7f5d673727e3
Date: 2016-05-12 21:01 +0100
http://bitbucket.org/pypy/pypy/changeset/7f5d673727e3/
Log:hg merge default
diff too long, truncating to 2000 out of 6936 lines
diff --git a/dotviewer/graphserver.py b/dotviewer/graphserver.py
--- a/
Author: Ronan Lamy
Branch: py3k
Changeset: r84152:ecb21bf4a68d
Date: 2016-05-03 00:59 +0100
http://bitbucket.org/pypy/pypy/changeset/ecb21bf4a68d/
Log:hg merge default
diff too long, truncating to 2000 out of 3805 lines
diff --git a/TODO b/TODO
deleted file mode 100644
--- a/TODO
+++ /dev/n
Author: Ronan Lamy
Branch: py3k
Changeset: r83690:1a9530342a5f
Date: 2016-04-15 17:47 +0100
http://bitbucket.org/pypy/pypy/changeset/1a9530342a5f/
Log:hg merge default
diff too long, truncating to 2000 out of 6434 lines
diff --git a/pypy/doc/index-of-release-notes.rst
b/pypy/doc/index-of-r
Author: Ronan Lamy
Branch: py3k
Changeset: r83542:c0fce2e85c79
Date: 2016-04-06 16:06 +0100
http://bitbucket.org/pypy/pypy/changeset/c0fce2e85c79/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsne
Author: Ronan Lamy
Branch: py3k
Changeset: r83527:e186dd71a5e7
Date: 2016-04-05 19:13 +0100
http://bitbucket.org/pypy/pypy/changeset/e186dd71a5e7/
Log:hg merge default
diff too long, truncating to 2000 out of 10146 lines
diff --git a/lib_pypy/_ctypes/structure.py b/lib_pypy/_ctypes/structur
Author: Ronan Lamy
Branch: py3k
Changeset: r83212:c3ae6981e11f
Date: 2016-03-21 04:58 +
http://bitbucket.org/pypy/pypy/changeset/c3ae6981e11f/
Log:hg merge default
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -19,3 +19,4 @@
850edf14b2c75573720f59e95767335fb1affe55 relea
Author: Ronan Lamy
Branch: py3k
Changeset: r83154:9a167de52a1f
Date: 2016-03-19 04:26 +
http://bitbucket.org/pypy/pypy/changeset/9a167de52a1f/
Log:hg merge default
diff too long, truncating to 2000 out of 13776 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@
Author: Manuel Jacob
Branch: py3k
Changeset: r82581:d5c477e0d86f
Date: 2016-02-27 01:27 +0100
http://bitbucket.org/pypy/pypy/changeset/d5c477e0d86f/
Log:hg merge default
diff --git a/pypy/module/_vmprof/test/test__vmprof.py
b/pypy/module/_vmprof/test/test__vmprof.py
--- a/pypy/module/_vmpro
Author: Manuel Jacob
Branch: py3k
Changeset: r82575:6dfc20f28921
Date: 2016-02-26 22:24 +0100
http://bitbucket.org/pypy/pypy/changeset/6dfc20f28921/
Log:hg merge default
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_im
Author: Manuel Jacob
Branch: py3k
Changeset: r82572:f564a192eb18
Date: 2016-02-26 19:13 +0100
http://bitbucket.org/pypy/pypy/changeset/f564a192eb18/
Log:hg merge default
Also, bring both test_shadow_extension_* tests closer to default.
diff --git a/pypy/module/imp/test/test_import.p
Author: Manuel Jacob
Branch: py3k
Changeset: r82569:12537e5dacda
Date: 2016-02-26 17:30 +0100
http://bitbucket.org/pypy/pypy/changeset/12537e5dacda/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whats
Author: Manuel Jacob
Branch: py3k
Changeset: r82515:299018381016
Date: 2016-02-25 16:38 +0100
http://bitbucket.org/pypy/pypy/changeset/299018381016/
Log:hg merge default
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -41,29 +41,29 @@
Amaury Forgeot d'Arc
Antonio Cuni
Author: Manuel Jacob
Branch: py3k
Changeset: r82462:842942cabb34
Date: 2016-02-23 22:26 +0100
http://bitbucket.org/pypy/pypy/changeset/842942cabb34/
Log:hg merge default
diff too long, truncating to 2000 out of 5375 lines
diff --git a/lib_pypy/_pypy_testcapi.py b/lib_pypy/_pypy_testcapi.py
Author: Manuel Jacob
Branch: py3k
Changeset: r82412:be90c2e77207
Date: 2016-02-22 23:36 +0100
http://bitbucket.org/pypy/pypy/changeset/be90c2e77207/
Log:hg merge default
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whats
Author: Manuel Jacob
Branch: py3k
Changeset: r82380:688a132b06b6
Date: 2016-02-22 02:04 +0100
http://bitbucket.org/pypy/pypy/changeset/688a132b06b6/
Log:hg merge default
diff --git a/pypy/interpreter/pyparser/pytokenizer.py
b/pypy/interpreter/pyparser/pytokenizer.py
--- a/pypy/interpreter/p
Author: Manuel Jacob
Branch: py3k
Changeset: r82329:4634d8e8bf6e
Date: 2016-02-19 19:04 +0100
http://bitbucket.org/pypy/pypy/changeset/4634d8e8bf6e/
Log:hg merge default
diff --git a/lib-python/2.7/distutils/command/build_ext.py
b/lib-python/2.7/distutils/command/build_ext.py
--- a/lib-pyth
Author: Manuel Jacob
Branch: py3k
Changeset: r82211:837af91c362b
Date: 2016-02-13 15:01 +0100
http://bitbucket.org/pypy/pypy/changeset/837af91c362b/
Log:hg merge default
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyo
Author: Manuel Jacob
Branch: py3k
Changeset: r82195:5d115756a4ce
Date: 2016-02-12 23:00 +0100
http://bitbucket.org/pypy/pypy/changeset/5d115756a4ce/
Log:hg merge default (+ fixes)
diff too long, truncating to 2000 out of 5677 lines
diff --git a/dotviewer/drawgraph.py b/dotviewer/drawgraph.p
Author: Manuel Jacob
Branch: py3k
Changeset: r82029:fd7884dc77a3
Date: 2016-02-01 12:50 +0100
http://bitbucket.org/pypy/pypy/changeset/fd7884dc77a3/
Log:hg merge default
diff too long, truncating to 2000 out of 16652 lines
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitigno
Author: Manuel Jacob
Branch: py3k
Changeset: r79128:61296bb0341b
Date: 2015-08-22 01:22 +0200
http://bitbucket.org/pypy/pypy/changeset/61296bb0341b/
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/PKG-INFO
+++ b
Author: Manuel Jacob
Branch: py3k
Changeset: r79010:81d2a303c872
Date: 2015-08-17 02:41 +0200
http://bitbucket.org/pypy/pypy/changeset/81d2a303c872/
Log:hg merge default
diff too long, truncating to 2000 out of 5812 lines
diff --git a/_pytest/assertion/rewrite.py b/_pytest/assertion/rewrite
Author: Manuel Jacob
Branch: py3k
Changeset: r78561:05c251509e69
Date: 2015-07-17 01:58 +0200
http://bitbucket.org/pypy/pypy/changeset/05c251509e69/
Log:hg merge default
diff too long, truncating to 2000 out of 4707 lines
diff --git a/lib_pypy/cffi.egg-info/PKG-INFO b/lib_pypy/cffi.egg-info
Author: Manuel Jacob
Branch: py3k
Changeset: r78397:2ac10a3a0884
Date: 2015-07-02 01:54 +0200
http://bitbucket.org/pypy/pypy/changeset/2ac10a3a0884/
Log:hg merge default
diff --git a/lib-python/2.7/test/test_urllib2.py
b/lib-python/2.7/test/test_urllib2.py
--- a/lib-python/2.7/test/test_url
Author: Manuel Jacob
Branch: py3k
Changeset: r78323:85bc12fb4725
Date: 2015-06-26 16:26 +0200
http://bitbucket.org/pypy/pypy/changeset/85bc12fb4725/
Log:hg merge default
diff --git a/lib_pypy/_tkinter/tclobj.py b/lib_pypy/_tkinter/tclobj.py
--- a/lib_pypy/_tkinter/tclobj.py
+++ b/lib_pypy/_t
Author: Manuel Jacob
Branch: py3k
Changeset: r5:0b31f311ef2f
Date: 2015-06-02 17:02 +0200
http://bitbucket.org/pypy/pypy/changeset/0b31f311ef2f/
Log:hg merge default
diff too long, truncating to 2000 out of 34800 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -10,3
Author: Manuel Jacob
Branch: py3k
Changeset: r76125:1ea84a73908b
Date: 2015-02-25 12:16 +0100
http://bitbucket.org/pypy/pypy/changeset/1ea84a73908b/
Log:hg merge default
diff too long, truncating to 2000 out of 3584 lines
diff --git a/lib_pypy/_gdbm.py b/lib_pypy/_gdbm.py
--- a/lib_pypy/_gd
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r75908:37fec51281b6
Date: 2015-02-15 22:47 +0100
http://bitbucket.org/pypy/pypy/changeset/37fec51281b6/
Log:hg merge default
diff too long, truncating to 2000 out of 28392 lines
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r75869:2f2ec61d2d55
Date: 2015-02-14 13:31 +0100
http://bitbucket.org/pypy/pypy/changeset/2f2ec61d2d55/
Log:hg merge default
diff too long, truncating to 2000 out of 3186 lines
diff --git a/lib-python/2.7/test/test_audioop.py
b/lib-pytho
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r75760:a4b363d6f714
Date: 2015-02-07 19:18 +0100
http://bitbucket.org/pypy/pypy/changeset/a4b363d6f714/
Log:hg merge default Probably a lot of issues.
diff too long, truncating to 2000 out of 19140 lines
diff --git a/.hgtags b/.hgtags
---
Author: Ronan Lamy
Branch: py3k
Changeset: r74132:c37a4c0b1d1c
Date: 2014-10-23 16:18 +0200
http://bitbucket.org/pypy/pypy/changeset/c37a4c0b1d1c/
Log:hg merge default
diff --git a/rpython/jit/codewriter/assembler.py
b/rpython/jit/codewriter/assembler.py
--- a/rpython/jit/codewriter/assembl
Author: Ronan Lamy
Branch: py3k
Changeset: r74119:44d5b6ce30c0
Date: 2014-10-23 15:35 +0200
http://bitbucket.org/pypy/pypy/changeset/44d5b6ce30c0/
Log:hg merge default
diff --git a/pypy/module/micronumpy/boxes.py b/pypy/module/micronumpy/boxes.py
--- a/pypy/module/micronumpy/boxes.py
+++ b/p
Author: Ronan Lamy
Branch: py3k
Changeset: r74047:f9f6e6ae989f
Date: 2014-10-21 17:47 +0200
http://bitbucket.org/pypy/pypy/changeset/f9f6e6ae989f/
Log:hg merge default
diff --git a/pypy/doc/cppyy.rst b/pypy/doc/cppyy.rst
--- a/pypy/doc/cppyy.rst
+++ b/pypy/doc/cppyy.rst
@@ -83,7 +83,7 @@
th
Author: Manuel Jacob
Branch: py3k
Changeset: r71578:f481a6c8308a
Date: 2014-05-19 02:00 +0200
http://bitbucket.org/pypy/pypy/changeset/f481a6c8308a/
Log:hg merge default
diff --git a/lib_pypy/_tkinter/tklib.py b/lib_pypy/_tkinter/tklib.py
--- a/lib_pypy/_tkinter/tklib.py
+++ b/lib_pypy/_tkint
Author: Manuel Jacob
Branch: py3k
Changeset: r64815:eb7f8348ff30
Date: 2013-06-07 11:43 +0200
http://bitbucket.org/pypy/pypy/changeset/eb7f8348ff30/
Log:hg merge default
diff --git a/pypy/doc/getting-started-dev.rst b/pypy/doc/getting-started-dev.rst
--- a/pypy/doc/getting-started-dev.rst
+++
Author: Manuel Jacob
Branch: py3k
Changeset: r64108:a20ff6733d15
Date: 2013-05-14 23:43 +0200
http://bitbucket.org/pypy/pypy/changeset/a20ff6733d15/
Log:hg merge default
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyop
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r63667:e6b80345d013
Date: 2013-04-26 22:26 +0200
http://bitbucket.org/pypy/pypy/changeset/e6b80345d013/
Log:hg merge default
diff --git a/pypy/interpreter/astcompiler/consts.py
b/pypy/interpreter/astcompiler/consts.py
--- a/pypy/interpret
Author: Manuel Jacob
Branch: py3k
Changeset: r62005:ed5327d22e7c
Date: 2013-03-04 11:51 +0100
http://bitbucket.org/pypy/pypy/changeset/ed5327d22e7c/
Log:hg merge default
diff --git a/dotviewer/msgstruct.py b/dotviewer/msgstruct.py
--- a/dotviewer/msgstruct.py
+++ b/dotviewer/msgstruct.py
@@ -
Author: Manuel Jacob
Branch: py3k
Changeset: r61570:1988eaba1a6d
Date: 2013-02-21 23:26 +0100
http://bitbucket.org/pypy/pypy/changeset/1988eaba1a6d/
Log:hg merge default
diff --git a/pypy/module/_io/interp_bytesio.py
b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
Author: Manuel Jacob
Branch: py3k
Changeset: r61511:60e8bbf6448f
Date: 2013-02-21 00:36 +0100
http://bitbucket.org/pypy/pypy/changeset/60e8bbf6448f/
Log:hg merge default
diff --git a/pypy/module/_io/interp_fileio.py b/pypy/module/_io/interp_fileio.py
--- a/pypy/module/_io/interp_fileio.py
+++
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r60635:5f3eacb6f86c
Date: 2013-01-28 22:46 +0100
http://bitbucket.org/pypy/pypy/changeset/5f3eacb6f86c/
Log:hg merge default
diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py
--- a/rpython/annotator/annrpython.
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r60629:fcaa58ce7548
Date: 2013-01-28 19:59 +0100
http://bitbucket.org/pypy/pypy/changeset/fcaa58ce7548/
Log:hg merge default
diff --git a/pypy/interpreter/executioncontext.py
b/pypy/interpreter/executioncontext.py
--- a/pypy/interpreter/e
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r60410:792caad9d5ca
Date: 2013-01-23 23:58 +0100
http://bitbucket.org/pypy/pypy/changeset/792caad9d5ca/
Log:hg merge default
diff --git a/rpython/jit/codewriter/effectinfo.py
b/rpython/jit/codewriter/effectinfo.py
--- a/rpython/jit/codewr
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r60256:4b63836b7e97
Date: 2013-01-20 20:27 +0100
http://bitbucket.org/pypy/pypy/changeset/4b63836b7e97/
Log:hg merge default
diff --git a/pypy/module/unicodedata/interp_ucd.py
b/pypy/module/unicodedata/interp_ucd.py
--- a/pypy/module/unic
Author: Amaury Forgeot d'Arc
Branch: py3k
Changeset: r60234:5bbf664124e9
Date: 2013-01-20 14:52 +0100
http://bitbucket.org/pypy/pypy/changeset/5bbf664124e9/
Log:hg merge default again
diff --git a/goal/multibuild.py b/pypy/goal/multibuild.py
rename from goal/multibuild.py
rename to pypy/goal
1 - 100 of 144 matches
Mail list logo
