don't resolve global variables until runtime

Author: craigbarratt

custom_components/pyscript/eval.py

@@ -545,9 +545,10 @@ async def resolve_nonlocals(self, ast_ctx):
                     self.local_sym_table[var_name] = sym_table[var_name]
                     break
             else:
-                val = await ast_ctx.ast_name(ast.Name(id=var_name, ctx=ast.Load()))
-                if isinstance(val, EvalName) and got_dot < 0:
-                    raise SyntaxError(f"no binding for nonlocal '{var_name}' found")
+                if var_name in nonlocal_names:
+                    val = await ast_ctx.ast_name(ast.Name(id=var_name, ctx=ast.Load()))
+                    if isinstance(val, EvalName) and got_dot < 0:
+                        raise SyntaxError(f"no binding for nonlocal '{var_name}' found")
 
     def get_decorators(self):
         """Return the function decorators."""

tests/test_unit_eval.py

@@ -338,6 +338,16 @@ def foo(arg=6):
     ],
     [
         """
+def func():
+    global x
+    x = 134
+func()
+x
+""",
+        134,
+    ],
+    [
+        """
 def foo0(arg=6):
     bar = 100
     bar2 = 1000
@@ -404,6 +414,19 @@ def foo1(arg=6):
     ],
     [
         """
+def f():
+    def b():
+        return s+g
+    s = "hello "
+    return b
+b = f()
+g = "world"
+b()
+""",
+        "hello world",
+    ],
+    [
+        """
 @dec_test("abc")
 def foo(cnt=4):
     sum = 0