Author: Matti Picus <[email protected]>
Branch: unicode-utf8-py3
Changeset: r94902:74c2ede43307
Date: 2018-07-11 23:32 -0500
http://bitbucket.org/pypy/pypy/changeset/74c2ede43307/
Log: fix, skip tests
diff --git a/pypy/interpreter/astcompiler/test/test_astbuilder.py
b/pypy/interpreter/astcompiler/test/test_astbuilder.py
--- a/pypy/interpreter/astcompiler/test/test_astbuilder.py
+++ b/pypy/interpreter/astcompiler/test/test_astbuilder.py
@@ -902,7 +902,7 @@
def test_flufl(self):
source = "x <> y"
- raises(SyntaxError, self.get_ast, source)
+ py.test.raises(SyntaxError, self.get_ast, source)
comp = self.get_first_expr(source,
flags=consts.CO_FUTURE_BARRY_AS_BDFL)
assert isinstance(comp, ast.Compare)
@@ -1130,7 +1130,7 @@
s = self.get_first_expr("b'hi' b' implicitly' b' extra'")
assert isinstance(s, ast.Bytes)
assert space.eq_w(s.s, space.newbytes("hi implicitly extra"))
- raises(SyntaxError, self.get_first_expr, "b'hello' 'world'")
+ py.test.raises(SyntaxError, self.get_first_expr, "b'hello' 'world'")
sentence = u"Die Männer ärgern sich!"
source = u"# coding: utf-7\nstuff = '%s'" % (sentence,)
info = pyparse.CompileInfo("<test>", "exec")
@@ -1325,8 +1325,8 @@
assert isinstance(if2, ast.Name)
def test_cpython_issue12983(self):
- raises(SyntaxError, self.get_ast, r"""b'\x'""")
- raises(SyntaxError, self.get_ast, r"""b'\x0'""")
+ py.test.raises(SyntaxError, self.get_ast, r"""b'\x'""")
+ py.test.raises(SyntaxError, self.get_ast, r"""b'\x0'""")
def test_matmul(self):
mod = self.get_ast("a @ b")
diff --git a/pypy/interpreter/test/test_unicodehelper.py
b/pypy/interpreter/test/test_unicodehelper.py
--- a/pypy/interpreter/test/test_unicodehelper.py
+++ b/pypy/interpreter/test/test_unicodehelper.py
@@ -78,6 +78,7 @@
assert lst == [("??", "ascii", input, 0, 2),
("??", "ascii", input, 5, 7)]
[email protected]("rework this test for utf8")
def test_decode_utf8_allow_surrogates():
sp = FakeSpace()
assert decode_utf8(sp, "\xed\xa0\x80", allow_surrogates=True) == u"\ud800"
@@ -87,6 +88,7 @@
got = decode_utf8(sp, "\xf0\x90\x80\x80", allow_surrogates=True)
assert map(ord, got) == [0x10000]
[email protected]("rework this test for utf8")
def test_decode_utf8sp():
space = FakeSpace()
assert decode_utf8sp(space, "\xed\xa0\x80") == u"\ud800"
@@ -96,6 +98,7 @@
got = decode_utf8sp(space, "\xf0\x90\x80\x80")
assert map(ord, got) == [0x10000]
[email protected]("test has non-valid errorhandler")
@pytest.mark.parametrize('unich', [u"\ud800", u"\udc80"])
def test_utf32_surrogates(unich):
assert (utf8_encode_utf_32_be(unich.encode('utf-8'), None) ==
@@ -108,10 +111,12 @@
allow_surrogates=False)
def replace_with(ru, rs):
+ if rs:
+ rs = rs.encode('utf-8')
def errorhandler(errors, enc, msg, u, startingpos, endingpos):
if errors == 'strict':
raise UnicodeEncodeError(enc, u, startingpos, endingpos, msg)
- return ru.encode('utf-8'), endingpos
+ return rs, endingpos
uch = u"<%s>" % unich
return utf8_encode_utf_32_be(
uch.encode('utf8'), None,
diff --git a/pypy/module/_codecs/test/test_codecs.py
b/pypy/module/_codecs/test/test_codecs.py
--- a/pypy/module/_codecs/test/test_codecs.py
+++ b/pypy/module/_codecs/test/test_codecs.py
@@ -15,7 +15,7 @@
'utf-32', 'utf-32-le', 'utf-32-be',
'raw_unicode_escape',
'unicode_escape', 'unicode_internal'):
- assert str(u.encode(encoding),encoding) == u
+ assert str(u.encode(encoding), encoding) == u
def test_ucs4(self):
x = u'\U00100000'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
