Author: Ronan Lamy
Branch: py3.5
Changeset: r87638:2724bf3350af
Date: 2016-10-09 00:23 +0100
http://bitbucket.org/pypy/pypy/changeset/2724bf3350af/
Log:hg merge py3k
diff too long, truncating to 2000 out of 11272 lines
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -40,4
Author: Ronan Lamy
Branch: py3.5
Changeset: r87370:991b0bdd50ab
Date: 2016-09-25 17:27 +0100
http://bitbucket.org/pypy/pypy/changeset/991b0bdd50ab/
Log:hg merge py3k
diff --git a/lib-python/3/idlelib/CallTips.py b/lib-python/3/idlelib/CallTips.py
--- a/lib-python/3/idlelib/CallTips.py
+++ b/
Author: Armin Rigo
Branch: py3.5
Changeset: r87330:a48793436b6d
Date: 2016-09-22 17:49 +0200
http://bitbucket.org/pypy/pypy/changeset/a48793436b6d/
Log:hg merge py3k
diff --git a/pypy/interpreter/argument.py b/pypy/interpreter/argument.py
--- a/pypy/interpreter/argument.py
+++ b/pypy/interpr
Author: Armin Rigo
Branch: py3.5
Changeset: r87324:b15a35fba9da
Date: 2016-09-22 15:29 +0200
http://bitbucket.org/pypy/pypy/changeset/b15a35fba9da/
Log:hg merge py3k
diff --git a/lib_pypy/grp.py b/lib_pypy/grp.py
--- a/lib_pypy/grp.py
+++ b/lib_pypy/grp.py
@@ -23,7 +23,7 @@
i = 0
m
Author: Armin Rigo
Branch: py3.5
Changeset: r87315:9d7f27e06a5c
Date: 2016-09-22 12:08 +0200
http://bitbucket.org/pypy/pypy/changeset/9d7f27e06a5c/
Log:hg merge py3k
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import
Author: Armin Rigo
Branch: py3.5
Changeset: r87311:0ac497474106
Date: 2016-09-22 11:29 +0200
http://bitbucket.org/pypy/pypy/changeset/0ac497474106/
Log:hg merge py3k
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailma
Author: Armin Rigo
Branch: py3.5
Changeset: r87309:7f7862ca4a74
Date: 2016-09-22 11:29 +0200
http://bitbucket.org/pypy/pypy/changeset/7f7862ca4a74/
Log:hg merge py3k
diff too long, truncating to 2000 out of 3083 lines
diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py
b/lib-python/2.7
Author: Armin Rigo
Branch: py3.5
Changeset: r87086:b88005ea869f
Date: 2016-09-13 19:06 +0200
http://bitbucket.org/pypy/pypy/changeset/b88005ea869f/
Log:hg merge py3k
diff --git a/rpython/jit/metainterp/optimizeopt/info.py
b/rpython/jit/metainterp/optimizeopt/info.py
--- a/rpython/jit/metain
Author: Armin Rigo
Branch: py3.5
Changeset: r87063:29fc1b0602a8
Date: 2016-09-13 10:31 +0200
http://bitbucket.org/pypy/pypy/changeset/29fc1b0602a8/
Log:hg merge py3k
diff --git a/pypy/module/cpyext/memoryobject.py
b/pypy/module/cpyext/memoryobject.py
--- a/pypy/module/cpyext/memoryobject.py
Author: Armin Rigo
Branch: py3.5
Changeset: r87060:6a82949682c3
Date: 2016-09-13 09:25 +0100
http://bitbucket.org/pypy/pypy/changeset/6a82949682c3/
Log:hg merge py3k
diff --git a/pypy/module/cpyext/buffer.py b/pypy/module/cpyext/buffer.py
--- a/pypy/module/cpyext/buffer.py
+++ b/pypy/module/
Author: Armin Rigo
Branch: py3.5
Changeset: r87055:50677989e503
Date: 2016-09-12 20:40 +0100
http://bitbucket.org/pypy/pypy/changeset/50677989e503/
Log:hg merge py3k
diff too long, truncating to 2000 out of 2301 lines
diff --git a/pypy/doc/release-pypy2.7-v5.4.1.rst
b/pypy/doc/release-pypy
Author: Ronan Lamy
Branch: py3.5
Changeset: r86938:5db8cf7e71cd
Date: 2016-09-07 15:24 +0100
http://bitbucket.org/pypy/pypy/changeset/5db8cf7e71cd/
Log:hg merge py3k
diff too long, truncating to 2000 out of 2403 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -30,3 +30,6
Author: Armin Rigo
Branch: py3.5
Changeset: r86795:ca71a23cdf5e
Date: 2016-08-31 22:57 +0200
http://bitbucket.org/pypy/pypy/changeset/ca71a23cdf5e/
Log:hg merge py3k
diff --git a/lib_pypy/_ctypes/basics.py b/lib_pypy/_ctypes/basics.py
--- a/lib_pypy/_ctypes/basics.py
+++ b/lib_pypy/_ctypes/b
Author: Armin Rigo
Branch: py3.5
Changeset: r86790:134d5b23ab97
Date: 2016-08-31 19:29 +0100
http://bitbucket.org/pypy/pypy/changeset/134d5b23ab97/
Log:hg merge py3k
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objs
Author: Ronan Lamy
Branch: py3.5
Changeset: r86785:3d0c8318b98d
Date: 2016-08-31 16:26 +0100
http://bitbucket.org/pypy/pypy/changeset/3d0c8318b98d/
Log:hg merge py3k
diff --git a/pypy/module/__builtin__/descriptor.py
b/pypy/module/__builtin__/descriptor.py
--- a/pypy/module/__builtin__/desc
Author: Armin Rigo
Branch: py3.5
Changeset: r86769:37ffd1a52ce6
Date: 2016-08-31 10:45 +0200
http://bitbucket.org/pypy/pypy/changeset/37ffd1a52ce6/
Log:hg merge py3k
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/dis
Author: Armin Rigo
Branch: py3.5
Changeset: r86728:3808099e7238
Date: 2016-08-30 13:11 +0200
http://bitbucket.org/pypy/pypy/changeset/3808099e7238/
Log:hg merge py3k
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -476,3 +476,15 @@
https://github.com/gperftools/gperftool
Author: Armin Rigo
Branch: py3.5
Changeset: r86715:f7bd6a9082cf
Date: 2016-08-29 21:20 +0200
http://bitbucket.org/pypy/pypy/changeset/f7bd6a9082cf/
Log:hg merge py3k
___
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailma
Author: Armin Rigo
Branch: py3.5
Changeset: r86711:9aff532b6729
Date: 2016-08-29 21:04 +0200
http://bitbucket.org/pypy/pypy/changeset/9aff532b6729/
Log:hg merge py3k
diff --git a/lib_pypy/_ctypes/function.py b/lib_pypy/_ctypes/function.py
--- a/lib_pypy/_ctypes/function.py
+++ b/lib_pypy/_ct
Author: Armin Rigo
Branch: py3.5
Changeset: r86698:a513e5ef114e
Date: 2016-08-29 16:14 +0200
http://bitbucket.org/pypy/pypy/changeset/a513e5ef114e/
Log:hg merge py3k
diff --git a/rpython/rlib/rsre/rsre_char.py b/rpython/rlib/rsre/rsre_char.py
--- a/rpython/rlib/rsre/rsre_char.py
+++ b/rpytho
Author: Armin Rigo
Branch: py3.5
Changeset: r86694:c00dea582ece
Date: 2016-08-29 14:36 +0200
http://bitbucket.org/pypy/pypy/changeset/c00dea582ece/
Log:hg merge py3k
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -28,3 +28,5 @@
c09c19272c990a0611b17569a0085ad1ab00c8ff release
Author: Ronan Lamy
Branch: py3.5
Changeset: r8:c34251a385be
Date: 2016-08-28 22:58 +0100
http://bitbucket.org/pypy/pypy/changeset/c34251a385be/
Log:hg merge py3k
diff --git a/pypy/module/_sre/__init__.py b/pypy/module/_sre/__init__.py
--- a/pypy/module/_sre/__init__.py
+++ b/pypy/module/
Author: Armin Rigo
Branch: py3.5
Changeset: r86657:69b5503f284b
Date: 2016-08-28 22:12 +0200
http://bitbucket.org/pypy/pypy/changeset/69b5503f284b/
Log:hg merge py3k
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -27,3 +27,4 @@
40497617ae91caa1a394d8be6f9cd2de31cb0628 release
Author: Armin Rigo
Branch: py3.5
Changeset: r86626:6833b14f183f
Date: 2016-08-27 22:13 +0200
http://bitbucket.org/pypy/pypy/changeset/6833b14f183f/
Log:hg merge py3k
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/ap
Author: Armin Rigo
Branch: py3.5
Changeset: r86613:58fe0ad0ec9d
Date: 2016-08-27 19:15 +0200
http://bitbucket.org/pypy/pypy/changeset/58fe0ad0ec9d/
Log:hg merge py3k
diff --git a/pypy/module/marshal/interp_marshal.py
b/pypy/module/marshal/interp_marshal.py
--- a/pypy/module/marshal/interp_m
Author: Armin Rigo
Branch: py3.5
Changeset: r86592:12c05bf05cd7
Date: 2016-08-27 10:05 +0200
http://bitbucket.org/pypy/pypy/changeset/12c05bf05cd7/
Log:hg merge py3k
diff --git a/pypy/objspace/std/memoryobject.py
b/pypy/objspace/std/memoryobject.py
--- a/pypy/objspace/std/memoryobject.py
++
Author: Armin Rigo
Branch: py3.5
Changeset: r86578:2eee1909c4d1
Date: 2016-08-26 19:11 +0200
http://bitbucket.org/pypy/pypy/changeset/2eee1909c4d1/
Log:hg merge py3k
diff --git a/pypy/module/_file/readinto.py b/pypy/module/_file/readinto.py
deleted file mode 100644
--- a/pypy/module/_file/re
Author: Armin Rigo
Branch: py3.5
Changeset: r86397:9629ba2a4200
Date: 2016-08-22 10:27 +0200
http://bitbucket.org/pypy/pypy/changeset/9629ba2a4200/
Log:hg merge py3k
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: py3.5
Changeset: r86376:384bd70a1123
Date: 2016-08-21 18:59 +0200
http://bitbucket.org/pypy/pypy/changeset/384bd70a1123/
Log:hg merge py3k
diff --git a/pypy/module/_cffi_backend/test/test_re_python.py
b/pypy/module/_cffi_backend/test/test_re_python.py
--- a/pypy/m
Author: Armin Rigo
Branch: py3.5
Changeset: r86370:72416bdbe656
Date: 2016-08-21 10:28 +0200
http://bitbucket.org/pypy/pypy/changeset/72416bdbe656/
Log:hg merge py3k
diff --git a/pypy/interpreter/function.py b/pypy/interpreter/function.py
--- a/pypy/interpreter/function.py
+++ b/pypy/interpr
Author: Armin Rigo
Branch: py3.5
Changeset: r86364:7d8da1e4bd2c
Date: 2016-08-20 23:11 +0200
http://bitbucket.org/pypy/pypy/changeset/7d8da1e4bd2c/
Log:hg merge py3k
diff --git a/pypy/interpreter/eval.py b/pypy/interpreter/eval.py
--- a/pypy/interpreter/eval.py
+++ b/pypy/interpreter/eval.py
Author: Ronan Lamy
Branch: py3.5
Changeset: r86299:1dd495a13d2c
Date: 2016-08-18 23:39 +0100
http://bitbucket.org/pypy/pypy/changeset/1dd495a13d2c/
Log:hg merge py3k
diff --git a/pypy/module/cpyext/api.py b/pypy/module/cpyext/api.py
--- a/pypy/module/cpyext/api.py
+++ b/pypy/module/cpyext/ap
Author: Armin Rigo
Branch: py3.5
Changeset: r86294:3c9a0b0aa820
Date: 2016-08-18 22:13 +0200
http://bitbucket.org/pypy/pypy/changeset/3c9a0b0aa820/
Log:hg merge py3k
diff --git a/pypy/interpreter/astcompiler/optimize.py
b/pypy/interpreter/astcompiler/optimize.py
--- a/pypy/interpreter/astco
Author: Ronan Lamy
Branch: py3.5
Changeset: r86281:abb8120a073d
Date: 2016-08-18 16:09 +0100
http://bitbucket.org/pypy/pypy/changeset/abb8120a073d/
Log:hg merge py3k
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,11
Author: Manuel Jacob
Branch: py3.5
Changeset: r86172:d1ba25403058
Date: 2016-08-12 17:48 +0200
http://bitbucket.org/pypy/pypy/changeset/d1ba25403058/
Log:hg merge py3k
diff too long, truncating to 2000 out of 4110 lines
diff --git a/include/PyPy.h b/include/PyPy.h
--- a/include/PyPy.h
+++ b
Author: Ronan Lamy
Branch: py3.5
Changeset: r85041:038f4cc08cb1
Date: 2016-06-08 19:59 +0100
http://bitbucket.org/pypy/pypy/changeset/038f4cc08cb1/
Log:hg merge py3k
diff too long, truncating to 2000 out of 40436 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -22,3 +22,
36 matches
Mail list logo