Author: Ronan Lamy
Branch: py3.3
Changeset: r79805:7ac40865b0ff
Date: 2015-09-23 20:54 +0100
http://bitbucket.org/pypy/pypy/changeset/7ac40865b0ff/
Log:merge heads
diff --git a/rpython/rlib/rposix.py b/rpython/rlib/rposix.py
--- a/rpython/rlib/rposix.py
+++ b/rpython/rlib/rposix.py
@@ -249,7
Author: Amaury Forgeot d'Arc
Branch: py3.3
Changeset: r74203:5c7b5a819708
Date: 2014-10-23 23:58 +0200
http://bitbucket.org/pypy/pypy/changeset/5c7b5a819708/
Log:Merge heads
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
Author: Amaury Forgeot d'Arc
Branch: py3.3
Changeset: r73816:4b30aa9e63e5
Date: 2014-10-05 20:20 +0200
http://bitbucket.org/pypy/pypy/changeset/4b30aa9e63e5/
Log:merge heads
diff --git a/pypy/module/faulthandler/interp_faulthandler.py
b/pypy/module/faulthandler/interp_faulthandler.py
--- a/
Author: Armin Rigo
Branch: py3.3
Changeset: r72571:58ed28228b4d
Date: 2014-07-27 14:27 +0200
http://bitbucket.org/pypy/pypy/changeset/58ed28228b4d/
Log:merge heads
diff --git a/pypy/module/__builtin__/test/test_compile.py
b/pypy/module/__builtin__/test/test_compile.py
--- a/pypy/module/__bu
Author: Armin Rigo
Branch: py3.3
Changeset: r72513:b14679e8321d
Date: 2014-07-26 15:35 +0200
http://bitbucket.org/pypy/pypy/changeset/b14679e8321d/
Log:merge heads
diff --git a/pypy/module/__builtin__/functional.py
b/pypy/module/__builtin__/functional.py
--- a/pypy/module/__builtin__/functi
Author: Armin Rigo
Branch: py3.3
Changeset: r72510:4e00d712484e
Date: 2014-07-26 15:27 +0200
http://bitbucket.org/pypy/pypy/changeset/4e00d712484e/
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: Valentina Mukhamedzhanova
Branch: py3.3
Changeset: r72505:4bba41190d41
Date: 2014-07-26 14:48 +0200
http://bitbucket.org/pypy/pypy/changeset/4bba41190d41/
Log:Merge heads.
diff --git a/lib-python/3/json/__init__.py b/lib-python/3/json/__init__.py
--- a/lib-python/3/json/__init__.py
+
Author: Armin Rigo
Branch: py3.3
Changeset: r72502:2ff4e3b542b6
Date: 2014-07-26 13:59 +0200
http://bitbucket.org/pypy/pypy/changeset/2ff4e3b542b6/
Log:merge heads
diff --git a/pypy/interpreter/pyopcode.py b/pypy/interpreter/pyopcode.py
--- a/pypy/interpreter/pyopcode.py
+++ b/pypy/interpret
Author: Armin Rigo
Branch: py3.3
Changeset: r72500:38d2f98adca7
Date: 2014-07-26 13:57 +0200
http://bitbucket.org/pypy/pypy/changeset/38d2f98adca7/
Log:merge heads
diff --git a/pypy/module/posix/test/test_posix2.py
b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_po