use isnewscope

Technologicat · Technologicat · commit f6cdf2009068 · 2022-02-01T01:29:15.000+02:00
diff --git a/unpythonic/syntax/tests/test_conts_multishot.py b/unpythonic/syntax/tests/test_conts_multishot.py
@@ -46,6 +46,7 @@
     from mcpyrate.walkers import ASTTransformer
 
     from unpythonic.syntax import get_cc, iscontinuation
+    from unpythonic.syntax.scopeanalyzer import isnewscope
 
     def myield_function(tree, syntax, **kw):
         """[syntax, name/expr] Yield from a multi-shot generator.
@@ -197,9 +198,7 @@ class MultishotYieldTransformer(ASTTransformer):
             def transform(self, tree):
                 if is_captured_value(tree):  # do not recurse into hygienic captures
                     return tree
-                # respect scope boundaries
-                if type(tree) in (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef,
-                                  ast.ListComp, ast.DictComp, ast.SetComp, ast.GeneratorExp):
+                if isnewscope(tree):  # respect scope boundaries
                     return tree
 
                 # `k = myield[value]`
@@ -263,9 +262,7 @@ class ReturnToRaiseStopIterationTransformer(ASTTransformer):
             def transform(self, tree):
                 if is_captured_value(tree):  # do not recurse into hygienic captures
                     return tree
-                # respect scope boundaries
-                if type(tree) in (ast.FunctionDef, ast.AsyncFunctionDef, ast.ClassDef,
-                                  ast.ListComp, ast.DictComp, ast.SetComp, ast.GeneratorExp):
+                if isnewscope(tree):  # respect scope boundaries
                     return tree
 
                 if type(tree) is ast.Return:
