8000 bpo-38535: Fix positions for AST nodes for calls without arguments in… · python/cpython@ba3a566 · GitHub
[go: up one dir, main page]
Skip to content

Commit ba3a566

Browse files
miss-islingtonserhiy-storchaka
miss-islington
and
serhiy-storchaka
authored
bpo-38535: Fix positions for AST nodes for calls without arguments in decorators. (GH-16861)
(cherry picked from commit 26ae9f6) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
1 parent cf028b5 commit ba3a566

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

‎Lib/test/test_ast.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,11 @@ def to_tuple(t):
129129
# Asynchronous comprehensions
130130
"async def f():\n [i async for b in c]",
131131
# Decorated FunctionDef
132-
"@deco1\n@deco2()\ndef f(): pass",
132+
"@deco1\n@deco2()\n@deco3(1)\ndef f(): pass",
133133
# Decorated AsyncFunctionDef
134-
"@deco1\n@deco2()\nasync def f(): pass",
134+
"@deco1\n@deco2()\n@deco3(1)\nasync def f(): pass",
135135
# Decorated ClassDef
136-
"@deco1\n@deco2()\nclass C: pass",
136+
"@deco1\n@deco2()\n@deco3(1)\nclass C: pass",
137137
# Decorator with generator argument
138138
"@deco(a for a in b)\ndef f(): pass",
139139
# Simple assignment expression
@@ -1808,9 +1808,9 @@ def main():
18081808
('Module', [('Expr', (1, 0), ('Dict', (1, 0), [None, ('Constant', (1, 10), 2, None)], [('Dict', (1, 3), [('Constant', (1, 4), 1, None)], [('Constant', (1, 6), 2, None)]), ('Constant', (1, 12), 3, None)]))], []),
18091809
('Module', [('Expr', (1, 0), ('Set', (1, 0), [('Starred', (1, 1), ('Set', (1, 2), [('Constant', (1, 3), 1, None), ('Constant', (1, 6), 2, None)]), ('Load',)), ('Constant', (1, 10), 3, None)]))], []),
18101810
('Module', [('AsyncFunctionDef', (1, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Expr', (2, 1), ('ListComp', (2, 1), ('Name', (2, 2), 'i', ('Load',)), [('comprehension', ('Name', (2, 14), 'b', ('Store',)), ('Name', (2, 19), 'c', ('Load',)), [], 1)]))], [], None, None)], []),
1811-
('Module', [('FunctionDef', (3, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (3, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])], None, None)], []),
1812-
('Module', [('AsyncFunctionDef', (3, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (3, 15))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])], None, None)], []),
1813-
('Module', [('ClassDef', (3, 0), 'C', [], [], [('Pass', (3, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 0), ('Name', (2, 1), 'deco2', ('Load',)), [], [])])], []),
1811+
('Module', [('FunctionDef', (4, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (4, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 1), ('Name', (2, 1), 'deco2', ('Load',)), [], []), ('Call', (3, 1), ('Name', (3, 1), 'deco3', ('Load',)), [('Constant', (3, 7), 1, None)], [])], None, None)], []),
1812+
('Module', [('AsyncFunctionDef', (4, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (4, 15))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 1), ('Name', (2, 1), 'deco2', ('Load',)), [], []), ('Call', (3, 1), ('Name', (3, 1), 'deco3', ('Load',)), [('Constant', (3, 7), 1, None)], [])], None, None)], []),
1813+
('Module', [('ClassDef', (4, 0), 'C', [], [], [('Pass', (4, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 1), ('Name', (2, 1), 'deco2', ('Load',)), [], []), ('Call', (3, 1), ('Name', (3, 1), 'deco3', ('Load',)), [('Constant', (3, 7), 1, None)], [])])], []),
18141814
('Module', [('FunctionDef', (2, 0), 'f', ('arguments', [], [], None, [], [], None, []), [('Pass', (2, 9))], [('Call', (1, 1), ('Name', (1, 1), 'deco', ('Load',)), [('GeneratorExp', (1, 5), ('Name', (1, 6), 'a', ('Load',)), [('comprehension', ('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 17), 'b', ('Load',)), [], 0)])], [])], None, None)], []),
18151815
('Module', [('Expr', (1, 0), ('NamedExpr', (1, 1), ('Name', (1, 1), 'a', ('Store',)), ('Constant', (1, 6), 1, None)))], []),
18161816
('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [('arg', (1, 6), 'a', None, None)], [], None, [], [], None, []), [('Pass', (1, 14))], [], None, None)], []),

‎Misc/NEWS.d/next/Core and Builtins/2019-10-20-12-43-48.bpo-38535.ESMkVN.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fixed line numbers and column offsets for AST nodes for calls without
2+
arguments in decorators.

‎Python/ast.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,8 +1747,10 @@ ast_for_decorator(struct compiling *c, const node *n)
17471747
name_expr = NULL;
17481748
}
17491749
else if (NCH(n) == 5) { /* Call with no arguments */
1750-
d = Call(name_expr, NULL, NULL, LINENO(n),
1751-
n->n_col_offset, n->n_end_lineno, n->n_end_col_offset, c->c_arena);
1750+
d = Call(name_expr, NULL, NULL,
1751+
name_expr->lineno, name_expr->col_offset,
1752+
CHILD(n, 3)->n_end_lineno, CHILD(n, 3)->n_end_col_offset,
1753+
c->c_arena);
17521754
if (!d)
17531755
return NULL;
17541756
name_expr = NULL;

0 commit comments

Comments
 (0)
0