Author: Carl Friedrich Bolz-Tereick
Branch:
Changeset: r98612:39bcfae01bee
Date: 2020-01-31 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/39bcfae01bee/
Log:merge heads
diff --git a/pypy/module/mmap/interp_mmap.py b/pypy/module/mmap/interp_mmap.py
--- a/pypy/module/mmap/interp_mmap.py
Author: Armin Rigo
Branch:
Changeset: r98576:a7c7b4c7dcae
Date: 2020-01-23 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/a7c7b4c7dcae/
Log:merge heads
diff --git a/pypy/module/_multibytecodec/c_codecs.py
b/pypy/module/_multibytecodec/c_codecs.py
--- a/pypy/module/_multibytecodec/c_c
Author: Carl Friedrich Bolz-Tereick
Branch:
Changeset: r97462:5e5857c2fae6
Date: 2019-09-12 16:52 +0200
http://bitbucket.org/pypy/pypy/changeset/5e5857c2fae6/
Log:merge heads
diff --git a/pypy/interpreter/unicodehelper.py
b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehe
Author: Armin Rigo
Branch:
Changeset: r97242:bacea0b28bb3
Date: 2019-08-22 13:15 +0200
http://bitbucket.org/pypy/pypy/changeset/bacea0b28bb3/
Log:merge heads
diff --git a/pypy/interpreter/app_main.py b/pypy/interpreter/app_main.py
--- a/pypy/interpreter/app_main.py
+++ b/pypy/interpreter/ap
Author: Armin Rigo
Branch:
Changeset: r97117:b14e43faf847
Date: 2019-08-09 15:20 +0200
http://bitbucket.org/pypy/pypy/changeset/b14e43faf847/
Log:merge heads
diff --git a/pypy/objspace/std/test/apptest_longobject.py
b/pypy/objspace/std/test/apptest_longobject.py
new file mode 100644
--- /d
Author: Armin Rigo
Branch:
Changeset: r97069:6b6a9bdd8658
Date: 2019-08-06 14:17 +0200
http://bitbucket.org/pypy/pypy/changeset/6b6a9bdd8658/
Log:merge heads
diff --git a/pypy/module/__builtin__/test/test_compile.py
b/pypy/module/__builtin__/test/apptest_compile.py
rename from pypy/module/
Author: Armin Rigo
Branch:
Changeset: r96808:bc7aeb4d5987
Date: 2019-06-15 09:07 +0200
http://bitbucket.org/pypy/pypy/changeset/bc7aeb4d5987/
Log:merge heads
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/distutils/
Author: Carl Friedrich Bolz-Tereick
Branch:
Changeset: r96678:aeb506f08f30
Date: 2019-05-25 11:39 +0200
http://bitbucket.org/pypy/pypy/changeset/aeb506f08f30/
Log:merge heads
diff --git a/lib-python/2.7/socket.py b/lib-python/2.7/socket.py
--- a/lib-python/2.7/socket.py
+++ b/lib-python/2.7
Author: Carl Friedrich Bolz-Tereick
Branch:
Changeset: r96371:24e79a787bd8
Date: 2019-03-27 23:00 +0100
http://bitbucket.org/pypy/pypy/changeset/24e79a787bd8/
Log:merge heads
diff --git a/pypy/interpreter/astcompiler/codegen.py
b/pypy/interpreter/astcompiler/codegen.py
--- a/pypy/interpret
Author: Antonio Cuni
Branch:
Changeset: r95874:35673b0b2571
Date: 2019-02-06 14:21 +0100
http://bitbucket.org/pypy/pypy/changeset/35673b0b2571/
Log:merge heads
diff --git a/pypy/module/zlib/test/test_zlib.py
b/pypy/module/zlib/test/test_zlib.py
--- a/pypy/module/zlib/test/test_zlib.py
+++
Author: Matti Picus
Branch:
Changeset: r95741:018346b46386
Date: 2019-01-28 20:56 +0200
http://bitbucket.org/pypy/pypy/changeset/018346b46386/
Log:merge heads
diff --git a/pypy/doc/contributor.rst b/pypy/doc/contributor.rst
--- a/pypy/doc/contributor.rst
+++ b/pypy/doc/contributor.rst
@@ -7
Author: Matti Picus
Branch:
Changeset: r95299:3e0eab4be623
Date: 2018-11-11 01:03 -0800
http://bitbucket.org/pypy/pypy/changeset/3e0eab4be623/
Log:merge heads
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/wind
Author: Armin Rigo
Branch:
Changeset: r95120:476eea9a87f7
Date: 2018-09-15 22:34 +0200
http://bitbucket.org/pypy/pypy/changeset/476eea9a87f7/
Log:merge heads
diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@
Welcome to PyPy!
-PyPy is an interperter
Author: Armin Rigo
Branch:
Changeset: r95071:942ad6c1866e
Date: 2018-09-02 11:15 +0200
http://bitbucket.org/pypy/pypy/changeset/942ad6c1866e/
Log:merge heads
diff --git a/rpython/rlib/rstring.py b/rpython/rlib/rstring.py
--- a/rpython/rlib/rstring.py
+++ b/rpython/rlib/rstring.py
@@ -464,6
Author: Ronan Lamy
Branch:
Changeset: r95057:b9cf6798af7e
Date: 2018-09-01 15:39 +0200
http://bitbucket.org/pypy/pypy/changeset/b9cf6798af7e/
Log:merge heads
diff --git a/lib_pypy/_ctypes/primitive.py b/lib_pypy/_ctypes/primitive.py
--- a/lib_pypy/_ctypes/primitive.py
+++ b/lib_pypy/_ctypes
Author: Armin Rigo
Branch:
Changeset: r94867:46410c58b280
Date: 2018-07-14 09:47 +0200
http://bitbucket.org/pypy/pypy/changeset/46410c58b280/
Log:merge heads
diff --git a/pypy/doc/config/objspace.disable_entrypoints.txt
b/pypy/doc/config/objspace.disable_entrypoints.txt
new file mode 10064
Author: Armin Rigo
Branch:
Changeset: r94815:b717d811eb2b
Date: 2018-07-06 16:26 +0200
http://bitbucket.org/pypy/pypy/changeset/b717d811eb2b/
Log:merge heads
diff --git a/pypy/module/_cppyy/converter.py b/pypy/module/_cppyy/converter.py
--- a/pypy/module/_cppyy/converter.py
+++ b/pypy/modul
Author: Armin Rigo
Branch:
Changeset: r93964:42f9add4e266
Date: 2018-03-09 08:59 +0100
http://bitbucket.org/pypy/pypy/changeset/42f9add4e266/
Log:merge heads
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listi
Author: Carl Friedrich Bolz-Tereick
Branch:
Changeset: r93879:ebe1844aaf79
Date: 2018-02-24 09:26 +0100
http://bitbucket.org/pypy/pypy/changeset/ebe1844aaf79/
Log:merge heads
diff --git a/pypy/interpreter/pyframe.py b/pypy/interpreter/pyframe.py
--- a/pypy/interpreter/pyframe.py
+++ b/pypy/
Author: Armin Rigo
Branch:
Changeset: r93866:8f992014885b
Date: 2018-02-22 08:04 +0100
http://bitbucket.org/pypy/pypy/changeset/8f992014885b/
Log:merge heads
diff too long, truncating to 2000 out of 4036 lines
diff --git a/pypy/module/test_lib_pypy/pyrepl/__init__.py
b/extra_tests/test_py
Author: Carl Friedrich Bolz-Tereick
Branch:
Changeset: r93753:03e7d032c07f
Date: 2018-02-04 13:52 +0100
http://bitbucket.org/pypy/pypy/changeset/03e7d032c07f/
Log:merge heads
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc
Author: Armin Rigo
Branch:
Changeset: r93577:7eecbbca7bdc
Date: 2017-12-26 08:28 +0100
http://bitbucket.org/pypy/pypy/changeset/7eecbbca7bdc/
Log:merge heads
diff too long, truncating to 2000 out of 3533 lines
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/
Author: Armin Rigo
Branch:
Changeset: r93472:13a87780bd5a
Date: 2017-12-18 13:43 +0100
http://bitbucket.org/pypy/pypy/changeset/13a87780bd5a/
Log:merge heads
diff --git a/extra_tests/requirements.txt b/extra_tests/requirements.txt
--- a/extra_tests/requirements.txt
+++ b/extra_tests/require
Author: Antonio Cuni
Branch:
Changeset: r93033:821e59360f37
Date: 2017-11-15 02:13 +0100
http://bitbucket.org/pypy/pypy/changeset/821e59360f37/
Log:merge heads
diff --git a/pypy/module/_continuation/test/test_stacklet.py
b/pypy/module/_continuation/test/test_stacklet.py
--- a/pypy/module/_
Author: Armin Rigo
Branch:
Changeset: r92685:386fcca6c58f
Date: 2017-10-09 16:54 +0200
http://bitbucket.org/pypy/pypy/changeset/386fcca6c58f/
Log:merge heads
diff --git a/pypy/module/cpyext/dictobject.py b/pypy/module/cpyext/dictobject.py
--- a/pypy/module/cpyext/dictobject.py
+++ b/pypy/mo
Author: Armin Rigo
Branch:
Changeset: r92649:aedd9ba91c12
Date: 2017-10-08 08:22 +0200
http://bitbucket.org/pypy/pypy/changeset/aedd9ba91c12/
Log:merge heads
diff --git a/pypy/module/_cppyy/test/conftest.py
b/pypy/module/_cppyy/test/conftest.py
--- a/pypy/module/_cppyy/test/conftest.py
+++
Author: Armin Rigo
Branch:
Changeset: r92508:c4d6cc4a81fe
Date: 2017-09-29 17:52 +0200
http://bitbucket.org/pypy/pypy/changeset/c4d6cc4a81fe/
Log:merge heads
diff --git a/pypy/module/cpyext/methodobject.py
b/pypy/module/cpyext/methodobject.py
--- a/pypy/module/cpyext/methodobject.py
+++ b/
Author: Armin Rigo
Branch:
Changeset: r92418:a9eafbdf3c28
Date: 2017-09-19 12:13 +0200
http://bitbucket.org/pypy/pypy/changeset/a9eafbdf3c28/
Log:merge heads
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -120,7 +120,7 @@
D
Author: Armin Rigo
Branch:
Changeset: r92379:d8cf1127fabb
Date: 2017-09-13 22:41 +0200
http://bitbucket.org/pypy/pypy/changeset/d8cf1127fabb/
Log:merge heads
diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst
--- a/pypy/doc/windows.rst
+++ b/pypy/doc/windows.rst
@@ -209,17 +209,85 @@
Author: Armin Rigo
Branch:
Changeset: r92359:a1608b11c5da
Date: 2017-09-08 17:22 +0200
http://bitbucket.org/pypy/pypy/changeset/a1608b11c5da/
Log:merge heads
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.rs
Author: Armin Rigo
Branch:
Changeset: r92345:f70ed7c5cc49
Date: 2017-09-07 22:54 +0200
http://bitbucket.org/pypy/pypy/changeset/f70ed7c5cc49/
Log:merge heads
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/in
Author: Armin Rigo
Branch:
Changeset: r92034:e4d42cef80b0
Date: 2017-08-02 15:59 +0200
http://bitbucket.org/pypy/pypy/changeset/e4d42cef80b0/
Log:merge heads
diff --git a/lib-python/2.7/distutils/unixccompiler.py
b/lib-python/2.7/distutils/unixccompiler.py
--- a/lib-python/2.7/distutils/un
Author: Armin Rigo
Branch:
Changeset: r91446:789fb549e0af
Date: 2017-05-30 13:37 +0200
http://bitbucket.org/pypy/pypy/changeset/789fb549e0af/
Log:merge heads
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
--- a/pypy/doc/cpython_differences.rst
+++ b/pypy/do
Author: Ronan Lamy
Branch:
Changeset: r91193:df2a94c7ae6f
Date: 2017-05-06 19:38 +0100
http://bitbucket.org/pypy/pypy/changeset/df2a94c7ae6f/
Log:merge heads
diff --git a/include/README b/include/README
--- a/include/README
+++ b/include/README
@@ -1,7 +1,11 @@
This directory contains all
Author: Armin Rigo
Branch:
Changeset: r90952:d130be27596c
Date: 2017-04-04 20:47 +0200
http://bitbucket.org/pypy/pypy/changeset/d130be27596c/
Log:merge heads
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c
b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/rvmpro
Author: Richard Plangger
Branch:
Changeset: r90942:83f4ee0e2106
Date: 2017-04-03 20:32 -0400
http://bitbucket.org/pypy/pypy/changeset/83f4ee0e2106/
Log:merge heads
diff --git a/rpython/rlib/rvmprof/src/shared/symboltable.c
b/rpython/rlib/rvmprof/src/shared/symboltable.c
--- a/rpython/rlib/
Author: Antonio Cuni
Branch:
Changeset: r90433:fdae6b92de2f
Date: 2017-02-28 23:10 +0100
http://bitbucket.org/pypy/pypy/changeset/fdae6b92de2f/
Log:merge heads
diff --git a/pypy/goal/getnightly.py b/pypy/goal/getnightly.py
--- a/pypy/goal/getnightly.py
+++ b/pypy/goal/getnightly.py
@@ -4,16
Author: Armin Rigo
Branch:
Changeset: r90366:4b4ca32b2aa3
Date: 2017-02-26 18:08 +0100
http://bitbucket.org/pypy/pypy/changeset/4b4ca32b2aa3/
Log:merge heads
diff --git a/pypy/module/unicodedata/interp_ucd.py
b/pypy/module/unicodedata/interp_ucd.py
--- a/pypy/module/unicodedata/interp_ucd.
Author: Ronan Lamy
Branch:
Changeset: r90364:e28dd1841ff7
Date: 2017-02-26 14:57 +0100
http://bitbucket.org/pypy/pypy/changeset/e28dd1841ff7/
Log:merge heads
diff --git a/pypy/doc/faq.rst b/pypy/doc/faq.rst
--- a/pypy/doc/faq.rst
+++ b/pypy/doc/faq.rst
@@ -156,19 +156,30 @@
Does PyPy have
Author: Armin Rigo
Branch:
Changeset: r90337:6d6e4f94cf81
Date: 2017-02-24 08:41 +0100
http://bitbucket.org/pypy/pypy/changeset/6d6e4f94cf81/
Log:merge heads
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -74,7 +74,7 @@
^rpython/doc/_build/.*$
^compiled
^.git/
-^.h
Author: Armin Rigo
Branch:
Changeset: r90321:1c47dc995f88
Date: 2017-02-23 12:32 +0100
http://bitbucket.org/pypy/pypy/changeset/1c47dc995f88/
Log:merge heads
diff --git a/rpython/rlib/runicode.py b/rpython/rlib/runicode.py
--- a/rpython/rlib/runicode.py
+++ b/rpython/rlib/runicode.py
@@ -5,
Author: Armin Rigo
Branch:
Changeset: r90247:c8b8ba5341a7
Date: 2017-02-21 10:26 +0100
http://bitbucket.org/pypy/pypy/changeset/c8b8ba5341a7/
Log:merge heads
diff --git a/rpython/annotator/unaryop.py b/rpython/annotator/unaryop.py
--- a/rpython/annotator/unaryop.py
+++ b/rpython/annotator/u
Author: Armin Rigo
Branch:
Changeset: r90245:fc792f1074fd
Date: 2017-02-21 09:24 +
http://bitbucket.org/pypy/pypy/changeset/fc792f1074fd/
Log:merge heads
diff --git a/rpython/translator/platform/posix.py
b/rpython/translator/platform/posix.py
--- a/rpython/translator/platform/posix.py
Author: Armin Rigo
Branch:
Changeset: r90179:7b6ea7df79b3
Date: 2017-02-18 17:00 +0100
http://bitbucket.org/pypy/pypy/changeset/7b6ea7df79b3/
Log:merge heads
diff --git a/pypy/module/cpyext/pystate.py b/pypy/module/cpyext/pystate.py
--- a/pypy/module/cpyext/pystate.py
+++ b/pypy/module/cpye
Author: Armin Rigo
Branch:
Changeset: r89960:357c149fd26e
Date: 2017-02-05 21:49 +0100
http://bitbucket.org/pypy/pypy/changeset/357c149fd26e/
Log:merge heads
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@
Author: Armin Rigo
Branch:
Changeset: r89738:2a1d5f7642dc
Date: 2017-01-24 15:41 +0100
http://bitbucket.org/pypy/pypy/changeset/2a1d5f7642dc/
Log:merge heads
diff --git a/pypy/module/cpyext/test/test_userslots.py
b/pypy/module/cpyext/test/test_userslots.py
--- a/pypy/module/cpyext/test/tes
Author: Ronan Lamy
Branch:
Changeset: r89651:b34a338909b6
Date: 2017-01-18 02:19 +
http://bitbucket.org/pypy/pypy/changeset/b34a338909b6/
Log:merge heads
diff --git a/pypy/module/cppyy/src/clingcwrapper.cxx
b/pypy/module/cppyy/src/clingcwrapper.cxx
--- a/pypy/module/cppyy/src/clingcwra
Author: Armin Rigo
Branch:
Changeset: r89497:b0e1e683bc0e
Date: 2017-01-11 17:04 +
http://bitbucket.org/pypy/pypy/changeset/b0e1e683bc0e/
Log:merge heads
diff --git a/pypy/module/cpyext/test/test_api.py
b/pypy/module/cpyext/test/test_api.py
--- a/pypy/module/cpyext/test/test_api.py
+++
Author: Armin Rigo
Branch:
Changeset: r88434:3dc381df7878
Date: 2016-11-17 14:18 +0100
http://bitbucket.org/pypy/pypy/changeset/3dc381df7878/
Log:merge heads
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.rs
Author: Armin Rigo
Branch:
Changeset: r88286:0b074a6a6472
Date: 2016-11-10 09:46 +0100
http://bitbucket.org/pypy/pypy/changeset/0b074a6a6472/
Log:merge heads
diff --git a/rpython/rlib/rarithmetic.py b/rpython/rlib/rarithmetic.py
--- a/rpython/rlib/rarithmetic.py
+++ b/rpython/rlib/rarithmet
Author: Armin Rigo
Branch:
Changeset: r88275:9d3789ff54e1
Date: 2016-11-09 16:49 +0100
http://bitbucket.org/pypy/pypy/changeset/9d3789ff54e1/
Log:merge heads
diff --git a/pypy/tool/release/repackage.sh b/pypy/tool/release/repackage.sh
--- a/pypy/tool/release/repackage.sh
+++ b/pypy/tool/rel
Author: Armin Rigo
Branch:
Changeset: r88184:cce86a353c9b
Date: 2016-11-07 16:47 +0100
http://bitbucket.org/pypy/pypy/changeset/cce86a353c9b/
Log:merge heads
diff --git a/pypy/doc/release-pypy2.7-v5.6.0.rst
b/pypy/doc/release-pypy2.7-v5.6.0.rst
--- a/pypy/doc/release-pypy2.7-v5.6.0.rst
+++
Author: Armin Rigo
Branch:
Changeset: r87965:14a2e7623816
Date: 2016-10-27 23:19 +0100
http://bitbucket.org/pypy/pypy/changeset/14a2e7623816/
Log:merge heads
diff --git a/lib_pypy/_collections.py b/lib_pypy/_collections.py
--- a/lib_pypy/_collections.py
+++ b/lib_pypy/_collections.py
@@ -29
Author: Matti Picus
Branch:
Changeset: r87581:a605536d9aab
Date: 2016-10-04 20:32 +0300
http://bitbucket.org/pypy/pypy/changeset/a605536d9aab/
Log:merge heads
diff --git a/pypy/module/micronumpy/concrete.py
b/pypy/module/micronumpy/concrete.py
--- a/pypy/module/micronumpy/concrete.py
+++ b
Author: Armin Rigo
Branch:
Changeset: r87027:1a0c32b2613b
Date: 2016-09-12 11:36 +0200
http://bitbucket.org/pypy/pypy/changeset/1a0c32b2613b/
Log:merge heads
diff --git a/pypy/module/cpyext/sequence.py b/pypy/module/cpyext/sequence.py
--- a/pypy/module/cpyext/sequence.py
+++ b/pypy/module/c
Author: Carl Friedrich Bolz
Branch:
Changeset: r86797:ec5bb4dd8a06
Date: 2016-08-31 22:07 +0100
http://bitbucket.org/pypy/pypy/changeset/ec5bb4dd8a06/
Log:merge heads
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:
Changeset: r86731:6a614855ec5c
Date: 2016-08-30 13:30 +0200
http://bitbucket.org/pypy/pypy/changeset/6a614855ec5c/
Log:merge heads
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -74,6 +74,7 @@
Seo Sanghyeon
Ronny Pfannschmidt
Justin Peel
+
Author: Matti Picus
Branch:
Changeset: r86689:7ccea82f1b25
Date: 2016-08-29 21:50 +1000
http://bitbucket.org/pypy/pypy/changeset/7ccea82f1b25/
Log:merge heads
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,5 @@
c09c19272c990a0611b17569a0085ad1ab00c8ff release-pypy2
Author: Armin Rigo
Branch:
Changeset: r86651:0f0d92ccb2c1
Date: 2016-08-28 21:46 +0200
http://bitbucket.org/pypy/pypy/changeset/0f0d92ccb2c1/
Log:merge heads
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -27,3 +27,4 @@
40497617ae91caa1a394d8be6f9cd2de31cb0628 release-pypy3.
Author: Armin Rigo
Branch:
Changeset: r86501:145e67b3b78a
Date: 2016-08-24 15:48 +0100
http://bitbucket.org/pypy/pypy/changeset/145e67b3b78a/
Log:merge heads
diff --git a/pypy/doc/index-of-release-notes.rst
b/pypy/doc/index-of-release-notes.rst
--- a/pypy/doc/index-of-release-notes.rst
+++
Author: Armin Rigo
Branch:
Changeset: r86233:b7fe3a8d6872
Date: 2016-08-16 20:05 +0200
http://bitbucket.org/pypy/pypy/changeset/b7fe3a8d6872/
Log:merge heads
diff --git a/pypy/module/_multibytecodec/src/cjkcodecs/cjkcodecs.h
b/pypy/module/_multibytecodec/src/cjkcodecs/cjkcodecs.h
--- a/pyp
Author: Armin Rigo
Branch:
Changeset: r85982:518912cfcdd9
Date: 2016-08-02 10:43 +0200
http://bitbucket.org/pypy/pypy/changeset/518912cfcdd9/
Log:merge heads
diff --git a/requirements.txt b/requirements.txt
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-# hypothesis is used
Author: Armin Rigo
Branch:
Changeset: r85890:3361a42be4a0
Date: 2016-07-28 10:21 +0200
http://bitbucket.org/pypy/pypy/changeset/3361a42be4a0/
Log:merge heads
diff --git a/rpython/jit/backend/x86/test/test_ztranslation_call_assembler.py
b/rpython/jit/backend/x86/test/test_ztranslation_call_
Author: Armin Rigo
Branch:
Changeset: r85834:e18c712980b9
Date: 2016-07-23 18:29 +0200
http://bitbucket.org/pypy/pypy/changeset/e18c712980b9/
Log:merge heads
diff --git a/pypy/objspace/descroperation.py b/pypy/objspace/descroperation.py
--- a/pypy/objspace/descroperation.py
+++ b/pypy/objsp
Author: Armin Rigo
Branch:
Changeset: r85823:308fc992b6f1
Date: 2016-07-23 14:46 +0200
http://bitbucket.org/pypy/pypy/changeset/308fc992b6f1/
Log:merge heads
diff --git a/pypy/doc/build.rst b/pypy/doc/build.rst
--- a/pypy/doc/build.rst
+++ b/pypy/doc/build.rst
@@ -104,27 +104,24 @@
a
Author: Armin Rigo
Branch:
Changeset: r85023:2384df43b1dd
Date: 2016-06-08 09:29 +0200
http://bitbucket.org/pypy/pypy/changeset/2384df43b1dd/
Log:merge heads
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -25,3 +25,4 @@
80ef432a32d9baa4b3c5a54c215e8ebe499f6374 release-5.1.2
Author: Matti Picus
Branch:
Changeset: r84954:6cce955990e1
Date: 2016-06-06 00:16 +0300
http://bitbucket.org/pypy/pypy/changeset/6cce955990e1/
Log:merge heads created by pushing at exactly the same time
diff --git a/pypy/doc/release-pypy2.7-v5.3.0.rst
b/pypy/doc/release-pypy2.7-v5.3.0.rst
Author: Armin Rigo
Branch:
Changeset: r84865:2611d008c62d
Date: 2016-06-01 17:33 +0200
http://bitbucket.org/pypy/pypy/changeset/2611d008c62d/
Log:merge heads
diff --git a/rpython/rlib/rarithmetic.py b/rpython/rlib/rarithmetic.py
--- a/rpython/rlib/rarithmetic.py
+++ b/rpython/rlib/rarithmet
Author: Armin Rigo
Branch:
Changeset: r84841:072b9ce9b3dd
Date: 2016-05-31 09:40 +0200
http://bitbucket.org/pypy/pypy/changeset/072b9ce9b3dd/
Log:merge heads
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -23,3 +23,5 @@
3260adbeba4a8b6659d1cc0d0b41f266769b74da release-5.1
b
Author: Armin Rigo
Branch:
Changeset: r84747:68016caaa771
Date: 2016-05-27 23:21 +0100
http://bitbucket.org/pypy/pypy/changeset/68016caaa771/
Log:merge heads
diff --git a/lib-python/2.7/subprocess.py b/lib-python/2.7/subprocess.py
--- a/lib-python/2.7/subprocess.py
+++ b/lib-python/2.7/subp
Author: Armin Rigo
Branch:
Changeset: r84497:d4c0f70dde1c
Date: 2016-05-16 23:12 +0200
http://bitbucket.org/pypy/pypy/changeset/d4c0f70dde1c/
Log:merge heads
diff --git a/pypy/module/cpyext/pyfile.py b/pypy/module/cpyext/pyfile.py
--- a/pypy/module/cpyext/pyfile.py
+++ b/pypy/module/cpyext/
Author: Ronan Lamy
Branch:
Changeset: r84402:338fbdec99c6
Date: 2016-05-12 16:04 +0100
http://bitbucket.org/pypy/pypy/changeset/338fbdec99c6/
Log:merge heads
diff --git a/pypy/module/_winreg/interp_winreg.py
b/pypy/module/_winreg/interp_winreg.py
--- a/pypy/module/_winreg/interp_winreg.py
Author: Armin Rigo
Branch:
Changeset: r84246:7d2a931a40e7
Date: 2016-05-06 08:49 +0200
http://bitbucket.org/pypy/pypy/changeset/7d2a931a40e7/
Log:merge heads
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.rs
Author: Armin Rigo
Branch:
Changeset: r84136:b76bb5e1d3cf
Date: 2016-05-02 19:48 +0200
http://bitbucket.org/pypy/pypy/changeset/b76bb5e1d3cf/
Log:merge heads
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
Author: Armin Rigo
Branch:
Changeset: r84100:bf4e328270ce
Date: 2016-05-01 15:38 +0200
http://bitbucket.org/pypy/pypy/changeset/bf4e328270ce/
Log:merge heads
diff --git a/pypy/module/unicodedata/interp_ucd.py
b/pypy/module/unicodedata/interp_ucd.py
--- a/pypy/module/unicodedata/interp_ucd.
Author: Carl Friedrich Bolz
Branch:
Changeset: r83899:4f5be790880a
Date: 2016-04-26 11:51 +0300
http://bitbucket.org/pypy/pypy/changeset/4f5be790880a/
Log:merge heads
diff --git a/lib-python/stdlib-upgrade.txt b/lib-python/stdlib-upgrade.txt
--- a/lib-python/stdlib-upgrade.txt
+++ b/lib-pyt
Author: Armin Rigo
Branch:
Changeset: r83794:27011fa25b9e
Date: 2016-04-20 20:49 +0200
http://bitbucket.org/pypy/pypy/changeset/27011fa25b9e/
Log:merge heads
diff --git a/pypy/doc/release-5.1.0.rst b/pypy/doc/release-5.1.0.rst
--- a/pypy/doc/release-5.1.0.rst
+++ b/pypy/doc/release-5.1.0.rs
Author: Armin Rigo
Branch:
Changeset: r83708:d18adeb45be8
Date: 2016-04-17 10:24 +0200
http://bitbucket.org/pypy/pypy/changeset/d18adeb45be8/
Log:merge heads
diff --git a/rpython/rlib/rposix_stat.py b/rpython/rlib/rposix_stat.py
--- a/rpython/rlib/rposix_stat.py
+++ b/rpython/rlib/rposix_st
Author: Armin Rigo
Branch:
Changeset: r83479:96c8916a4c64
Date: 2016-04-01 09:44 +0200
http://bitbucket.org/pypy/pypy/changeset/96c8916a4c64/
Log:merge heads
diff --git a/pypy/module/__pypy__/interp_magic.py
b/pypy/module/__pypy__/interp_magic.py
--- a/pypy/module/__pypy__/interp_magic.py
Author: Armin Rigo
Branch:
Changeset: r83424:a7bb9851bb51
Date: 2016-03-29 18:26 +0200
http://bitbucket.org/pypy/pypy/changeset/a7bb9851bb51/
Log:merge heads
diff --git a/rpython/translator/c/gcc/trackgcroot.py
b/rpython/translator/c/gcc/trackgcroot.py
--- a/rpython/translator/c/gcc/trackg
Author: Armin Rigo
Branch:
Changeset: r83408:9a18329069c4
Date: 2016-03-27 22:59 +0200
http://bitbucket.org/pypy/pypy/changeset/9a18329069c4/
Log:merge heads
diff --git a/rpython/jit/backend/arm/detect.py
b/rpython/jit/backend/arm/detect.py
--- a/rpython/jit/backend/arm/detect.py
+++ b/rpy
Author: Armin Rigo
Branch:
Changeset: r83394:060cbab9d669
Date: 2016-03-27 17:15 +0200
http://bitbucket.org/pypy/pypy/changeset/060cbab9d669/
Log:merge heads
diff too long, truncating to 2000 out of 8524 lines
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/co
Author: Armin Rigo
Branch:
Changeset: r83123:b53d34f0c42d
Date: 2016-03-18 09:46 +
http://bitbucket.org/pypy/pypy/changeset/b53d34f0c42d/
Log:merge heads
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/api.py
@@
Author: mattip
Branch:
Changeset: r82969:8357c9e1778f
Date: 2016-03-11 15:25 +0200
http://bitbucket.org/pypy/pypy/changeset/8357c9e1778f/
Log:merge heads, not clear what happened
diff --git a/pypy/objspace/std/stringmethods.py
b/pypy/objspace/std/stringmethods.py
--- a/pypy/objspace/std/st
Author: Armin Rigo
Branch:
Changeset: r82906:bd53b782ce3d
Date: 2016-03-09 14:10 +0100
http://bitbucket.org/pypy/pypy/changeset/bd53b782ce3d/
Log:merge heads
diff --git a/pypy/module/_vmprof/interp_vmprof.py
b/pypy/module/_vmprof/interp_vmprof.py
--- a/pypy/module/_vmprof/interp_vmprof.py
Author: Armin Rigo
Branch:
Changeset: r82683:bc2523a1a870
Date: 2016-03-03 19:09 +0100
http://bitbucket.org/pypy/pypy/changeset/bc2523a1a870/
Log:merge heads
diff --git a/pypy/interpreter/test/test_app_main.py
b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_ma
Author: Ronan Lamy
Branch:
Changeset: r82601:fd41d042c08e
Date: 2016-02-28 17:42 +
http://bitbucket.org/pypy/pypy/changeset/fd41d042c08e/
Log:merge heads
diff --git a/rpython/memory/gctransform/boehm.py
b/rpython/memory/gctransform/boehm.py
--- a/rpython/memory/gctransform/boehm.py
+++
Author: mattip
Branch:
Changeset: r82447:904c371acd44
Date: 2016-02-23 16:34 +0100
http://bitbucket.org/pypy/pypy/changeset/904c371acd44/
Log:merge heads
diff --git a/pypy/module/cpyext/__init__.py b/pypy/module/cpyext/__init__.py
--- a/pypy/module/cpyext/__init__.py
+++ b/pypy/module/cpyex
Author: Armin Rigo
Branch:
Changeset: r82217:df6d9eeb2d42
Date: 2016-02-13 16:10 +0100
http://bitbucket.org/pypy/pypy/changeset/df6d9eeb2d42/
Log:merge heads
diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@
Author: Armin Rigo
Branch:
Changeset: r82106:90f38a4668e2
Date: 2016-02-07 14:34 +0100
http://bitbucket.org/pypy/pypy/changeset/90f38a4668e2/
Log:merge heads
diff too long, truncating to 2000 out of 3793 lines
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -75,6 +75,
Author: Armin Rigo
Branch:
Changeset: r81584:d0004489a9cc
Date: 2016-01-05 15:00 +0100
http://bitbucket.org/pypy/pypy/changeset/d0004489a9cc/
Log:merge heads
diff --git a/lib_pypy/cPickle.py b/lib_pypy/cPickle.py
--- a/lib_pypy/cPickle.py
+++ b/lib_pypy/cPickle.py
@@ -559,6 +559,7 @@
def
Author: Brian Kearns
Branch:
Changeset: r80917:37057ce12bc9
Date: 2015-11-24 17:30 -0500
http://bitbucket.org/pypy/pypy/changeset/37057ce12bc9/
Log:merge heads
diff --git a/lib_pypy/cffi/api.py b/lib_pypy/cffi/api.py
--- a/lib_pypy/cffi/api.py
+++ b/lib_pypy/cffi/api.py
@@ -72,6 +72,7 @@
Author: Armin Rigo
Branch:
Changeset: r80915:30a4accaa4d9
Date: 2015-11-24 22:49 +0100
http://bitbucket.org/pypy/pypy/changeset/30a4accaa4d9/
Log:merge heads
diff --git a/lib_pypy/datetime.py b/lib_pypy/datetime.py
--- a/lib_pypy/datetime.py
+++ b/lib_pypy/datetime.py
@@ -17,11 +17,12 @@
"
Author: Brian Kearns
Branch:
Changeset: r80908:367dea44b661
Date: 2015-11-24 14:30 -0500
http://bitbucket.org/pypy/pypy/changeset/367dea44b661/
Log:merge heads
diff --git a/pypy/module/micronumpy/compile.py
b/pypy/module/micronumpy/compile.py
--- a/pypy/module/micronumpy/compile.py
+++ b/p
Author: Armin Rigo
Branch:
Changeset: r80697:9d2ba9e211f9
Date: 2015-11-15 22:57 +
http://bitbucket.org/pypy/pypy/changeset/9d2ba9e211f9/
Log:merge heads
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -56,14 +56,15 @@
Anders Chrigstrom
Eric van Riet Paap
Wim Lavr
Author: Armin Rigo
Branch:
Changeset: r80690:34811652db74
Date: 2015-11-15 17:42 +0100
http://bitbucket.org/pypy/pypy/changeset/34811652db74/
Log:merge heads
diff --git a/pypy/module/micronumpy/loop.py b/pypy/module/micronumpy/loop.py
--- a/pypy/module/micronumpy/loop.py
+++ b/pypy/module/m
Author: Armin Rigo
Branch:
Changeset: r80605:04570c9524ed
Date: 2015-11-09 08:53 +0100
http://bitbucket.org/pypy/pypy/changeset/04570c9524ed/
Log:merge heads
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.rs
Author: mattip
Branch:
Changeset: r80594:b2a2f75dc940
Date: 2015-11-08 20:11 +0200
http://bitbucket.org/pypy/pypy/changeset/b2a2f75dc940/
Log:merge heads
diff --git a/pypy/interpreter/test/test_zzpickle_and_slow.py
b/pypy/interpreter/test/test_zzpickle_and_slow.py
--- a/pypy/interpreter/te
Author: Armin Rigo
Branch:
Changeset: r80093:dc5ec2ee219f
Date: 2015-10-09 17:51 +0200
http://bitbucket.org/pypy/pypy/changeset/dc5ec2ee219f/
Log:merge heads
diff --git a/rpython/jit/metainterp/optimizeopt/heap.py
b/rpython/jit/metainterp/optimizeopt/heap.py
--- a/rpython/jit/metainterp/op
Author: Armin Rigo
Branch:
Changeset: r79987:d43a1b95f25c
Date: 2015-10-05 10:32 +0200
http://bitbucket.org/pypy/pypy/changeset/d43a1b95f25c/
Log:merge heads
diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython
1 - 100 of 515 matches
Mail list logo