monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Make apworlds function mostly before Python 3.10

This commit is contained in:
Fabian Dill 2022-12-19 06:49:38 +01:00 committed by Fabian Dill
parent 4cfc73b582
commit 092e8d14ad
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -16,6 +16,7 @@ import setuptools
from Launcher import components, icon_paths from Launcher import components, icon_paths
from Utils import version_tuple, is_windows, is_linux from Utils import version_tuple, is_windows, is_linux
# On Python < 3.10 LogicMixin is not currently supported.
apworlds: set = { apworlds: set = {
"Subnautica", "Subnautica",
"Factorio", "Factorio",

12
worlds/__init__.py
View File

@ -52,14 +52,20 @@ world_sources.sort()
for world_source in world_sources: for world_source in world_sources:
if world_source.is_zip: if world_source.is_zip:
importer = zipimport.zipimporter(os.path.join(folder, world_source.path)) importer = zipimport.zipimporter(os.path.join(folder, world_source.path))
spec = importer.find_spec(world_source.path.split(".", 1)[0]) if hasattr(importer, "find_spec"): # new in Python 3.10
mod = importlib.util.module_from_spec(spec) spec = importer.find_spec(world_source.path.split(".", 1)[0])
mod = importlib.util.module_from_spec(spec)
else: # TODO: remove with 3.8 support
mod = importer.load_module(world_source.path.split(".", 1)[0])
mod.__package__ = f"worlds.{mod.__package__}" mod.__package__ = f"worlds.{mod.__package__}"
mod.__name__ = f"worlds.{mod.__name__}" mod.__name__ = f"worlds.{mod.__name__}"
sys.modules[mod.__name__] = mod sys.modules[mod.__name__] = mod
with warnings.catch_warnings(): with warnings.catch_warnings():
warnings.filterwarnings("ignore", message="__package__ != __spec__.parent") warnings.filterwarnings("ignore", message="__package__ != __spec__.parent")
importer.exec_module(mod) # Found no equivalent for < 3.10
if hasattr(importer, "exec_module"):
importer.exec_module(mod)
else: else:
importlib.import_module(f".{world_source.path}", "worlds") importlib.import_module(f".{world_source.path}", "worlds")