From 89d1336cdae691d7fea506b20c0fb786308b664b Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Mon, 28 Nov 2022 19:55:02 +0100
Subject: [PATCH] Apply black

---
 evennia/commands/default/general.py           |  1 +
 .../contrib/game_systems/clothing/clothing.py |  2 ++
 evennia/contrib/grid/wilderness/wilderness.py | 28 +++++++++++++------
 .../contrib/rpg/character_creator/tests.py    |  2 ++
 evennia/contrib/rpg/rpsystem/rpsystem.py      | 20 ++++++++-----
 .../contrib/tutorials/evadventure/chargen.py  |  1 +
 .../evadventure/tests/test_chargen.py         |  3 +-
 evennia/prototypes/prototypes.py              |  1 +
 evennia/scripts/tickerhandler.py              |  3 +-
 evennia/typeclasses/managers.py               |  1 +
 evennia/utils/evmenu.py                       | 12 +++++++-
 evennia/utils/evtable.py                      |  1 +
 evennia/utils/tests/test_utils.py             |  5 ++--
 evennia/utils/utils.py                        |  3 +-
 evennia/utils/verb_conjugation/tests.py       |  3 +-
 15 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index 381a0d4011..4eacee26f4 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -4,6 +4,7 @@ General Character commands usually available to all characters
 import re
 
 from django.conf import settings
+
 from evennia.typeclasses.attributes import NickTemplateInvalid
 from evennia.utils import utils
 
diff --git a/evennia/contrib/game_systems/clothing/clothing.py b/evennia/contrib/game_systems/clothing/clothing.py
index c006771d3c..c368916517 100644
--- a/evennia/contrib/game_systems/clothing/clothing.py
+++ b/evennia/contrib/game_systems/clothing/clothing.py
@@ -73,7 +73,9 @@ with which to test the system:
 
 """
 from collections import defaultdict
+
 from django.conf import settings
+
 from evennia import DefaultCharacter, DefaultObject, default_cmds
 from evennia.commands.default.muxcommand import MuxCommand
 from evennia.utils import at_search_result, evtable, inherits_from, iter_to_str
diff --git a/evennia/contrib/grid/wilderness/wilderness.py b/evennia/contrib/grid/wilderness/wilderness.py
index 07274bf120..5607f3f4c3 100644
--- a/evennia/contrib/grid/wilderness/wilderness.py
+++ b/evennia/contrib/grid/wilderness/wilderness.py
@@ -123,8 +123,9 @@ from evennia import (
     create_object,
     create_script,
 )
-from evennia.utils import inherits_from
 from evennia.typeclasses.attributes import AttributeProperty
+from evennia.utils import inherits_from
+
 
 def create_wilderness(name="default", mapprovider=None, preserve_items=False):
     """
@@ -218,7 +219,7 @@ class WildernessScript(DefaultScript):
     # Stores a dictionary of items on the map with their coordinates
     # The key is the item, the value are the coordinates as (x, y) tuple.
     itemcoordinates = AttributeProperty()
-    
+
     # Determines whether or not rooms are recycled despite containing non-player objects
     # True means that leaving behind a non-player object will prevent the room from being recycled
     # in order to preserve the object
@@ -243,7 +244,7 @@ class WildernessScript(DefaultScript):
         # allows quick retrieval if a new room is needed without having to
         # create it.
         self.db.unused_rooms = []
-        
+
     def at_server_start(self):
         """
         Called after the server is started or reloaded.
@@ -300,7 +301,11 @@ class WildernessScript(DefaultScript):
         Returns:
             [Object, ]: list of Objects at coordinates
         """
-        result = [ item for item, item_coords in self.itemcoordinates.items() if item_coords == coordinates and item is not None ]
+        result = [
+            item
+            for item, item_coords in self.itemcoordinates.items()
+            if item_coords == coordinates and item is not None
+        ]
         return list(result)
 
     def move_obj(self, obj, new_coordinates):
@@ -335,7 +340,13 @@ class WildernessScript(DefaultScript):
                     # Should we preserve rooms with any objects?
                     if self.preserve_items:
                         # Yes - check if ANY objects besides the exits are in old_room
