Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95932:c5c905981a21
Date: 2019-02-10 15:54 +0200
http://bitbucket.org/pypy/pypy/changeset/c5c905981a21/
Log:fix merge
diff --git a/pypy/interpreter/unicodehelper.py
b/pypy/interpreter/unicodehelper.py
--- a/pypy/interpreter/unicodehelp
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95638:bba58ab418cb
Date: 2019-01-15 08:17 +0200
http://bitbucket.org/pypy/pypy/changeset/bba58ab418cb/
Log:fix merge
diff --git a/pypy/module/pypyjit/test_pypy_c/test_misc.py
b/pypy/module/pypyjit/test_pypy_c/test_misc.py
--- a/pypy/m
Author: Ronan Lamy
Branch: unicode-utf8-py3
Changeset: r95595:682209b9fc7a
Date: 2019-01-09 18:56 +
http://bitbucket.org/pypy/pypy/changeset/682209b9fc7a/
Log:fix merge
diff --git a/pypy/module/_sre/interp_sre.py b/pypy/module/_sre/interp_sre.py
--- a/pypy/module/_sre/interp_sre.py
+++ b
Author: Matti Picus
Branch: unicode-utf8-py3
Changeset: r95099:afe9a3fb0c6b
Date: 2018-09-11 23:33 +0300
http://bitbucket.org/pypy/pypy/changeset/afe9a3fb0c6b/
Log:fix merge
diff --git a/pypy/objspace/std/unicodeobject.py
b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeo