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

Commit 493fef6

Browse files
serhiy-storchakaserhiy-storchaka
authored
[2.7] bpo-38535: Fix positions for AST nodes for calls without arguments in decorators. (GH-16861). (GH-16931)
(cherry picked from commit 26ae9f6)
1 parent c80955c commit 493fef6

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

‎Lib/test/test_ast.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,12 @@ def to_tuple(t):
103103
"{r for l in x if g}",
104104
# setcomp with naked tuple
105105
"{r for l,m in x}",
106+
# Decorated FunctionDef
107+
"@deco1\n@deco2()\n@deco3(1)\ndef f(): pass",
108+
# Decorated ClassDef
109+
"@deco1\n@deco2()\n@deco3(1)\nclass C: pass",
110+
# Decorator with generator argument
111+
"@deco(a for a in b)\ndef f(): pass",
106112
]
107113

108114
# These are compiled through "single"
@@ -546,6 +552,9 @@ def main():
546552
('Module', [('Expr', (1, 0), ('DictComp', (1, 1), ('Name', (1, 1), 'a', ('Load',)), ('Name', (1, 5), 'b', ('Load',)), [('comprehension', ('Tuple', (1, 11), [('Name', (1, 11), 'v', ('Store',)), ('Name', (1, 13), 'w', ('Store',))], ('Store',)), ('Name', (1, 18), 'x', ('Load',)), [])]))]),
547553
('Module', [('Expr', (1, 0), ('SetComp', (1, 1), ('Name', (1, 1), 'r', ('Load',)), [('comprehension', ('Name', (1, 7), 'l', ('Store',)), ('Name', (1, 12), 'x', ('Load',)), [('Name', (1, 17), 'g', ('Load',))])]))]),
548554
('Module', [('Expr', (1, 0), ('SetComp', (1, 1), ('Name', (1, 1), 'r', ('Load',)), [('comprehension', ('Tuple', (1, 7), [('Name', (1, 7), 'l', ('Store',)), ('Name', (1, 9), 'm', ('Store',))], ('Store',)), ('Name', (1, 14), 'x', ('Load',)), [])]))]),
555+
('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, []), [('Pass', (4, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 1), ('Name', (2, 1), 'deco2', ('Load',)), [], [], None, None), ('Call', (3, 1), ('Name', (3, 1), 'deco3', ('Load',)), [('Num', (3, 7), 1)], [], None, None)])]),
556+
('Module', [('ClassDef', (1, 0), 'C', [], [('Pass', (4, 9))], [('Name', (1, 1), 'deco1', ('Load',)), ('Call', (2, 1), ('Name', (2, 1), 'deco2', ('Load',)), [], [], None, None), ('Call', (3, 1), ('Name', (3, 1), 'deco3', ('Load',)), [('Num', (3, 7), 1)], [], None, None)])]),
557+
('Module', [('FunctionDef', (1, 0), 'f', ('arguments', [], None, None, []), [('Pass', (2, 9))], [('Call', (1, 1), ('Name', (1, 1), 'deco', ('Load',)), [('GeneratorExp', (1, 6), ('Name', (1, 6), 'a', ('Load',)), [('comprehension', ('Name', (1, 12), 'a', ('Store',)), ('Name', (1, 17), 'b', ('Load',)), [])])], [], None, None)])]),
549558
]
550559
single_results = [
551560
('Interactive', [('Expr', (1, 0), ('BinOp', (1, 0), ('Num', (1, 0), 1), ('Add',), ('Num', (1, 2), 2)))]),

‎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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -852,8 +852,9 @@ ast_for_decorator(struct compiling *c, const node *n)
852852
name_expr = NULL;
853853
}
854854
else if (NCH(n) == 5) { /* Call with no arguments */
855-
d = Call(name_expr, NULL, NULL, NULL, NULL, LINENO(n),
856-
n->n_col_offset, c->c_arena);
855+
d = Call(name_expr, NULL, NULL, NULL, NULL,
856+
name_expr->lineno, name_expr->col_offset,
857+
c->c_arena);
857858
if (!d)
858859
return NULL;
859860
name_expr = NULL;

0 commit comments

Comments
 (0)
0