Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Lib/ast.py
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,8 @@ class Param(expr_context):
class _Precedence:
"""Precedence table that originated from python grammar."""

TUPLE = auto()
NAMED_EXPR = auto() # <target> := <expr1>
TUPLE = auto() # <expr1>, <expr2>
YIELD = auto() # 'yield', 'yield from'
TEST = auto() # 'if'-'else', 'lambda'
OR = auto() # 'or'
Expand Down Expand Up @@ -838,7 +839,7 @@ def visit_Expr(self, node):
self.traverse(node.value)

def visit_NamedExpr(self, node):
with self.require_parens(_Precedence.TUPLE, node):
with self.require_parens(_Precedence.NAMED_EXPR, node):
self.set_precedence(_Precedence.ATOM, node.target, node.value)
self.traverse(node.target)
self.write(" := ")
Expand All @@ -859,6 +860,7 @@ def visit_ImportFrom(self, node):
def visit_Assign(self, node):
self.fill()
for target in node.targets:
self.set_precedence(_Precedence.TUPLE, target)
self.traverse(target)
self.write(" = ")
self.traverse(node.value)
Expand Down Expand Up @@ -1030,6 +1032,7 @@ def visit_AsyncFor(self, node):

def _for_helper(self, fill, node):
self.fill(fill)
self.set_precedence(_Precedence.TUPLE, node.target)
self.traverse(node.target)
self.write(" in ")
self.traverse(node.iter)
Expand Down Expand Up @@ -1315,7 +1318,7 @@ def write_item(item):
)

def visit_Tuple(self, node):
with self.delimit("(", ")"):
with self.require_parens(_Precedence.TUPLE, node):
self.items_view(self.traverse, node.elts)

unop = {"Invert": "~", "Not": "not", "UAdd": "+", "USub": "-"}
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_ast.py
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,8 @@ def test_constant_as_name(self):
def test_precedence_enum(self):
class _Precedence(enum.IntEnum):
"""Precedence table that originated from python grammar."""
TUPLE = enum.auto()
NAMED_EXPR = enum.auto() # <target> := <expr1>
TUPLE = enum.auto() # <expr1>, <expr2>
YIELD = enum.auto() # 'yield', 'yield from'
TEST = enum.auto() # 'if'-'else', 'lambda'
OR = enum.auto() # 'or'
Expand Down
37 changes: 37 additions & 0 deletions Lib/test/test_unparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,43 @@ def test_lambda_parameters(self):
self.check_src_roundtrip("lambda x, y, /, z, q, *, u: None")
self.check_src_roundtrip("lambda x, *y, **z: None")

def test_star_expr_assign_target(self):
for source_type, source in [
("single assignment", "{target} = foo"),
("multiple assignment", "{target} = {target} = bar"),
("for loop", "for {target} in foo:\n pass"),
("async for loop", "async for {target} in foo:\n pass")
]:
for target in [
"a",
"a,",
"a, b",
"a, *b, c",
"a, (b, c), d",
"a, (b, c, d), *e",
"a, (b, *c, d), e",
"a, (b, *c, (d, e), f), g",
"[a]",
"[a, b]",
"[a, *b, c]",
"[a, [b, c], d]",
"[a, [b, c, d], *e]",
"[a, [b, *c, d], e]",
"[a, [b, *c, [d, e], f], g]",
"a, [b, c], d",
"[a, b, (c, d), (e, f)]",
"a, b, [*c], d, e"
]:
with self.subTest(source_type=source_type, target=target):
self.check_src_roundtrip(source.format(target=target))

def test_star_expr_assign_target_multiple(self):
self.check_src_roundtrip("a = b = c = d")
self.check_src_roundtrip("a, b = c, d = e, f = g")
self.check_src_roundtrip("[a, b] = [c, d] = [e, f] = g")
self.check_src_roundtrip("a, b = [c, d] = e, f = g")



class DirectoryTestCase(ASTTestCase):
"""Test roundtrip behaviour on all files in Lib and Lib/test."""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
:func:`ast.unparse` will now drop the redundant parentheses when tuples used
as assignment targets (e.g in for loops).