Move tests to test_symtable.py

Author: pablogsal

Lib/test/test_grammar.py

@@ -7,7 +7,6 @@
 import sys
 # testing import *
 from sys import *
-import textwrap
 
 # different import patterns to check that __annotations__ does not interfere
 # with import machinery
@@ -302,12 +301,6 @@ def one():
         [list][0]: type
         my_lst[one()-1]: int = 5
         self.assertEqual(my_lst, [5])
-        exec(textwrap.dedent("""
-            def f():
-                global x
-                x = 1
-            x:int = 3
-            """))
 
     def test_var_annot_syntax_errors(self):
         # parser pass

Lib/test/test_symtable.py

@@ -144,6 +144,16 @@ 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())