Author: Matti Picus <matti.pi...@gmail.com>
Branch: unicode-utf8-py3
Changeset: r95072:99ad3d85cb7a
Date: 2018-09-01 23:46 +0200
http://bitbucket.org/pypy/pypy/changeset/99ad3d85cb7a/
Log: fix tests
diff --git a/pypy/objspace/std/test/test_bytesobject.py
b/pypy/objspace/std/test/test_bytesobject.py
--- a/pypy/objspace/std/test/test_bytesobject.py
+++ b/pypy/objspace/std/test/test_bytesobject.py
@@ -97,7 +97,7 @@
monkeypatch.setattr(jit, 'isconstant', lambda x: True)
space = self.space
w_res = space.call_function(space.w_bytes, space.wrap([42]))
- assert space.text_w(w_res) == '*'
+ assert space.bytes_w(w_res) == b'*'
class AppTestBytesObject:
diff --git a/pypy/objspace/std/test/test_stdobjspace.py
b/pypy/objspace/std/test/test_stdobjspace.py
--- a/pypy/objspace/std/test/test_stdobjspace.py
+++ b/pypy/objspace/std/test/test_stdobjspace.py
@@ -93,4 +93,4 @@
from pypy.objspace.std.unicodeobject import W_UnicodeObject
w_x = self.space.wrap('foo\xF0')
assert isinstance(w_x, W_UnicodeObject)
- assert w_x._utf8 == 'foo\uxF0'
+ assert w_x._utf8 == 'foo\xF0'
diff --git a/pypy/objspace/std/test/test_unicodeobject.py
b/pypy/objspace/std/test/test_unicodeobject.py
--- a/pypy/objspace/std/test/test_unicodeobject.py
+++ b/pypy/objspace/std/test/test_unicodeobject.py
@@ -110,8 +110,8 @@
space = self.space
w_uni = space.wrap(u'abcd')
assert space.text_w(w_uni) == 'abcd'
- # TODO : how to handle this?
w_uni = space.wrap(unichr(0xd921) + unichr(0xdddd))
+ # XXXX Test is from py3.5, should this still fail?
space.raises_w(space.w_UnicodeEncodeError, space.text_w, w_uni)
diff --git a/pypy/objspace/std/unicodeobject.py
b/pypy/objspace/std/unicodeobject.py
--- a/pypy/objspace/std/unicodeobject.py
+++ b/pypy/objspace/std/unicodeobject.py
@@ -463,7 +463,7 @@
try:
builder.append_code(codepoint)
except ValueError:
- raise oefmt(space.w_TypeError,
+ raise oefmt(space.w_ValueError,
"character mapping must be in range(0x110000)")
return self.from_utf8builder(builder)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
