From 993113b2b77d9df9181728ebf20b81dd0df6b194 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 10 Jun 2019 18:28:59 +0200 Subject: [PATCH] Move typeclass init later to reduce chance of misordered imports. Resolve #1852. --- evennia/__init__.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/evennia/__init__.py b/evennia/__init__.py index 3b8ecf425e..7586bf2d87 100644 --- a/evennia/__init__.py +++ b/evennia/__init__.py @@ -241,17 +241,6 @@ def _init(): from .utils.containers import GLOBAL_SCRIPTS from .utils.containers import OPTION_CLASSES - # typeclases - from .utils.utils import class_from_module - BASE_ACCOUNT_TYPECLASS = class_from_module(settings.BASE_ACCOUNT_TYPECLASS) - BASE_OBJECT_TYPECLASS = class_from_module(settings.BASE_OBJECT_TYPECLASS) - BASE_CHARACTER_TYPECLASS = class_from_module(settings.BASE_CHARACTER_TYPECLASS) - BASE_ROOM_TYPECLASS = class_from_module(settings.BASE_ROOM_TYPECLASS) - BASE_EXIT_TYPECLASS = class_from_module(settings.BASE_EXIT_TYPECLASS) - BASE_CHANNEL_TYPECLASS = class_from_module(settings.BASE_CHANNEL_TYPECLASS) - BASE_SCRIPT_TYPECLASS = class_from_module(settings.BASE_SCRIPT_TYPECLASS) - BASE_GUEST_TYPECLASS = class_from_module(settings.BASE_GUEST_TYPECLASS) - # initialize the doc string global __doc__ __doc__ = ansi.parse_ansi(DOCSTRING) @@ -385,6 +374,18 @@ def _init(): del SystemCmds del _EvContainer + # typeclases + from .utils.utils import class_from_module + BASE_ACCOUNT_TYPECLASS = class_from_module(settings.BASE_ACCOUNT_TYPECLASS) + BASE_OBJECT_TYPECLASS = class_from_module(settings.BASE_OBJECT_TYPECLASS) + BASE_CHARACTER_TYPECLASS = class_from_module(settings.BASE_CHARACTER_TYPECLASS) + BASE_ROOM_TYPECLASS = class_from_module(settings.BASE_ROOM_TYPECLASS) + BASE_EXIT_TYPECLASS = class_from_module(settings.BASE_EXIT_TYPECLASS) + BASE_CHANNEL_TYPECLASS = class_from_module(settings.BASE_CHANNEL_TYPECLASS) + BASE_SCRIPT_TYPECLASS = class_from_module(settings.BASE_SCRIPT_TYPECLASS) + BASE_GUEST_TYPECLASS = class_from_module(settings.BASE_GUEST_TYPECLASS) + del class_from_module + def set_trace(term_size=(140, 40), debugger="auto"): """