VimPlug/parso
1
0
Fork 0
mirror of https://github.com/davidhalter/parso.git synced 2025-12-06 21:04:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert trailing comma for 3.6<

Browse Source
This commit is contained in:
Batuhan Taskaya
2020-05-23 21:08:10 +03:00
parent 92396a9a16
commit 6b0e01c220
2 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
parso/python/errors.py
View File

@@ -800,18 +800,9 @@ class _ArglistRule(SyntaxRule):
if argument.type == 'argument': if argument.type == 'argument':
first = argument.children[0] first = argument.children[0]
if ( if argument.children[1].type in _COMP_FOR_TYPES and len(node.children) >= 2:
argument.children[1].type in _COMP_FOR_TYPES # a(a, b for b in c)
and len(node.children) >= 2
):
if self._normalizer.version >= (3, 7):
return True return True
elif len(node.children) == 2 and node.children[1] == ",":
# trailing comma allowed until 3.7
pass
else:
return True
if first in ('*', '**'): if first in ('*', '**'):
if first == '*': if first == '*':
if kw_unpacking_only: if kw_unpacking_only:

23
test/test_python_errors.py
View File

@@ -378,17 +378,16 @@ def test_repeated_kwarg():
@pytest.mark.parametrize( @pytest.mark.parametrize(
('source', 'no_errors', 'version'), [ ('source', 'no_errors'), [
('a(a for a in b,)', True, '3.6'), ('a(a for a in b,)', False),
('a(a for a in b,)', False, '3.7'), ('a(a for a in b, a)', False),
('a(a for a in b, a)', False, None), ('a(a, a for a in b)', False),
('a(a, a for a in b)', False, None), ('a(a, b, a for a in b, c, d)', False),
('a(a, b, a for a in b, c, d)', False, None), ('a(a for a in b)', True),
('a(a for a in b)', True, None), ('a((a for a in b), c)', True),
('a((a for a in b), c)', True, None), ('a(c, (a for a in b))', True),
('a(c, (a for a in b))', True, None), ('a(a, b, (a for a in b), c, d)', True),
('a(a, (a for a in b), c)', True, None),
] ]
) )
def test_unparenthesized_genexp(source, no_errors, version): def test_unparenthesized_genexp(source, no_errors):
assert bool(_get_error_list(source, version=version)) ^ no_errors assert bool(_get_error_list(source)) ^ no_errors