bpo-34939: Allow annotated global names in module namespace (GH-9844)

pablogsal · web-flow · commit de2aea0ff02f · 2018-10-14T18:01:03.000+01:00
Allow annotated global names in the module namespace after the symbol is
declared as global. Previously, only symbols annotated before they are declared
as global (i.e. inside a function) were allowed. This change allows symbols to be
declared as global before the annotation happens in the global scope.
diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py
@@ -144,6 +144,20 @@ def test_annotated(self):
         self.assertTrue(st4.lookup('x').is_local())
         self.assertFalse(st4.lookup('x').is_annotated())
 
+        # Test that annotations in the global scope are valid after the
+        # variable is declared as nonlocal.
+        st5 = symtable.symtable('global x\nx: int', 'test', 'exec')
+        self.assertTrue(st5.lookup("x").is_global())
+
+        # Test that annotations for nonlocals are valid after the
+        # variable is declared as nonlocal.
+        st6 = symtable.symtable('def g():\n'
+                                '    x = 2\n'
+                                '    def f():\n'
+                                '        nonlocal x\n'
+                                '    x: int',
+                                'test', 'exec')
+
     def test_imported(self):
         self.assertTrue(self.top.lookup("sys").is_imported())
 
diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-10-13-17-40-15.bpo-34939.0gpxlJ.rst b/Misc/NEWS.d/next/Core and Builtins/2018-10-13-17-40-15.bpo-34939.0gpxlJ.rst
@@ -0,0 +1,2 @@
+Allow annotated names in module namespace that are declared global before
+the annotation happens. Patch by Pablo Galindo.
diff --git a/Python/symtable.c b/Python/symtable.c
@@ -1175,6 +1175,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)
                 VISIT_QUIT(st, 0);
             }
             if ((cur & (DEF_GLOBAL | DEF_NONLOCAL))
+                && (st->st_cur->ste_symbols != st->st_global)
                 && s->v.AnnAssign.simple) {
                 PyErr_Format(PyExc_SyntaxError,
                              cur & DEF_GLOBAL ? GLOBAL_ANNOT : NONLOCAL_ANNOT,

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Allow annotated names in module namespace that are declared global before`
	`2`	`+the annotation happens. Patch by Pablo Galindo.`
Original file line number	Diff line number	Diff line change
`@@ -1175,6 +1175,7 @@ symtable_visit_stmt(struct symtable *st, stmt_ty s)`
`1175`	`1175`	`VISIT_QUIT(st, 0);`
`1176`	`1176`	`}`
`1177`	`1177`	`if ((cur & (DEF_GLOBAL \| DEF_NONLOCAL))`
	`1178`	`+ && (st->st_cur->ste_symbols != st->st_global)`
`1178`	`1179`	`&& s->v.AnnAssign.simple) {`
`1179`	`1180`	`PyErr_Format(PyExc_SyntaxError,`
`1180`	`1181`	`cur & DEF_GLOBAL ? GLOBAL_ANNOT : NONLOCAL_ANNOT,`