From ae0c16e138ee24170deb9aefef9842a069a846ce Mon Sep 17 00:00:00 2001 From: Batuhan Taskaya Date: Mon, 18 May 2020 21:23:48 +0300 Subject: [PATCH] [3.7] bpo-40663: Correctly handle annotations with subscripts in ast_unparse.c (GH-20156). (cherry picked from commit 2135e10dc717c00d10d899d232bebfc59bb25032) Co-authored-by: Batuhan Taskaya --- Lib/test/test_future.py | 4 ++++ .../2020-05-17-20-38-12.bpo-40663.u2aiZf.rst | 2 ++ Python/ast_unparse.c | 21 +++++++++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Core and Builtins/2020-05-17-20-38-12.bpo-40663.u2aiZf.rst diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py index 2aed01095aa7ee..13a4f6f3cc6a39 100644 --- a/Lib/test/test_future.py +++ b/Lib/test/test_future.py @@ -237,6 +237,10 @@ def test_annotations(self): eq("dict[str, int]") eq("set[str,]") eq("tuple[str, ...]") + eq("tuple[(str, *types)]") + eq("tuple[xx:yy, (*types,)]") + eq("tuple[str, int, (str, int)]") + eq("tuple[(*int, str, str, (str, int))]") eq("tuple[str, int, float, dict[str, int]]") eq("slice[0]") eq("slice[0:1]") diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-05-17-20-38-12.bpo-40663.u2aiZf.rst b/Misc/NEWS.d/next/Core and Builtins/2020-05-17-20-38-12.bpo-40663.u2aiZf.rst new file mode 100644 index 00000000000000..5041abc7e3eaa5 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-05-17-20-38-12.bpo-40663.u2aiZf.rst @@ -0,0 +1,2 @@ +Correctly generate annotations where parentheses are omitted but required +(e.g: ``Type[(str, int, *other))]``. diff --git a/Python/ast_unparse.c b/Python/ast_unparse.c index 93b3ecffb017ed..7ed4b4f1808230 100644 --- a/Python/ast_unparse.c +++ b/Python/ast_unparse.c @@ -743,6 +743,24 @@ append_ast_ext_slice(_PyUnicodeWriter *writer, slice_ty slice) return 0; } +static int +append_ast_index_slice(_PyUnicodeWriter *writer, slice_ty slice) +{ + int level = PR_TUPLE; + expr_ty value = slice->v.Index.value; + if (value->kind == Tuple_kind) { + for (Py_ssize_t i = 0; i < asdl_seq_LEN(value->v.Tuple.elts); i++) { + expr_ty element = asdl_seq_GET(value->v.Tuple.elts, i); + if (element->kind == Starred_kind) { + ++level; + break; + } + } + } + APPEND_EXPR(value, level); + return 0; +} + static int append_ast_slice(_PyUnicodeWriter *writer, slice_ty slice) { @@ -752,8 +770,7 @@ append_ast_slice(_PyUnicodeWriter *writer, slice_ty slice) case ExtSlice_kind: return append_ast_ext_slice(writer, slice); case Index_kind: - APPEND_EXPR(slice->v.Index.value, PR_TUPLE); - return 0; + return append_ast_index_slice(writer, slice); default: PyErr_SetString(PyExc_SystemError, "unexpected slice kind");