Author: Antonio Cuni
Branch: release-pypy3.6-7.x
Changeset: r95774:4286ef6d6e83
Date: 2019-02-01 18:59 +0100
http://bitbucket.org/pypy/pypy/changeset/4286ef6d6e83/
Log:hg merge 3.6
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -40,16 +40,16 @@
Armin Rigo
Maciej Fijalkow
Author: Antonio Cuni
Branch: py3.6
Changeset: r95773:b1506a30f188
Date: 2019-02-01 18:59 +0100
http://bitbucket.org/pypy/pypy/changeset/b1506a30f188/
Log:hg merge py3.5
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -40,16 +40,16 @@
Armin Rigo
Maciej Fijalkowski
Carl
Author: Antonio Cuni
Branch: release-pypy2.7-7.x
Changeset: r95771:6017dbfef6af
Date: 2019-02-01 18:25 +0100
http://bitbucket.org/pypy/pypy/changeset/6017dbfef6af/
Log:hg merge default
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -40,16 +40,16 @@
Armin Rigo
Maciej Fija
Author: Antonio Cuni
Branch: release-pypy3.5-7.x
Changeset: r95772:0ed340cb2a4f
Date: 2019-02-01 18:26 +0100
http://bitbucket.org/pypy/pypy/changeset/0ed340cb2a4f/
Log:hg merge py3.5, to include the latest cffi updates
diff --git a/extra_tests/cffi_tests/cffi1/test_pkgconfig.py
b/extra_test
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95768:be2b370c0652
Date: 2019-02-01 15:49 +0200
http://bitbucket.org/pypy/pypy/changeset/be2b370c0652/
Log:remove round-tripping str-unicode from errors
diff --git a/pypy/interpreter/error.py b/pypy/interpreter/error.py
--- a/pypy/inte
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95770:0c7880912bd4
Date: 2019-02-01 15:52 +0200
http://bitbucket.org/pypy/pypy/changeset/0c7880912bd4/
Log:merge py3.5 into branch
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -40,16 +40,16 @@
Armin Rigo
Maciej F
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95769:fcbf4dcf5b74
Date: 2019-02-01 15:50 +0200
http://bitbucket.org/pypy/pypy/changeset/fcbf4dcf5b74/
Log:rework to avoid uni.decode
diff --git a/pypy/interpreter/pyparser/pytokenizer.py
b/pypy/interpreter/pyparser/pytokenizer.py
---
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95766:5dd0a0074920
Date: 2019-02-01 13:07 +0200
http://bitbucket.org/pypy/pypy/changeset/5dd0a0074920/
Log:is this code needed (tests in pypy/interpreter, pypy/objspace pass
without it)?
diff --git a/TODO b/TODO
--- a/TODO
+++
Author: Matti Picus
Branch: py3.6
Changeset: r95767:c1e462eb3112
Date: 2019-02-01 13:08 +0200
http://bitbucket.org/pypy/pypy/changeset/c1e462eb3112/
Log:typo
diff --git a/pypy/module/sys/vm.py b/pypy/module/sys/vm.py
--- a/pypy/module/sys/vm.py
+++ b/pypy/module/sys/vm.py
@@ -234,7 +234,7 @@