Author: Armin Rigo
Branch:
Changeset: r95300:01d5d6b5425e
Date: 2018-11-12 17:55 +0100
http://bitbucket.org/pypy/pypy/changeset/01d5d6b5425e/
Log:#2912
Rewrite PyUnicode_FromEncodedObject() to use CPython's logic (still
needs to be forward-ported to py3.5)
diff --git a/pypy
Author: Ronan Lamy
Branch: py3tests
Changeset: r95301:399533825dcd
Date: 2018-11-12 21:17 +
http://bitbucket.org/pypy/pypy/changeset/399533825dcd/
Log:hg merge apptest-file
diff --git a/pypy/interpreter/test/demomixedmod/__init__.py
b/pypy/interpreter/test/demomixedmod/__init__.py
--- a
Author: Matti Picus
Branch: py3.5
Changeset: r95303:861c793cead8
Date: 2018-11-12 13:39 -0800
http://bitbucket.org/pypy/pypy/changeset/861c793cead8/
Log:fix merge, PyUnicode_FromEncodedObject already tested in test_decode
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py
b/pypy/mod
Author: Matti Picus
Branch: py3.5
Changeset: r95302:2a37ce3c7d2f
Date: 2018-11-12 09:22 -0800
http://bitbucket.org/pypy/pypy/changeset/2a37ce3c7d2f/
Log:merge default into py3.5
diff --git a/pypy/module/cpyext/test/test_unicodeobject.py
b/pypy/module/cpyext/test/test_unicodeobject.py
--- a/