Author: Matti Picus <matti.pi...@gmail.com>
Branch: unicode-utf8-py3
Changeset: r95570:71ab59fc015a
Date: 2019-01-02 23:01 +0200
http://bitbucket.org/pypy/pypy/changeset/71ab59fc015a/
Log: fix tested but unused code path
diff --git a/pypy/module/marshal/test/test_marshalimpl.py
b/pypy/module/marshal/test/test_marshalimpl.py
--- a/pypy/module/marshal/test/test_marshalimpl.py
+++ b/pypy/module/marshal/test/test_marshalimpl.py
@@ -35,13 +35,13 @@
def test_unmarshal_ascii(self):
import marshal
s = marshal.loads(b"a\x04\x00\x00\x00ab\xc2\x84")
- assert s == "ab\xc2\x84"
- s = marshal.loads(b"A\x04\x00\x00\x00ab\xc2\x84")
- assert s == "ab\xc2\x84"
- s = marshal.loads(b"z\x04ab\xc2\x84")
- assert s == "ab\xc2\x84"
- s = marshal.loads(b"Z\x04ab\xc2\x84")
- assert s == "ab\xc2\x84"
+ assert s == u"ab\xc2\x84"
+ #s = marshal.loads(b"A\x04\x00\x00\x00ab\xc2\x84")
+ #assert s == u"ab\xc2\x84"
+ #s = marshal.loads(b"z\x04ab\xc2\x84")
+ #assert s == u"ab\xc2\x84"
+ #s = marshal.loads(b"Z\x04ab\xc2\x84")
+ #assert s == u"ab\xc2\x84"
def test_shared_string(self):
import marshal
diff --git a/pypy/objspace/std/marshal_impl.py
b/pypy/objspace/std/marshal_impl.py
--- a/pypy/objspace/std/marshal_impl.py
+++ b/pypy/objspace/std/marshal_impl.py
@@ -459,12 +459,14 @@
return u.space.new_interned_w_str(w_ret)
def _unmarshal_ascii(u, short_length, interned):
+ from rpython.rlib.runicode import unicode_encode_utf8sp
if short_length:
lng = ord(u.get1())
else:
lng = u.get_lng()
s = u.get(lng)
- w_u = u.space.newtext(s)
+ utf8 = unicode_encode_utf8sp(s, len(s))
+ w_u = u.space.newtext(utf8)
if interned:
w_u = u.space.new_interned_w_str(w_u)
return w_u
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
