Run black. Resolve circular import issues in components contrib.

evennia/utils/evmenu.py

@@ -286,13 +286,13 @@ from evennia.utils.evtable import EvColumn, EvTable
 from evennia.utils.utils import (
     crop,
     dedent,
+    inherits_from,
     is_iter,
     m_len,
     make_iter,
     mod_import,
     pad,
     to_str,
-    inherits_from,
 )
 
 # read from protocol NAWS later?
@@ -1209,10 +1209,12 @@ class EvMenu:
 
         # check if the caller is using a screenreader
         screenreader_mode = False
-        if sessions := getattr(self.caller, 'sessions', None):
-            screenreader_mode = any(sess.protocol_flags.get("SCREENREADER") for sess in sessions.all())
+        if sessions := getattr(self.caller, "sessions", None):
+            screenreader_mode = any(
+                sess.protocol_flags.get("SCREENREADER") for sess in sessions.all()
+            )
         # the caller doesn't have a session; check it directly
-        elif hasattr(self.caller, 'protocol_flags'):
+        elif hasattr(self.caller, "protocol_flags"):
             screenreader_mode = self.caller.protocol_flags.get("SCREENREADER")
 
         ncols = 1 if screenreader_mode else _MAX_TEXT_WIDTH // table_width_max

evennia/utils/evmore.py

@@ -36,11 +36,12 @@ the `caller.msg()` construct every time the page is updated.
 ----
 
 """
-import evennia
 from django.conf import settings
 from django.core.paginator import Paginator
 from django.db.models.query import QuerySet
 from django.utils.translation import gettext as _
+
+import evennia
 from evennia.commands import cmdhandler
 from evennia.commands.cmdset import CmdSet
 from evennia.commands.command import Command

evennia/utils/test_resources.py

@@ -26,21 +26,27 @@ import re
 import sys
 import types
 
-import evennia
 from django.conf import settings
 from django.test import TestCase, override_settings
+from mock import MagicMock, Mock, patch
+from twisted.internet.defer import Deferred
+
+import evennia
 from evennia import settings_default
 from evennia.accounts.accounts import DefaultAccount
 from evennia.commands.command import InterruptCommand
 from evennia.commands.default.muxcommand import MuxCommand
-from evennia.objects.objects import DefaultCharacter, DefaultExit, DefaultObject, DefaultRoom
+from evennia.objects.objects import (
+    DefaultCharacter,
+    DefaultExit,
+    DefaultObject,
+    DefaultRoom,
+)
 from evennia.scripts.scripts import DefaultScript
 from evennia.server.serversession import ServerSession
 from evennia.utils import ansi, create
 from evennia.utils.idmapper.models import flush_cache
 from evennia.utils.utils import all_from_module, to_str
-from mock import MagicMock, Mock, patch
-from twisted.internet.defer import Deferred
 
 _RE_STRIP_EVMENU = re.compile(r"^\+|-+\+|\+-+|--+|\|(?:\s|$)", re.MULTILINE)
 

evennia/utils/tests/test_funcparser.py

@@ -10,10 +10,11 @@ from ast import literal_eval
 from unittest.mock import MagicMock, patch
 
 from django.test import TestCase, override_settings
-from evennia.utils import funcparser, test_resources
 from parameterized import parameterized
 from simpleeval import simple_eval
 
+from evennia.utils import funcparser, test_resources
+
 
 def _test_callable(*args, **kwargs):
     kwargs.pop("funcparser", None)

evennia/utils/utils.py

@@ -28,7 +28,6 @@ from os.path import join as osjoin
 from string import punctuation
 from unicodedata import east_asian_width
 
-import evennia
 from django.apps import apps
 from django.conf import settings
 from django.core.exceptions import ValidationError as DjangoValidationError
@@ -36,12 +35,14 @@ 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
 
+import evennia
+from evennia.utils import logger
+
 _MULTIMATCH_TEMPLATE = settings.SEARCH_MULTIMATCH_TEMPLATE
 _EVENNIA_DIR = settings.EVENNIA_DIR
 _GAME_DIR = settings.GAME_DIR