Fix SystemError when nested function has annotation on positional-only argument (pythonGH-17826)

asottile · pablogsal · commit ec007cb43faf · 2020-01-05T01:57:21.000Z
diff --git a/Lib/test/test_positional_only_arg.py b/Lib/test/test_positional_only_arg.py
@@ -15,6 +15,10 @@ def global_pos_only_and_normal(a, /, b):
 def global_pos_only_defaults(a=1, /, b=2):
     return a, b
 
+def global_inner_has_pos_only():
+    def f(x: int, /): ...
+    return f
+
 
 class PositionalOnlyTestCase(unittest.TestCase):
 
@@ -412,6 +416,9 @@ def method(self, /):
 
         self.assertEqual(C().method(), sentinel)
 
+    def test_annotations(self):
+        assert global_inner_has_pos_only().__annotations__ == {'x': int}
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-01-04-17-25-34.bpo-39215.xiqiIz.rst b/Misc/NEWS.d/next/Core and Builtins/2020-01-04-17-25-34.bpo-39215.xiqiIz.rst
@@ -0,0 +1,2 @@
+Fix ``SystemError`` when nested function has annotation on positional-only
+argument - by Anthony Sottile.
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1717,6 +1717,8 @@ static int
 symtable_visit_annotations(struct symtable *st, stmt_ty s,
                            arguments_ty a, expr_ty returns)
 {
+    if (a->posonlyargs && !symtable_visit_argannotations(st, a->posonlyargs))
+        return 0;
     if (a->args && !symtable_visit_argannotations(st, a->args))
         return 0;
     if (a->vararg && a->vararg->annotation)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix ``SystemError`` when nested function has annotation on positional-only
	`2`	`+argument - by Anthony Sottile.`
Original file line number	Diff line number	Diff line change
`@@ -1717,6 +1717,8 @@ static int`
`1717`	`1717`	`symtable_visit_annotations(struct symtable *st, stmt_ty s,`
`1718`	`1718`	`arguments_ty a, expr_ty returns)`
`1719`	`1719`	`{`
	`1720`	`+ if (a->posonlyargs && !symtable_visit_argannotations(st, a->posonlyargs))`
	`1721`	`+ return 0;`
`1720`	`1722`	`if (a->args && !symtable_visit_argannotations(st, a->args))`
`1721`	`1723`	`return 0;`
`1722`	`1724`	`if (a->vararg && a->vararg->annotation)`