-                        if len([ob for ob in old_room.contents if not inherits_from(ob, WildernessExit)]):
+                        if len(
+                            [
+                                ob
+                                for ob in old_room.contents
+                                if not inherits_from(ob, WildernessExit)
+                            ]
+                        ):
                             # There is, so we'll create a new room
                             room = self._create_room(new_coordinates, obj)
                         else:
@@ -423,7 +434,7 @@ class WildernessScript(DefaultScript):
         """
         Moves a room back to storage. If room is not a WildernessRoom or there
         is something left inside the room, then this does nothing.
-        
+
         Implementation note: If `preserve_items` is False (the default) then any
         objects left in the rooms will be moved to None. You may want to implement
         your own cleanup or recycling routine for these objects.
@@ -625,11 +636,11 @@ class WildernessRoom(DefaultRoom):
 
         name += " {0}".format(self.coordinates)
         return name
-    
+
     def get_display_desc(self, looker, **kwargs):
         """
         Displays the description of the room. This is a core evennia hook.
-        
+
         Allows the room's description to be customized in an ndb value,
         avoiding having to write to the database on moving.
         """
@@ -641,6 +652,7 @@ class WildernessRoom(DefaultRoom):
         # Otherwise, use the normal description hook.
         return super().get_display_desc(looker, **kwargs)
 
+
 class WildernessExit(DefaultExit):
     """
     This is an Exit object used inside a WildernessRoom. Instead of changing
diff --git a/evennia/contrib/rpg/character_creator/tests.py b/evennia/contrib/rpg/character_creator/tests.py
index b9691dc8c5..4ff180a3dd 100644
--- a/evennia/contrib/rpg/character_creator/tests.py
+++ b/evennia/contrib/rpg/character_creator/tests.py
@@ -1,6 +1,8 @@
 from unittest.mock import patch
+
 from django.conf import settings
 from django.test import override_settings
+
 from evennia import DefaultCharacter
 from evennia.commands.default import account
 from evennia.utils import inherits_from
diff --git a/evennia/contrib/rpg/rpsystem/rpsystem.py b/evennia/contrib/rpg/rpsystem/rpsystem.py
index 81322c73d2..9d984882a1 100644
--- a/evennia/contrib/rpg/rpsystem/rpsystem.py
+++ b/evennia/contrib/rpg/rpsystem/rpsystem.py
@@ -149,9 +149,10 @@ Extra Installation Instructions:
 
 """
 import re
-from string import punctuation
 from collections import defaultdict
+from string import punctuation
 
+import inflect
 from django.conf import settings
 
 from evennia.commands.cmdset import CmdSet
@@ -159,9 +160,13 @@ from evennia.commands.command import Command
 from evennia.objects.models import ObjectDB
 from evennia.objects.objects import DefaultCharacter, DefaultObject
 from evennia.utils import ansi, logger
-from evennia.utils.utils import iter_to_str, lazy_property, make_iter, variable_from_module
+from evennia.utils.utils import (
+    iter_to_str,
+    lazy_property,
+    make_iter,
+    variable_from_module,
+)
 
-import inflect
 _INFLECT = inflect.engine()
 
 _AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
@@ -1525,6 +1530,7 @@ class ContribRPObject(DefaultObject):
         """
         Get the ‘characters’ component of the object description. Called by return_appearance.
         """
+
         def _filter_visible(obj_list):
             return (obj for obj in obj_list if obj != looker and obj.access(looker, "view"))
 
@@ -1533,7 +1539,7 @@ class ContribRPObject(DefaultObject):
             char.get_display_name(looker, pose=pose, **kwargs) for char in characters
         )
 
-        return f"\n{character_names}" if character_names else ""        
+        return f"\n{character_names}" if character_names else ""
 
     def get_display_things(self, looker, pose=True, **kwargs):
         """
@@ -1562,9 +1568,9 @@ class ContribRPObject(DefaultObject):
             if not pose:
                 pose = ""
             posed_things[pose].append(thing)
-        
+
         display_strings = []
-        
+
         for pose, thinglist in posed_things.items():
             grouped_things = defaultdict(list)
             for thing in thinglist:
@@ -1588,7 +1594,7 @@ class ContribRPObject(DefaultObject):
             return ""
 
         return "\n" + "\n".join(display_strings)
