bpo-395222: Correctly unparse unicode prefix in ast_unparse.c (GH-19512)

isidentical · web-flow · commit aade1cc45369 · 2020-04-14T19:55:01.000+01:00
diff --git a/Lib/test/test_future.py b/Lib/test/test_future.py
@@ -153,6 +153,7 @@ def test_annotations(self):
         eq = self.assertAnnotationEqual
         eq('...')
         eq("'some_string'")
+        eq("u'some_string'")
         eq("b'\\xa3'")
         eq('Name')
         eq('None')
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-04-14-18-47-00.bpo-39522.uVeIV_.rst b/Misc/NEWS.d/next/Core and Builtins/2020-04-14-18-47-00.bpo-39522.uVeIV_.rst
@@ -0,0 +1,2 @@
+Correctly unparse explicit ``u`` prefix for strings when postponed
+evaluation for annotations activated. Patch by Batuhan Taskaya.
diff --git a/Python/ast_unparse.c b/Python/ast_unparse.c
@@ -875,6 +875,8 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, int level)
         if (e->v.Constant.value == Py_Ellipsis) {
             APPEND_STR_FINISH("...");
         }
+        APPEND_STR_IF(e->v.Constant.kind != NULL,
+                      PyUnicode_AS_DATA(e->v.Constant.kind));
         return append_ast_constant(writer, e->v.Constant.value);
     case JoinedStr_kind:
         return append_joinedstr(writer, e, false);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Correctly unparse explicit ``u`` prefix for strings when postponed
	`2`	`+evaluation for annotations activated. Patch by Batuhan Taskaya.`
Original file line number	Diff line number	Diff line change
`@@ -875,6 +875,8 @@ append_ast_expr(_PyUnicodeWriter *writer, expr_ty e, int level)`
`875`	`875`	`if (e->v.Constant.value == Py_Ellipsis) {`
`876`	`876`	`APPEND_STR_FINISH("...");`
`877`	`877`	`}`
	`878`	`+ APPEND_STR_IF(e->v.Constant.kind != NULL,`
	`879`	`+ PyUnicode_AS_DATA(e->v.Constant.kind));`
`878`	`880`	`return append_ast_constant(writer, e->v.Constant.value);`
`879`	`881`	`case JoinedStr_kind:`
`880`	`882`	`return append_joinedstr(writer, e, false);`