Author: Ronan Lamy
Branch: py3.5
Changeset: r93454:774bffb126ce
Date: 2017-12-17 22:14 +
http://bitbucket.org/pypy/pypy/changeset/774bffb126ce/
Log:hg merge default
diff --git a/pypy/module/cpyext/pyerrors.py b/pypy/module/cpyext/pyerrors.py
--- a/pypy/module/cpyext/pyerrors.py
+++ b/pyp
Author: Ronan Lamy
Branch: py3.5
Changeset: r93452:3bdc752d4824
Date: 2017-12-17 21:48 +
http://bitbucket.org/pypy/pypy/changeset/3bdc752d4824/
Log:backout ed6f48246238
diff --git a/pypy/module/_continuation/interp_continuation.py
b/pypy/module/_continuation/interp_continuation.py
--- a
Author: Ronan Lamy
Branch: py3.5
Changeset: r93453:cf79d090d371
Date: 2017-12-17 22:07 +
http://bitbucket.org/pypy/pypy/changeset/cf79d090d371/
Log:Fix test_gr_frame in test_greenlet.py
diff --git a/lib_pypy/greenlet.py b/lib_pypy/greenlet.py
--- a/lib_pypy/greenlet.py
+++ b/lib_pypy/gre
Author: Ronan Lamy
Branch: py3.5
Changeset: r93451:b1f6c07626d3
Date: 2017-12-17 21:23 +
http://bitbucket.org/pypy/pypy/changeset/b1f6c07626d3/
Log:fix translation
diff --git a/pypy/module/_continuation/interp_pickle.py
b/pypy/module/_continuation/interp_pickle.py
--- a/pypy/module/_con
Author: Matti Picus
Branch:
Changeset: r1052:054832151c19
Date: 2017-12-17 23:19 +0200
http://bitbucket.org/pypy/buildbot/changeset/054832151c19/
Log:fix for non-windows build slaves without git
diff --git a/bot2/pypybuildbot/builds.py b/bot2/pypybuildbot/builds.py
--- a/bot2/pypybuildbot/b
Author: Ronan Lamy
Branch: py3.5
Changeset: r93450:413ffdce2e44
Date: 2017-12-17 15:03 +
http://bitbucket.org/pypy/pypy/changeset/413ffdce2e44/
Log:fix 2 tests
diff --git a/pypy/module/pypyjit/test_pypy_c/test_containers.py
b/pypy/module/pypyjit/test_pypy_c/test_containers.py
--- a/pypy
Author: Ronan Lamy
Branch: py3.5
Changeset: r93449:ed6f48246238
Date: 2017-12-17 13:31 +
http://bitbucket.org/pypy/pypy/changeset/ed6f48246238/
Log:continulet pickling seems to be working
diff --git a/pypy/module/_continuation/interp_continuation.py
b/pypy/module/_continuation/interp_co
Author: Ronan Lamy
Branch:
Changeset: r93448:a560a9381f17
Date: 2017-12-17 13:22 +
http://bitbucket.org/pypy/pypy/changeset/a560a9381f17/
Log:Fix test: missing incref
diff --git a/pypy/module/cpyext/test/test_tupleobject.py
b/pypy/module/cpyext/test/test_tupleobject.py
--- a/pypy/modul
Author: Ronan Lamy
Branch: py3.5
Changeset: r93447:ea2056d81509
Date: 2017-12-16 07:08 +
http://bitbucket.org/pypy/pypy/changeset/ea2056d81509/
Log:fix test
diff --git a/pypy/module/_cppyy/test/test_datatypes.py
b/pypy/module/_cppyy/test/test_datatypes.py
--- a/pypy/module/_cppyy/test/t