Merge pull request AUTOMATIC1111#15532 from huchenlei/fix_module

Fix cls.__module__ value in extension script
IllusiveMan196 · Apr 21, 2024 · c0eaeb1 · c0eaeb1
2 parents 9bcfb92 + a95326b
commit c0eaeb1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/extensions-builtin/hypertile/scripts/hypertile_xyz.py b/extensions-builtin/hypertile/scripts/hypertile_xyz.py
@@ -1,7 +1,7 @@
 from modules import scripts
 from modules.shared import opts
 
-xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "xyz_grid.py"][0].module
+xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "scripts.xyz_grid"][0].module
 
 def int_applier(value_name:str, min_range:int = -1, max_range:int = -1):
     """

diff --git a/modules/script_loading.py b/modules/script_loading.py
@@ -9,15 +9,13 @@
 
 
 def load_module(path):
-    module_spec = importlib.util.spec_from_file_location(os.path.basename(path), path)
+    module_name, _ = os.path.splitext(os.path.basename(path))
+    full_module_name = "scripts." + module_name
+    module_spec = importlib.util.spec_from_file_location(full_module_name, path)
     module = importlib.util.module_from_spec(module_spec)
     module_spec.loader.exec_module(module)
-
     loaded_scripts[path] = module
-
-    module_name, _ = os.path.splitext(os.path.basename(path))
-    sys.modules["scripts." + module_name] = module
-
+    sys.modules[full_module_name] = module
     return module