adds __name__ for script files; fixes #38

Author: craigbarratt

custom_components/pyscript/__init__.py

@@ -209,14 +209,16 @@ def glob_files(load_paths, config):
                     rel_import_path = f"{path}/mod_name"
                 if path == "":
                     global_ctx_name = f"file.{mod_name}"
+                    fq_mod_name = mod_name
                 else:
                     global_ctx_name = f"{path}.{mod_name}"
+                    fq_mod_name = global_ctx_name
                 if check_config:
                     _LOGGER.debug("load_scripts: checking %s in %s", mod_name, apps_config)
                     if not isinstance(apps_config, dict) or mod_name not in apps_config:
                         _LOGGER.debug("load_scripts: skipping %s because config not present", this_path)
                         continue
-                source_files.append([global_ctx_name, this_path, rel_import_path])
+                source_files.append([global_ctx_name, this_path, rel_import_path, fq_mod_name])
         return source_files
 
     load_paths = [
@@ -226,8 +228,11 @@ def glob_files(load_paths, config):
     ]
 
     source_files = await hass.async_add_executor_job(glob_files, load_paths, config)
-    for global_ctx_name, source_file, rel_import_path in source_files:
+    for global_ctx_name, source_file, rel_import_path, fq_mod_name in source_files:
         global_ctx = GlobalContext(
-            global_ctx_name, global_sym_table={}, manager=GlobalContextMgr, rel_import_path=rel_import_path
+            global_ctx_name,
+            global_sym_table={"__name__": fq_mod_name},
+            manager=GlobalContextMgr,
+            rel_import_path=rel_import_path,
         )
         await GlobalContextMgr.load_file(source_file, global_ctx)

tests/test_function.py

@@ -184,7 +184,7 @@ def func1(var_name=None, value=None):
 
     seq_num += 1
     log.info(f"func1 var = {var_name}, value = {value}")
-    pyscript.done = [seq_num, var_name, int(value), sqrt(1024)]
+    pyscript.done = [seq_num, var_name, int(value), sqrt(1024), __name__]
 
 @state_trigger("pyscript.f1var1 == '1' or pyscript.f2var2 == '2' or pyscript.no_such_var == '10' or pyscript.no_such_var.attr == 100")
 @state_active("pyscript.f2var3 == '3' and pyscript.f2var4 == '4'")
@@ -378,6 +378,7 @@ def func8(var_name=None, value=None, old_value=None):
         "pyscript.f1var1",
         1,
         32,
+        "hello",
     ]
     assert "func1 var = pyscript.f1var1, value = 1" in caplog.text
 
@@ -392,6 +393,7 @@ def func8(var_name=None, value=None, old_value=None):
         "pyscript.f1var1",
         1,
         32,
+        "hello",
     ]
 
     seq_num += 1