From 2135e10dc717c00d10d899d232bebfc59bb25032 Mon Sep 17 00:00:00 2001 From: Batuhan Taskaya Date: Mon, 18 May 2020 21:23:48 +0300 Subject: bpo-40663: Correctly handle annotations with subscripts in ast_unparse.c (GH-20156) --- Python/ast_unparse.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'Python/ast_unparse.c') diff --git a/Python/ast_unparse.c b/Python/ast_unparse.c index d1e9d42d33..e699751a05 100644 --- a/Python/ast_unparse.c +++ b/Python/ast_unparse.c @@ -781,8 +781,19 @@ static int append_ast_subscript(_PyUnicodeWriter *writer, expr_ty e) { APPEND_EXPR(e->v.Subscript.value, PR_ATOM); + int level = PR_TUPLE; + expr_ty slice = e->v.Subscript.slice; + if (slice->kind == Tuple_kind) { + for (Py_ssize_t i = 0; i < asdl_seq_LEN(slice->v.Tuple.elts); i++) { + expr_ty element = asdl_seq_GET(slice->v.Tuple.elts, i); + if (element->kind == Starred_kind) { + ++level; + break; + } + } + } APPEND_STR("["); - APPEND_EXPR(e->v.Subscript.slice, PR_TUPLE); + APPEND_EXPR(e->v.Subscript.slice, level); APPEND_STR_FINISH("]"); } -- cgit v1.2.1