Separate out and expand nonlocal tests

JelleZijlstra · JelleZijlstra · commit fd4fe5ce1474 · 2023-05-10T17:12:43.000-07:00
diff --git a/Lib/test/test_type_params.py b/Lib/test/test_type_params.py
@@ -115,16 +115,6 @@ class ClassA[X]:
         self.assertEqual(X.__name__, "X")
         self.assertIs(cls.__annotations__["X"], int)
 
-    def test_name_non_collision_11(self):
-        code = """
-            def outer():
-                X = 1
-                def inner[X]():
-                    nonlocal X
-                return X
-            """
-        check_syntax_error(self, code)
-
     def test_name_non_collision_13(self):
         ns = run_code("""
             X = 1
@@ -154,6 +144,49 @@ def test_disallowed_expressions(self):
         check_syntax_error(self, "def f[T](y: (x := Sequence[T])): pass")
 
 
+class NonlocalTest(unittest.TestCase):
+
+    def test_nonlocal_disallowed_01(self):
+        code = """
+            def outer():
+                X = 1
+                def inner[X]():
+                    nonlocal X
+                return X
+            """
+        check_syntax_error(self, code)
+
+    def test_nonlocal_disallowed_02(self):
+        code = """
+            def outer2[T]():
+                def inner1():
+                    nonlocal T
+        """
+        check_syntax_error(self, textwrap.dedent(code))
+
+    def test_nonlocal_disallowed_03(self):
+        code = """
+            class Cls[T]:
+                nonlocal T
+        """
+        check_syntax_error(self, textwrap.dedent(code))
+
+    def test_nonlocal_allowed(self):
+        code = """
+            def func[T]():
+                T = "func"
+                def inner():
+                    nonlocal T
+                    T = "inner"
+                inner()
+                assert T == "inner"
+        """
+        ns = run_code(code)
+        func = ns["func"]
+        T, = func.__type_params__
+        self.assertEqual(T.__name__, "T")
+
+
 class TypeParamsAccessTest(unittest.TestCase):
     def test_class_access_01(self):
         ns = run_code("""
@@ -305,14 +338,6 @@ class C[T]:
         cls = ns["C"]
         self.assertEqual(cls.Alias.__value__, "class")
 
-    def test_nonlocal(self):
-        code = """
-            def outer2[T]():
-                def inner1():
-                    nonlocal T
-        """
-        check_syntax_error(self, textwrap.dedent(code))
-
     def test_shadowing_nonlocal(self):
         ns = run_code("""
             def outer[T]():
