Author: Carl Friedrich Bolz-Tereick
Branch: py3.6
Changeset: r93789:9c18391110eb
Date: 2018-02-09 11:06 +0100
http://bitbucket.org/pypy/pypy/changeset/9c18391110eb/
Log:merge py3.5
diff too long, truncating to 2000 out of 17345 lines
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtag
Author: Matti Picus
Branch: py3.5
Changeset: r93790:4e598c42abcc
Date: 2018-02-09 08:59 -0500
http://bitbucket.org/pypy/pypy/changeset/4e598c42abcc/
Log:merge default into py3.5
diff too long, truncating to 2000 out of 4107 lines
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
---
Author: Matti Picus
Branch: py3.5
Changeset: r93791:b5928bf4b1e3
Date: 2018-02-09 09:11 -0500
http://bitbucket.org/pypy/pypy/changeset/b5928bf4b1e3/
Log:took wrong parent in merge
diff --git a/pypy/interpreter/astcompiler/astbuilder.py
b/pypy/interpreter/astcompiler/astbuilder.py
--- a/pypy
Author: Matti Picus
Branch: py3.5
Changeset: r93792:ec92ed49e47f
Date: 2018-02-09 12:17 -0500
http://bitbucket.org/pypy/pypy/changeset/ec92ed49e47f/
Log:no tp_compare on py3, revert 14e8d60878c2 prehaps issue #2740 still
broken on py3?
diff --git a/pypy/module/cpyext/test/test_typeob
Author: Matti Picus
Branch:
Changeset: r93793:8b069fa659af
Date: 2018-02-09 16:28 -0500
http://bitbucket.org/pypy/pypy/changeset/8b069fa659af/
Log:fix translation, cleanup
diff --git a/rpython/memory/gctypelayout.py b/rpython/memory/gctypelayout.py
--- a/rpython/memory/gctypelayout.py
+++ b
Author: Matti Picus
Branch: py3.5
Changeset: r93794:5c20792cdaa9
Date: 2018-02-09 16:28 -0500
http://bitbucket.org/pypy/pypy/changeset/5c20792cdaa9/
Log:merge default into py3.5
diff --git a/rpython/memory/gctypelayout.py b/rpython/memory/gctypelayout.py
--- a/rpython/memory/gctypelayout.py
Author: Matti Picus
Branch: py3.6
Changeset: r93795:d9e0d13cf28e
Date: 2018-02-09 17:28 -0500
http://bitbucket.org/pypy/pypy/changeset/d9e0d13cf28e/
Log:merge py3.5
diff too long, truncating to 2000 out of 2839 lines
diff --git a/lib_pypy/_sqlite3.py b/lib_pypy/_sqlite3.py
--- a/lib_pypy/_s