Merge branch 'dev'

IllusiveMan196 · Apr 22, 2024 · e2b177c · e2b177c
2 parents e84703b + e837124
commit e2b177c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.9.2
+
+### Extensions and API:
+* restore 1.8.0-style naming of scripts
+
 ## 1.9.1
 
 ### Minor:

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__ == "scripts.xyz_grid"][0].module
+xyz_grid = [x for x in scripts.scripts_data if x.script_class.__module__ == "xyz_grid.py"][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
@@ -8,9 +8,7 @@
 
 
 def load_module(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_spec = importlib.util.spec_from_file_location(os.path.basename(path), path)
     module = importlib.util.module_from_spec(module_spec)
     module_spec.loader.exec_module(module)