Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: unicode-utf8-test
Changeset: r93259:9d2a2229c128
Date: 2017-12-03 19:15 +0000
http://bitbucket.org/pypy/pypy/changeset/9d2a2229c128/
Log: backout 26f1724ee623, to get meaningful test results
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1760,6 +1760,10 @@
def utf8_w(self, w_obj):
return w_obj.utf8_w(self)
+ def unicode_w(self, w_obj):
+ # XXX: kill me!
+ return w_obj.utf8_w(self).decode('utf-8')
+
def convert_to_w_unicode(self, w_obj):
return w_obj.convert_to_w_unicode(self)
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -377,6 +377,13 @@
assert isinstance(s, str) # on pypy3, this decodes the byte string
return W_BytesObject(s) # with the filesystem encoding
+ def newunicode(self, unistr):
+ # XXX: kill me!
+ assert isinstance(unistr, unicode)
+ utf8s = unistr.encode("utf-8")
+ length, flag = rutf8.check_utf8(utf8s, True)
+ return self.newutf8(utf8s, length, flag)
+
def type(self, w_obj):
jit.promote(w_obj.__class__)
return w_obj.getclass(self)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
