VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2026-01-21 02:22:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove the u function and u literals

Browse Source
This commit is contained in:
Dave Halter
2020-07-24 01:39:03 +02:00
parent 020b2861df
commit 164489cf97
11 changed files with 49 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/test_diff_parser.py
View File

@@ -973,17 +973,17 @@ def test_random_unicode_characters(differ):
Those issues were all found with the fuzzer.
"""
differ.initialize('')
differ.parse(u'\x1dĔBϞɛˁşʑ˳˻ȣſéÎ\x90̕ȟòwʘ\x1dĔBϞɛˁşʑ˳˻ȣſéÎ', parsers=1,
differ.parse('\x1dĔBϞɛˁşʑ˳˻ȣſéÎ\x90̕ȟòwʘ\x1dĔBϞɛˁşʑ˳˻ȣſéÎ', parsers=1,
expect_error_leaves=True)
differ.parse(u'\r\r', parsers=1)
differ.parse(u"˟Ę\x05À\r rúƣ@\x8a\x15r()\n", parsers=1, expect_error_leaves=True)
differ.parse(u'a\ntaǁ\rGĒōns__\n\nb', parsers=1,
differ.parse('\r\r', parsers=1)
differ.parse("˟Ę\x05À\r rúƣ@\x8a\x15r()\n", parsers=1, expect_error_leaves=True)
differ.parse('a\ntaǁ\rGĒōns__\n\nb', parsers=1,
expect_error_leaves=sys.version_info[0] == 2)
s = ' if not (self, "_fi\x02\x0e\x08\n\nle"):'
differ.parse(s, parsers=1, expect_error_leaves=True)
differ.parse('')
differ.parse(s + '\n', parsers=1, expect_error_leaves=True)
differ.parse(u' result = (\r\f\x17\t\x11res)', parsers=1, expect_error_leaves=True)
differ.parse(' result = (\r\f\x17\t\x11res)', parsers=1, expect_error_leaves=True)
differ.parse('')
differ.parse(' a( # xx\ndef', parsers=1, expect_error_leaves=True)
@@ -996,7 +996,7 @@ def test_dedent_end_positions(differ):
c = {
5}
''')
code2 = dedent(u'''\
code2 = dedent('''\
if 1:
if ⌟ഒᜈྡྷṭb:
2
@@ -1588,14 +1588,14 @@ def test_byte_order_mark(differ):
def test_byte_order_mark2(differ):
code = u'\ufeff# foo'
code = '\ufeff# foo'
differ.initialize(code)
differ.parse(code + 'x', parsers=ANY)
def test_byte_order_mark3(differ):
code1 = u"\ufeff#\ny\n"
code2 = u'x\n\ufeff#\n\ufeff#\ny\n'
code1 = "\ufeff#\ny\n"
code2 = 'x\n\ufeff#\n\ufeff#\ny\n'
differ.initialize(code1)
differ.parse(code2, expect_error_leaves=True, parsers=ANY, copies=ANY)
differ.parse(code1, parsers=1)

5
test/test_old_fast_parser.py
View File

@@ -8,12 +8,11 @@ However the tests might still be relevant for the parser.
from textwrap import dedent
from parso._compatibility import u
from parso import parse
def test_carriage_return_splitting():
source = u(dedent('''
source = dedent('''
@@ -21,7 +20,7 @@ def test_carriage_return_splitting():
class Foo():
pass
'''))
''')
source = source.replace('\n', '\r\n')
module = parse(source)
assert [n.value for lst in module.get_used_names().values() for n in lst] == ['Foo']

12
test/test_param_splitting.py
View File

@@ -23,15 +23,15 @@ def assert_params(param_string, version=None, **wanted_dct):
def test_split_params_with_separation_star():
assert_params(u'x, y=1, *, z=3', x=None, y='1', z='3', version='3.5')
assert_params(u'*, x', x=None, version='3.5')
assert_params(u'*', version='3.5')
assert_params('x, y=1, *, z=3', x=None, y='1', z='3', version='3.5')
assert_params('*, x', x=None, version='3.5')
assert_params('*', version='3.5')
def test_split_params_with_stars():
assert_params(u'x, *args', x=None, args=None)
assert_params(u'**kwargs', kwargs=None)
assert_params(u'*args, **kwargs', args=None, kwargs=None)
assert_params('x, *args', x=None, args=None)
assert_params('**kwargs', kwargs=None)
assert_params('*args, **kwargs', args=None, kwargs=None)
def test_kw_only_no_kw(works_ge_py3):

5
test/test_parser.py
View File

@@ -3,7 +3,6 @@ from textwrap import dedent
import pytest
from parso._compatibility import u
from parso import parse
from parso.python import tree
from parso.utils import split_lines
@@ -126,7 +125,7 @@ def test_param_splitting(each_version):
def test_unicode_string():
s = tree.String(None, u('bö'), (0, 0))
s = tree.String(None, 'bö', (0, 0))
assert repr(s) # Should not raise an Error!
@@ -135,7 +134,7 @@ def test_backslash_dos_style(each_version):
def test_started_lambda_stmt(each_version):
m = parse(u'lambda a, b: a i', version=each_version)
m = parse('lambda a, b: a i', version=each_version)
assert m.children[0].type == 'error_node'

10
test/test_pgen2.py
View File

@@ -30,15 +30,15 @@ def _invalid_syntax(code, version=None, **kwargs):
def test_formfeed(each_version):
s = u"foo\n\x0c\nfoo\n"
s = "foo\n\x0c\nfoo\n"
t = _parse(s, each_version)
assert t.children[0].children[0].type == 'name'
assert t.children[1].children[0].type == 'name'
s = u"1\n\x0c\x0c\n2\n"
s = "1\n\x0c\x0c\n2\n"
t = _parse(s, each_version)
with pytest.raises(ParserSyntaxError):
s = u"\n\x0c2\n"
s = "\n\x0c2\n"
_parse(s, each_version)
@@ -266,7 +266,7 @@ def test_multiline_bytes_literals(each_version):
It's not possible to get the same result when using \xaa in Python 2/3,
because it's treated differently.
"""
s = u"""
s = """
md5test(b"\xaa" * 80,
(b"Test Using Larger Than Block-Size Key "
b"and Larger Than One Block-Size Data"),
@@ -295,7 +295,7 @@ def test_dict_unpacking(works_ge_py35):
def test_multiline_str_literals(each_version):
s = u"""
s = """
md5test("\xaa" * 80,
("Test Using Larger Than Block-Size Key "
"and Larger Than One Block-Size Data"),

8
test/test_tokenize.py
View File

@@ -244,11 +244,11 @@ xfail_py2 = dict(marks=[pytest.mark.xfail(sys.version_info[0] == 2, reason='Pyth
# Name stuff
('1foo1', [NUMBER, NAME]),
pytest.param(
u'மெல்லினம்', [NAME],
'மெல்லினம்', [NAME],
**xfail_py2),
pytest.param(u'²', [ERRORTOKEN], **xfail_py2),
pytest.param(u'ä²ö', [NAME, ERRORTOKEN, NAME], **xfail_py2),
pytest.param(u'ää²¹öö', [NAME, ERRORTOKEN, NAME], **xfail_py2),
pytest.param('²', [ERRORTOKEN], **xfail_py2),
pytest.param('ä²ö', [NAME, ERRORTOKEN, NAME], **xfail_py2),
pytest.param('ää²¹öö', [NAME, ERRORTOKEN, NAME], **xfail_py2),
(' \x00a', [INDENT, ERRORTOKEN, NAME, DEDENT]),
(dedent('''\
class BaseCache: