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

Fix Python 2.7 tests.

Browse Source
This commit is contained in:
Dave Halter
2017-07-31 12:45:39 +02:00
parent 58c32591d0
commit ddd16124ac
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
parso/python/normalizer.py
View File

@@ -482,8 +482,9 @@ class ErrorFinder(Normalizer):
self._check_assignment(before_equal) self._check_assignment(before_equal)
augassign = node.children[1] augassign = node.children[1]
print(augassign)
if augassign != '=' and augassign.type != 'annassign': # Is augassign. if augassign != '=' and augassign.type != 'annassign': # Is augassign.
if node.children[0].type in ('testlist_star_expr', 'atom'): if node.children[0].type in ('testlist_star_expr', 'atom', 'testlist'):
message = "illegal expression for augmented assignment" message = "illegal expression for augmented assignment"
self._add_syntax_error(message, node) self._add_syntax_error(message, node)
elif node.type == 'with_item': elif node.type == 'with_item':
@@ -515,10 +516,12 @@ class ErrorFinder(Normalizer):
elif leaf.type == 'name': elif leaf.type == 'name':
if leaf.value == '__debug__' and leaf.is_definition(): if leaf.value == '__debug__' and leaf.is_definition():
if self._version <= (2, 7): if self._version <= (2, 7):
message = 'assignment to __debug__' message = 'cannot assign to __debug__'
else: else:
message = 'assignment to keyword' message = 'assignment to keyword'
self._add_syntax_error(message, leaf) self._add_syntax_error(message, leaf)
if leaf.value == 'None' and self._version <= (2, 7) and leaf.is_definition():
self._add_syntax_error('cannot assign to None', leaf)
self._context.add_name(leaf) self._context.add_name(leaf)
elif leaf.type == 'string': elif leaf.type == 'string':
@@ -629,7 +632,7 @@ class ErrorFinder(Normalizer):
assert trailer.type == 'trailer' assert trailer.type == 'trailer'
if trailer.children[0] == '(': if trailer.children[0] == '(':
error = 'function call' error = 'function call'
elif type_ in ('testlist_star_expr', 'exprlist'): elif type_ in ('testlist_star_expr', 'exprlist', 'testlist'):
for child in node.children[::2]: for child in node.children[::2]:
self._check_assignment(child, is_deletion) self._check_assignment(child, is_deletion)
elif ('expr' in type_ and type_ != 'star_expr' # is a substring elif ('expr' in type_ and type_ != 'star_expr' # is a substring

12
test/test_python_errors.py
View File

@@ -84,8 +84,6 @@ FAILING_EXAMPLES = [
'def foo(): x = yield 1 = 3', 'def foo(): x = yield 1 = 3',
'async def foo(): await x = 3', 'async def foo(): await x = 3',
'(a if a else a) = a', '(a if a else a) = a',
'(True,) = x',
'([False], a) = x',
'a, 1 = x', 'a, 1 = x',
'foo() = 1', 'foo() = 1',
# Cases without the equals but other assignments. # Cases without the equals but other assignments.
@@ -101,7 +99,6 @@ FAILING_EXAMPLES = [
# SyntaxErrors from Python/symtable.c # SyntaxErrors from Python/symtable.c
'def f(x, x): pass', 'def f(x, x): pass',
'def x(): from math import *',
'nonlocal a', 'nonlocal a',
# IndentationError # IndentationError
@@ -215,6 +212,15 @@ if sys.version_info >= (3, 6):
if sys.version_info >= (3, 4): if sys.version_info >= (3, 4):
# Before that del None works like del list, it gives a NameError. # Before that del None works like del list, it gives a NameError.
FAILING_EXAMPLES.append('del None') FAILING_EXAMPLES.append('del None')
if sys.version_info >= (3,):
FAILING_EXAMPLES += [
# Unfortunately assigning to False and True do not raise an error in
# 2.x.
'(True,) = x',
'([False], a) = x',
# A symtable error that raises only a SyntaxWarning in Python 2.
'def x(): from math import *',
]
def _get_error_list(code, version=None): def _get_error_list(code, version=None):