diff --git a/evennia/server/server.py b/evennia/server/server.py index 745dfeb480..db2548e8f9 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -31,6 +31,7 @@ from django.conf import settings from django.db import connection from django.db.utils import OperationalError from django.utils.translation import gettext as _ + from evennia.accounts.models import AccountDB from evennia.scripts.models import ScriptDB from evennia.server.models import ServerConfig diff --git a/evennia/server/tests/test_launcher.py b/evennia/server/tests/test_launcher.py index 2b894a0720..e0c1c0c27a 100644 --- a/evennia/server/tests/test_launcher.py +++ b/evennia/server/tests/test_launcher.py @@ -7,13 +7,14 @@ import os import pickle from anything import Something -from evennia.server import evennia_launcher -from evennia.server.portal import amp from mock import MagicMock, create_autospec, patch from twisted.internet import reactor from twisted.internet.base import DelayedCall from twisted.trial.unittest import TestCase as TwistedTestCase +from evennia.server import evennia_launcher +from evennia.server.portal import amp + DelayedCall.debug = True diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py index d208e554f1..d49143f970 100644 --- a/evennia/utils/dbserialize.py +++ b/evennia/utils/dbserialize.py @@ -30,6 +30,7 @@ except ImportError: from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.utils.safestring import SafeString + from evennia.utils import logger from evennia.utils.utils import is_iter, to_bytes, uses_database diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py index 1430bc31d4..4f4ecddfc4 100644 --- a/evennia/utils/evmenu.py +++ b/evennia/utils/evmenu.py @@ -273,12 +273,22 @@ from django.conf import settings # i18n from django.utils.translation import gettext as _ + from evennia import CmdSet, Command from evennia.commands import cmdhandler from evennia.utils import logger from evennia.utils.ansi import strip_ansi from evennia.utils.evtable import EvColumn, EvTable -from evennia.utils.utils import crop, dedent, is_iter, m_len, make_iter, mod_import, pad, to_str +from evennia.utils.utils import ( + crop, + dedent, + is_iter, + m_len, + make_iter, + mod_import, + pad, + to_str, +) # read from protocol NAWS later? _MAX_TEXT_WIDTH = settings.CLIENT_DEFAULT_WIDTH diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py index f6837a79a0..8517344f61 100644 --- a/evennia/utils/evtable.py +++ b/evennia/utils/evtable.py @@ -118,6 +118,7 @@ from copy import copy, deepcopy from textwrap import TextWrapper from django.conf import settings + from evennia.utils.ansi import ANSIString from evennia.utils.utils import display_len as d_len from evennia.utils.utils import is_iter, justify diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 3ad2bff9b5..b96338dead 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -34,12 +34,13 @@ from django.core.validators import validate_email as django_validate_email from django.utils import timezone from django.utils.html import strip_tags from django.utils.translation import gettext as _ -from evennia.utils import logger from simpleeval import simple_eval from twisted.internet import reactor, threads from twisted.internet.defer import returnValue # noqa - used as import target from twisted.internet.task import deferLater +from evennia.utils import logger + _MULTIMATCH_TEMPLATE = settings.SEARCH_MULTIMATCH_TEMPLATE _EVENNIA_DIR = settings.EVENNIA_DIR _GAME_DIR = settings.GAME_DIR