Updated tests, fixed scoping issues

ian-coccimiglio · ian-coccimiglio · commit e260032af6f4 · 2025-03-21T00:26:07.000-07:00
diff --git a/src/scyjava/_script.py b/src/scyjava/_script.py
@@ -91,15 +91,19 @@ def apply(self, arg):
                         # Last statement looks like an expression. Evaluate!
                         last = ast.Expression(block.body.pop().value)
 
-                    _globals = {name: module for name, module in sys.modules.items() if name != '__main__'}
-
+                    # _globals = {name: module for name, module in sys.modules.items() if name != '__main__'}
+                    # _globals = {__builtins__: builtins, '__name__': '__main__','__file__': '<string>', '__package__': None,}
+                    # _globals.update(globals())
+                    # _globals = None
+                    # _globals = locals()
+                    script_globals = script_locals
                     exec(
-                        compile(block, "<string>", mode="exec"), _globals, script_locals
+                        compile(block, "<string>", mode="exec"), script_globals, script_locals
                     )
                     if last is not None:
                         return_value = eval(
                             compile(last, "<string>", mode="eval"),
-                            _globals,
+                            script_globals,
                             script_locals,
                         )
                 except Exception:
diff --git a/tests/it/script_scope.py b/tests/it/script_scope.py
@@ -29,6 +29,7 @@
 script = """
 #@ int age
 #@output String cbrt_age
+import numpy as np
 import math
 
 def calculate_cbrt(age):
@@ -57,5 +58,5 @@ def calculate_cbrt(age):
         sys.stderr.write(f"{trace}\n")
     raise e
 
-assert return_value == "The rounded cube root of my age is 2"
 assert statement == "2"
+assert return_value == "The rounded cube root of my age is 2"