-  
+
 
 class ContribRPRoom(ContribRPObject):
     """
diff --git a/evennia/contrib/tutorials/evadventure/chargen.py b/evennia/contrib/tutorials/evadventure/chargen.py
index 4290a487a4..aba9c08122 100644
--- a/evennia/contrib/tutorials/evadventure/chargen.py
+++ b/evennia/contrib/tutorials/evadventure/chargen.py
@@ -3,6 +3,7 @@ EvAdventure character generation.
 
 """
 from django.conf import settings
+
 from evennia import create_object
 from evennia.objects.models import ObjectDB
 from evennia.prototypes.spawner import spawn
diff --git a/evennia/contrib/tutorials/evadventure/tests/test_chargen.py b/evennia/contrib/tutorials/evadventure/tests/test_chargen.py
index 51eaec3f30..8e6ef351b0 100644
--- a/evennia/contrib/tutorials/evadventure/tests/test_chargen.py
+++ b/evennia/contrib/tutorials/evadventure/tests/test_chargen.py
@@ -5,9 +5,10 @@ Test chargen.
 
 from unittest.mock import MagicMock, patch
 
+from parameterized import parameterized
+
 from evennia import create_object
 from evennia.utils.test_resources import BaseEvenniaTest
-from parameterized import parameterized
 
 from .. import chargen, enums, objects
 
diff --git a/evennia/prototypes/prototypes.py b/evennia/prototypes/prototypes.py
index 6012e1ad0b..5a1601043d 100644
--- a/evennia/prototypes/prototypes.py
+++ b/evennia/prototypes/prototypes.py
@@ -12,6 +12,7 @@ from django.conf import settings
 from django.core.paginator import Paginator
 from django.db.models import Q
 from django.utils.translation import gettext as _
+
 from evennia.locks.lockhandler import check_lockstring, validate_lockstring
 from evennia.objects.models import ObjectDB
 from evennia.scripts.scripts import DefaultScript
diff --git a/evennia/scripts/tickerhandler.py b/evennia/scripts/tickerhandler.py
index c60c75e9d0..b31550c3e0 100644
--- a/evennia/scripts/tickerhandler.py
+++ b/evennia/scripts/tickerhandler.py
@@ -68,12 +68,13 @@ call the handler's `save()` and `restore()` methods when the server reboots.
 import inspect
 
 from django.core.exceptions import ObjectDoesNotExist
+from twisted.internet.defer import inlineCallbacks
+
 from evennia.scripts.scripts import ExtendedLoopingCall
 from evennia.server.models import ServerConfig
 from evennia.utils import inherits_from, variable_from_module
 from evennia.utils.dbserialize import dbserialize, dbunserialize, pack_dbobj
 from evennia.utils.logger import log_err, log_trace
-from twisted.internet.defer import inlineCallbacks
 
 _GA = object.__getattribute__
 _SA = object.__setattr__
diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 0e238a14f8..fee012eaed 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -8,6 +8,7 @@ import shlex
 
 from django.db.models import Count, ExpressionWrapper, F, FloatField, Q
 from django.db.models.functions import Cast
+
 from evennia.typeclasses.attributes import Attribute
 from evennia.typeclasses.tags import Tag
 from evennia.utils import idmapper
diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index 2ee0163e06..163494f933 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/tests/test_utils.py b/evennia/utils/tests/test_utils.py
index 02ec4e3dc4..c7fe417ccb 100644
--- a/evennia/utils/tests/test_utils.py
+++ b/evennia/utils/tests/test_utils.py
@@ -11,11 +11,12 @@ from datetime import datetime, timedelta
 
 import mock
 from django.test import TestCase
+from parameterized import parameterized
+from twisted.internet import task
+
 from evennia.utils import utils
 from evennia.utils.ansi import ANSIString
 from evennia.utils.test_resources import BaseEvenniaTest
-from parameterized import parameterized
-from twisted.internet import task
 
 
 class TestIsIter(TestCase):
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index 74a1daa41f..aa58fe121e 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
diff --git a/evennia/utils/verb_conjugation/tests.py b/evennia/utils/verb_conjugation/tests.py
index 747d90c15c..c59337bbbe 100644
--- a/evennia/utils/verb_conjugation/tests.py
+++ b/evennia/utils/verb_conjugation/tests.py
@@ -3,8 +3,9 @@ Unit tests for verb conjugation.
 
 """
 
-from parameterized import parameterized
 from django.test import TestCase
+from parameterized import parameterized
+
 from . import conjugate, pronouns