Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Raise clearer error on circular call of GLOBAL_SCRIPTS. Resolve #2983.

Browse source
This commit is contained in:
Griatch 2022-11-15 22:03:06 +01:00
parent d8924837f9
commit c62bda9d77
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/utils/containers.py
View file

@ -15,7 +15,6 @@ from pickle import dumps
from django.conf import settings from django.conf import settings
from django.db.utils import OperationalError, ProgrammingError from django.db.utils import OperationalError, ProgrammingError
from evennia.utils import logger from evennia.utils import logger
from evennia.utils.utils import callables_from_module, class_from_module from evennia.utils.utils import callables_from_module, class_from_module
@ -226,6 +225,13 @@ class GlobalScriptContainer(Container):
res = self._get_scripts(key) res = self._get_scripts(key)
if not res: if not res:
if key in self.loaded_data: if key in self.loaded_data:
if key not in self.typeclass_storage:
# this means we are trying to load in a loop
raise RuntimeError(
f"Trying to access `GLOBAL_SCRIPTS.{key}` before scripts have finished "
"initializing. This can happen if accessing GLOBAL_SCRIPTS from the same "
"module the script is defined in."
)
# recreate if we have the info # recreate if we have the info
return self._load_script(key) or default return self._load_script(key) or default
return default return default