diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000000..580225a96a5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,27 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG] Enter a brief description here"
+labels: bug
+assignees: ''
+
+---
+
+#### Describe the bug
+A clear and concise description of what the bug is.
+
+#### To Reproduce
+Steps to reproduce the behavior:
+1. 
+2.
+3.
+4. See error
+
+#### Expected behavior
+A clear and concise description of what you expected to happen.
+
+#### Environment, Evennia version, OS etc
+If unsure, run `evennia -v` or get the first few lines of the `about` command in-game.
+
+#### Additional context
+Any other context about the problem, or ideas on how to solve.
diff --git a/.github/ISSUE_TEMPLATE/documentation-issue.md b/.github/ISSUE_TEMPLATE/documentation-issue.md
new file mode 100644
index 00000000000..bffee8dfb5b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/documentation-issue.md
@@ -0,0 +1,14 @@
+---
+name: Documentation issue
+about: Documentation problems and suggestions
+title: '[Documentation] Enter a brief description here'
+labels: documentation
+assignees: ''
+
+---
+
+#### Documentation issue
+Describe what the issue is and where it can/should be found.
+
+#### Suggested change
+The suggested change.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 00000000000..7dc702cfad1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[Feature Request] Enter a brief description here"
+labels: feature-request
+assignees: ''
+
+---
+
+#### Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+#### Describe the solution you'd like
+A clear and concise description of what you want to happen.
+
+#### Describe alternatives you've considered
+A clear and concise description of any alternative solutions or features you've considered.
+
+#### Additional context
+Add any other context or screenshots about the feature request here.
diff --git a/.travis.yml b/.travis.yml
index 275b39a119a..34288574ae9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ install:
   - pip install -e .
 
 before_script:
+  - make format
   - evennia --init testing_mygame
   - cp .travis/${TESTING_DB}_settings.py testing_mygame/server/conf/settings.py
   - cd testing_mygame
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f185d9dfa0..a865a4569bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,38 @@
 
 ## Evennia 1.0 (2019-) (WIP)
 
-### Already in master 
+- new `drop:holds()` lock default to limit dropping nonsensical things. Access check
+  defaults to True for backwards-compatibility in 0.9, will be False in 1.0
+
+### Already in master
 
 - `py` command now reroutes stdout to output results in-game client. `py`
-without arguments starts a full interactive Python console. 
+without arguments starts a full interactive Python console.
+- Webclient default to a single input pane instead of two. Now defaults to no help-popup.
+- Webclient fix of prompt display
+- Webclient multimedia support for relaying images, video and sounds via
+  `.msg(image=URL)`, `.msg(video=URL)`
+  and `.msg(audio=URL)`
+- Add Spanish translation (fermuch)
+- Expand `GLOBAL_SCRIPTS` container to always start scripts and to include all
+  global scripts regardless of how they were created.
+- Change settings to always use lists instead of tuples, to make mutable
+  settings easier to add to. (#1912)
+- Make new `CHANNEL_MUDINFO` setting for specifying the mudinfo channel
+- Make `CHANNEL_CONNECTINFO` take full channel definition
+- Make `DEFAULT_CHANNELS` list auto-create channels missing at reload
+- Webclient `ANSI->HTML` parser updated. Webclient line width changed from 1.6em to 1.1em
+  to better make ANSI graphics look the same as for third-party clients
+- `AttributeHandler.get(return_list=True)` will return `[]` if there are no
+  Attributes instead of `[None]`.
+- Remove `pillow` requirement (install especially if using imagefield)
+- Add Simplified Korean translation (user aceamro)
+- Show warning on `start -l` if settings contains values unsafe for production.
+- Make code auto-formatted with Black.
+- Make default `set` command able to edit nested structures (PR by Aaron McMillan)
+- Allow running Evennia test suite from core repo with `make test`.
+- Return `store_key` from `TickerHandler.add` and add `store_key` as a kwarg to 
+  the `TickerHandler.remove` method. This makes it easier to manage tickers. 
 
 
 ## Evennia 0.9 (2018-2019)
@@ -44,12 +72,12 @@ without arguments starts a full interactive Python console.
 
 - Change webclient from old txws version to use more supported/feature-rich Autobahn websocket library
 
-#### Evennia game index 
+#### Evennia game index
 
 - Made Evennia game index client a part of core - now configured from settings file (old configs
   need to be moved)
 - The `evennia connections` command starts a wizard that helps you connect your game to the game index.
-- The game index now accepts games with no public telnet/webclient info (for early prototypes). 
+- The game index now accepts games with no public telnet/webclient info (for early prototypes).
 
 #### New golden-layout based Webclient UI (@friarzen)
 - Features
@@ -184,9 +212,9 @@ without arguments starts a full interactive Python console.
 
 ### Contribs
 
-- Evscaperoom - a full puzzle engine for making multiplayer escape rooms in Evennia. Used to make 
-  the entry for the MUD-Coder's Guild's 2019 Game Jam with the theme "One Room", where it ranked #1. 
-- Evennia game-index client no longer a contrib - moved into server core and configured with new 
+- Evscaperoom - a full puzzle engine for making multiplayer escape rooms in Evennia. Used to make
+  the entry for the MUD-Coder's Guild's 2019 Game Jam with the theme "One Room", where it ranked #1.
+- Evennia game-index client no longer a contrib - moved into server core and configured with new
   setting `GAME_INDEX_ENABLED`.
 - The `extended_room` contrib saw some backwards-incompatible refactoring:
   + All commands now begin with `CmdExtendedRoom`. So before it was `CmdExtendedLook`, now
diff --git a/Dockerfile b/Dockerfile
index 697cd2ef643..b45bae03adf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,15 +13,16 @@
 #    folder).
 #
 #    You will end up in a shell where the `evennia` command is available. From here you
-#    can install and run the game normally. Use Ctrl-D to exit the evennia docker container.
+#    can initialize and/or run the game normally. Use Ctrl-D to exit the evennia docker container.
+#    For more info see: https://github.com/evennia/evennia/wiki/Getting-Started#quick-start
 #
 #    You can also start evennia directly by passing arguments to the folder:
 #
 #        docker run -it --rm -p 4000:4000 -p 4001:4001 -p 4002:4002 -v $PWD:/usr/src/game evennia/evennia evennia start -l
 #
 #    This will start Evennia running as the core process of the container. Note that you *must* use -l
-#    or one of the foreground modes (like evennia ipstart) since otherwise the container will immediately
-#    die since no foreground process keeps it up. 
+#    or one of the foreground modes (like evennia ipstart), since otherwise the container will immediately
+#    die because of having no foreground process.
 #
 # The evennia/evennia base image is found on DockerHub and can also be used
 # as a base for creating your own custom containerized Evennia game. For more
@@ -65,6 +66,13 @@ WORKDIR /usr/src/game
 # set bash prompt
 ENV PS1 "evennia|docker \w $ "
 
+# create and switch to a non-root user for runtime security
+# -D - do not set a password
+# -H - do not create a home directory
+# -s /bin/false - set login shell to /bin/false
+RUN adduser -D -H -s /bin/false evennia
+USER evennia
+
 # startup a shell when we start the container
 ENTRYPOINT ["/usr/src/evennia/bin/unix/evennia-docker-start.sh"]
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 00000000000..23a578c27e2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,38 @@
+# This is used with `make <option>` and is used for running various
+# administration operations on the code.
+
+BLACK_FORMAT_CONFIGS = --target-version py37 --line-length 100
+TEST_GAME_DIR = .test_game_dir
+tests?=evennia
+
+default:
+	@echo " Usage: "
+	@echo "  make install - install evennia (recommended to activate virtualenv first)"
+	@echo "  make fmt/format - run the black autoformatter on the source code"
+	@echo "  make lint - run black in --check mode"
+	@echo "  make test - run evennia test suite with all default values."
+	@echo "  make tests=evennia.path test - run only specific test or tests."
+	@echo "  make testp - run test suite using multiple cores."
+
+install:
+	pip install -e .
+
+format:
+	black $(BLACK_FORMAT_CONFIGS) evennia
+
+fmt: format
+
+lint:
+	black --check $(BLACK_FORMAT_CONFIGS) evennia
+
+test:
+	evennia --init $(TEST_GAME_DIR);\
+	cd $(TEST_GAME_DIR);\
+	evennia migrate;\
+	evennia test --keepdb $(tests);\
+
+testp:
+	evennia --init $(TEST_GAME_DIR);\
+	cd $(TEST_GAME_DIR);\
+	evennia migrate;\
+	evennia test --keepdb --parallel 4 $(tests);\
diff --git a/bin/player-account-step1.patch b/bin/player-account-step1.patch
index ede1d2e9b5d..1f540c7c994 100644
--- a/bin/player-account-step1.patch
+++ b/bin/player-account-step1.patch
@@ -4,7 +4,6 @@ index ec5fc29..62b7936 100644
 +++ b/evennia/comms/migrations/0015_auto_20170706_2041.py
 @@ -2,7 +2,12 @@
  # Generated by Django 1.11.2 on 2017-07-06 20:41
- from __future__ import unicode_literals
  
 -from django.db import migrations
 +from django.db import migrations, connection
@@ -60,7 +59,6 @@ index b27c75c..6e40252 100644
 +++ b/evennia/objects/migrations/0007_objectdb_db_account.py
 @@ -2,21 +2,31 @@
  # Generated by Django 1.11.2 on 2017-07-05 17:27
- from __future__ import unicode_literals
  
 -from django.db import migrations, models
 +from django.db import migrations, models, connection
@@ -104,7 +102,6 @@ index 80161a1..10fb225 100644
 +++ b/evennia/objects/migrations/0009_remove_objectdb_db_player.py
 @@ -2,7 +2,12 @@
  # Generated by Django 1.11.2 on 2017-07-06 20:41
- from __future__ import unicode_literals
  
 -from django.db import migrations
 +from django.db import migrations, connection
@@ -144,7 +141,6 @@ index 99baf70..23f6df9 100644
 +++ b/evennia/scripts/migrations/0009_scriptdb_db_account.py
 @@ -2,21 +2,31 @@
  # Generated by Django 1.11.2 on 2017-07-05 17:27
- from __future__ import unicode_literals
  
 -from django.db import migrations, models
 +from django.db import migrations, models, connection
@@ -188,7 +184,6 @@ index d3746a5..20fa63f 100644
 +++ b/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py
 @@ -2,7 +2,12 @@
  # Generated by Django 1.11.2 on 2017-07-06 20:41
- from __future__ import unicode_literals
  
 -from django.db import migrations
 +from django.db import migrations, connection
diff --git a/evennia/__init__.py b/evennia/__init__.py
index 0a5db983720..a5ae043d089 100644
--- a/evennia/__init__.py
+++ b/evennia/__init__.py
@@ -136,14 +136,16 @@ def _create_version():
     version = "Unknown"
     root = os.path.dirname(os.path.abspath(__file__))
     try:
-        with open(os.path.join(root, "VERSION.txt"), 'r') as f:
+        with open(os.path.join(root, "VERSION.txt"), "r") as f:
             version = f.read().strip()
     except IOError as err:
         print(err)
     try:
-        rev = check_output(
-            "git rev-parse --short HEAD",
-            shell=True, cwd=root, stderr=STDOUT).strip().decode()
+        rev = (
+            check_output("git rev-parse --short HEAD", shell=True, cwd=root, stderr=STDOUT)
+            .strip()
+            .decode()
+        )
         version = "%s (rev %s)" % (version, rev)
     except (IOError, CalledProcessError, OSError):
         # ignore if we cannot get to git
@@ -259,9 +261,10 @@ class _EvContainer(object):
 
         def _help(self):
             "Returns list of contents"
-            names = [name for name in self.__class__.__dict__ if not name.startswith('_')]
-            names += [name for name in self.__dict__ if not name.startswith('_')]
+            names = [name for name in self.__class__.__dict__ if not name.startswith("_")]
+            names += [name for name in self.__dict__ if not name.startswith("_")]
             print(self.__doc__ + "-" * 60 + "\n" + ", ".join(names))
+
         help = property(_help)
 
     class DBmanagers(_EvContainer):
@@ -281,6 +284,7 @@ class DBmanagers(_EvContainer):
         attributes - Attributes.objects
 
         """
+
         from .help.models import HelpEntry
         from .accounts.models import AccountDB
         from .scripts.models import ScriptDB
@@ -302,7 +306,7 @@ class DBmanagers(_EvContainer):
         tags = Tag.objects
         # remove these so they are not visible as properties
         del HelpEntry, AccountDB, ScriptDB, Msg, ChannelDB
-        #del ExternalChannelConnection
+        # del ExternalChannelConnection
         del ObjectDB, ServerConfig, Tag, Attribute
 
     managers = DBmanagers()
@@ -325,15 +329,26 @@ class DefaultCmds(_EvContainer):
 
         def __init__(self):
             "populate the object with commands"
+
             def add_cmds(module):
                 "helper method for populating this object with cmds"
                 from evennia.utils import utils
+
                 cmdlist = utils.variable_from_module(module, module.__all__)
                 self.__dict__.update(dict([(c.__name__, c) for c in cmdlist]))
 
-            from .commands.default import (admin, batchprocess,
-                                           building, comms, general,
-                                           account, help, system, unloggedin)
+            from .commands.default import (
+                admin,
+                batchprocess,
+                building,
+                comms,
+                general,
+                account,
+                help,
+                system,
+                unloggedin,
+            )
+
             add_cmds(admin)
             add_cmds(building)
             add_cmds(batchprocess)
@@ -367,19 +382,23 @@ class SystemCmds(_EvContainer):
         access the properties on the imported syscmdkeys object.
 
         """
+
         from .commands import cmdhandler
+
         CMD_NOINPUT = cmdhandler.CMD_NOINPUT
         CMD_NOMATCH = cmdhandler.CMD_NOMATCH
         CMD_MULTIMATCH = cmdhandler.CMD_MULTIMATCH
         CMD_CHANNEL = cmdhandler.CMD_CHANNEL
         CMD_LOGINSTART = cmdhandler.CMD_LOGINSTART
         del cmdhandler
+
     syscmdkeys = SystemCmds()
     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)
@@ -390,6 +409,9 @@ class SystemCmds(_EvContainer):
     BASE_GUEST_TYPECLASS = class_from_module(settings.BASE_GUEST_TYPECLASS)
     del class_from_module
 
+    # delayed starts
+    GLOBAL_SCRIPTS.start()
+
 
 def set_trace(term_size=(140, 40), debugger="auto"):
     """
@@ -419,20 +441,22 @@ def set_trace(term_size=(140, 40), debugger="auto"):
 
     """
     import sys
+
     dbg = None
 
-    if debugger in ('auto', 'pudb'):
+    if debugger in ("auto", "pudb"):
         try:
             from pudb import debugger
-            dbg = debugger.Debugger(stdout=sys.__stdout__,
-                                    term_size=term_size)
+
+            dbg = debugger.Debugger(stdout=sys.__stdout__, term_size=term_size)
         except ImportError:
-            if debugger == 'pudb':
+            if debugger == "pudb":
                 raise
             pass
 
     if not dbg:
         import pdb
+
         dbg = pdb.Pdb(stdout=sys.__stdout__)
 
     try:
diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index caf6b5d5a06..d6afe2ca2eb 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -26,29 +26,29 @@
 from evennia.server.models import ServerConfig
 from evennia.server.throttle import Throttle
 from evennia.utils import class_from_module, create, logger
-from evennia.utils.utils import (lazy_property, to_str,
-                                 make_iter, is_iter,
-                                 variable_from_module)
-from evennia.server.signals import (SIGNAL_ACCOUNT_POST_CREATE, SIGNAL_OBJECT_POST_PUPPET,
-                                    SIGNAL_OBJECT_POST_UNPUPPET)
+from evennia.utils.utils import lazy_property, to_str, make_iter, is_iter, variable_from_module
+from evennia.server.signals import (
+    SIGNAL_ACCOUNT_POST_CREATE,
+    SIGNAL_OBJECT_POST_PUPPET,
+    SIGNAL_OBJECT_POST_UNPUPPET,
+)
 from evennia.typeclasses.attributes import NickHandler
 from evennia.scripts.scripthandler import ScriptHandler
 from evennia.commands.cmdsethandler import CmdSetHandler
 from evennia.utils.optionhandler import OptionHandler
 
 from django.utils.translation import ugettext as _
-from future.utils import with_metaclass
 from random import getrandbits
 
 __all__ = ("DefaultAccount",)
 
 _SESSIONS = None
 
-_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
 _MAX_NR_CHARACTERS = settings.MAX_NR_CHARACTERS
 _CMDSET_ACCOUNT = settings.CMDSET_ACCOUNT
-_CONNECT_CHANNEL = None
+_MUDINFO_CHANNEL = None
 
 # Create throttles for too many account-creations and login attempts
 CREATION_THROTTLE = Throttle(limit=2, timeout=10 * 60)
@@ -113,7 +113,7 @@ def count(self):
         return len(self.get())
 
 
-class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
+class DefaultAccount(AccountDB, metaclass=TypeclassBase):
     """
     This is the base Typeclass for all Accounts. Accounts represent
     the person playing the game and tracks account info, password
@@ -203,12 +203,14 @@ def sessions(self):
 
     @lazy_property
     def options(self):
-        return OptionHandler(self,
-                             options_dict=settings.OPTIONS_ACCOUNT_DEFAULT,
-                             savefunc=self.attributes.add,
-                             loadfunc=self.attributes.get,
-                             save_kwargs={"category": 'option'},
-                             load_kwargs={"category": 'option'})
+        return OptionHandler(
+            self,
+            options_dict=settings.OPTIONS_ACCOUNT_DEFAULT,
+            savefunc=self.attributes.add,
+            loadfunc=self.attributes.get,
+            save_kwargs={"category": "option"},
+            load_kwargs={"category": "option"},
+        )
 
     # Do not make this a lazy property; the web UI will not refresh it!
     @property
@@ -267,9 +269,9 @@ def puppet_object(self, session, obj):
             # already puppeting this object
             self.msg("You are already puppeting this object.")
             return
-        if not obj.access(self, 'puppet'):
+        if not obj.access(self, "puppet"):
             # no access
-            self.msg("You don't have permission to puppet '%s'." % obj.key)
+            self.msg(f"You don't have permission to puppet '{obj.key}'.")
             return
         if obj.account:
             # object already puppeted
@@ -278,19 +280,19 @@ def puppet_object(self, session, obj):
                     # we may take over another of our sessions
                     # output messages to the affected sessions
                     if _MULTISESSION_MODE in (1, 3):
-                        txt1 = "Sharing |c%s|n with another of your sessions."
-                        txt2 = "|c%s|n|G is now shared from another of your sessions.|n"
-                        self.msg(txt1 % obj.name, session=session)
-                        self.msg(txt2 % obj.name, session=obj.sessions.all())
+                        txt1 = f"Sharing |c{obj.name}|n with another of your sessions."
+                        txt2 = f"|c{obj.name}|n|G is now shared from another of your sessions.|n"
+                        self.msg(txt1, session=session)
+                        self.msg(txt2, session=obj.sessions.all())
                     else:
-                        txt1 = "Taking over |c%s|n from another of your sessions."
-                        txt2 = "|c%s|n|R is now acted from another of your sessions.|n"
-                        self.msg(txt1 % obj.name, session=session)
-                        self.msg(txt2 % obj.name, session=obj.sessions.all())
+                        txt1 = f"Taking over |c{obj.name}|n from another of your sessions."
+                        txt2 = f"|c{obj.name}|n|R is now acted from another of your sessions.|n"
+                        self.msg(txt1, session=session)
+                        self.msg(txt2, session=obj.sessions.all())
                         self.unpuppet_object(obj.sessions.get())
             elif obj.account.is_connected:
                 # controlled by another account
-                self.msg("|c%s|R is already puppeted by another Account." % obj.key)
+                self.msg(f"|c{obj.key}|R is already puppeted by another Account.")
                 return
 
         # do the puppeting
@@ -390,6 +392,7 @@ def __get_single_puppet(self):
         if _MULTISESSION_MODE in (0, 1):
             return puppets and puppets[0] or None
         return puppets
+
     character = property(__get_single_puppet)
     puppet = property(__get_single_puppet)
 
@@ -408,21 +411,23 @@ def is_banned(cls, **kwargs):
 
         """
 
-        ip = kwargs.get('ip', '').strip()
-        username = kwargs.get('username', '').lower().strip()
+        ip = kwargs.get("ip", "").strip()
+        username = kwargs.get("username", "").lower().strip()
 
         # Check IP and/or name bans
         bans = ServerConfig.objects.conf("server_bans")
-        if bans and (any(tup[0] == username for tup in bans if username) or
-                     any(tup[2].match(ip) for tup in bans if ip and tup[2])):
+        if bans and (
+            any(tup[0] == username for tup in bans if username)
+            or any(tup[2].match(ip) for tup in bans if ip and tup[2])
+        ):
             return True
 
         return False
 
     @classmethod
     def get_username_validators(
-            cls, validator_config=getattr(
-                settings, 'AUTH_USERNAME_VALIDATORS', [])):
+        cls, validator_config=getattr(settings, "AUTH_USERNAME_VALIDATORS", [])
+    ):
         """
         Retrieves and instantiates validators for usernames.
 
@@ -437,16 +442,18 @@ def get_username_validators(
         objs = []
         for validator in validator_config:
             try:
-                klass = import_string(validator['NAME'])
+                klass = import_string(validator["NAME"])
             except ImportError:
-                msg = ("The module in NAME could not be imported: %s. "
-                       "Check your AUTH_USERNAME_VALIDATORS setting.")
-                raise ImproperlyConfigured(msg % validator['NAME'])
-            objs.append(klass(**validator.get('OPTIONS', {})))
+                msg = (
+                    f"The module in NAME could not be imported: {validator['NAME']}. "
+                    "Check your AUTH_USERNAME_VALIDATORS setting."
+                )
+                raise ImproperlyConfigured(msg)
+            objs.append(klass(**validator.get("OPTIONS", {})))
         return objs
 
     @classmethod
-    def authenticate(cls, username, password, ip='', **kwargs):
+    def authenticate(cls, username, password, ip="", **kwargs):
         """
         Checks the given username/password against the database to see if the
         credentials are valid.
@@ -481,7 +488,7 @@ def authenticate(cls, username, password, ip='', **kwargs):
 
         # See if authentication is currently being throttled
         if ip and LOGIN_THROTTLE.check(ip):
-            errors.append('Too many login failures; please try again in a few minutes.')
+            errors.append("Too many login failures; please try again in a few minutes.")
 
             # With throttle active, do not log continued hits-- it is a
             # waste of storage and can be abused to make your logs harder to
@@ -492,27 +499,29 @@ def authenticate(cls, username, password, ip='', **kwargs):
         banned = cls.is_banned(username=username, ip=ip)
         if banned:
             # this is a banned IP or name!
-            errors.append("|rYou have been banned and cannot continue from here."
-                          "\nIf you feel this ban is in error, please email an admin.|x")
-            logger.log_sec('Authentication Denied (Banned): %s (IP: %s).' % (username, ip))
-            LOGIN_THROTTLE.update(ip, 'Too many sightings of banned artifact.')
+            errors.append(
+                "|rYou have been banned and cannot continue from here."
+                "\nIf you feel this ban is in error, please email an admin.|x"
+            )
+            logger.log_sec(f"Authentication Denied (Banned): {username} (IP: {ip}).")
+            LOGIN_THROTTLE.update(ip, "Too many sightings of banned artifact.")
             return None, errors
 
         # Authenticate and get Account object
         account = authenticate(username=username, password=password)
         if not account:
             # User-facing message
-            errors.append('Username and/or password is incorrect.')
+            errors.append("Username and/or password is incorrect.")
 
             # Log auth failures while throttle is inactive
-            logger.log_sec('Authentication Failure: %s (IP: %s).' % (username, ip))
+            logger.log_sec(f"Authentication Failure: {username} (IP: {ip}).")
 
             # Update throttle
             if ip:
-                LOGIN_THROTTLE.update(ip, 'Too many authentication failures.')
+                LOGIN_THROTTLE.update(ip, "Too many authentication failures.")
 
             # Try to call post-failure hook
-            session = kwargs.get('session', None)
+            session = kwargs.get("session", None)
             if session:
                 account = AccountDB.objects.get_account_from_name(username)
                 if account:
@@ -521,7 +530,7 @@ def authenticate(cls, username, password, ip='', **kwargs):
             return None, errors
 
         # Account successfully authenticated
-        logger.log_sec('Authentication Success: %s (IP: %s).' % (account, ip))
+        logger.log_sec(f"Authentication Success: {account} (IP: {ip}).")
         return account, errors
 
     @classmethod
@@ -629,7 +638,7 @@ def set_password(self, password, **kwargs):
 
         """
         super(DefaultAccount, self).set_password(password)
-        logger.log_sec("Password successfully changed for %s." % self)
+        logger.log_sec(f"Password successfully changed for {self}.")
         self.at_password_change()
 
     @classmethod
@@ -660,17 +669,19 @@ def create(cls, *args, **kwargs):
         account = None
         errors = []
 
-        username = kwargs.get('username')
-        password = kwargs.get('password')
-        email = kwargs.get('email', '').strip()
-        guest = kwargs.get('guest', False)
+        username = kwargs.get("username")
+        password = kwargs.get("password")
+        email = kwargs.get("email", "").strip()
+        guest = kwargs.get("guest", False)
 
-        permissions = kwargs.get('permissions', settings.PERMISSION_ACCOUNT_DEFAULT)
-        typeclass = kwargs.get('typeclass', cls)
+        permissions = kwargs.get("permissions", settings.PERMISSION_ACCOUNT_DEFAULT)
+        typeclass = kwargs.get("typeclass", cls)
 
-        ip = kwargs.get('ip', '')
+        ip = kwargs.get("ip", "")
         if ip and CREATION_THROTTLE.check(ip):
-            errors.append("You are creating too many accounts. Please log into an existing account.")
+            errors.append(
+                "You are creating too many accounts. Please log into an existing account."
+            )
             return None, errors
 
         # Normalize username
@@ -697,19 +708,25 @@ def create(cls, *args, **kwargs):
         banned = cls.is_banned(username=username, ip=ip)
         if banned:
             # this is a banned IP or name!
-            string = "|rYou have been banned and cannot continue from here." \
-                     "\nIf you feel this ban is in error, please email an admin.|x"
+            string = (
+                "|rYou have been banned and cannot continue from here."
+                "\nIf you feel this ban is in error, please email an admin.|x"
+            )
             errors.append(string)
             return None, errors
 
-        # everything's ok. Create the new account account.
+        # everything's ok. Create the new account.
         try:
             try:
-                account = create.create_account(username, email, password, permissions=permissions, typeclass=typeclass)
-                logger.log_sec('Account Created: %s (IP: %s).' % (account, ip))
+                account = create.create_account(
+                    username, email, password, permissions=permissions, typeclass=typeclass
+                )
+                logger.log_sec(f"Account Created: {account} (IP: {ip}).")
 
             except Exception as e:
-                errors.append("There was an error creating the Account. If this problem persists, contact an admin.")
+                errors.append(
+                    "There was an error creating the Account. If this problem persists, contact an admin."
+                )
                 logger.log_trace()
                 return None, errors
 
@@ -725,20 +742,26 @@ def create(cls, *args, **kwargs):
             # join the new account to the public channel
             pchannel = ChannelDB.objects.get_channel(settings.DEFAULT_CHANNELS[0]["key"])
             if not pchannel or not pchannel.connect(account):
-                string = "New account '%s' could not connect to public channel!" % account.key
+                string = f"New account '{account.key}' could not connect to public channel!"
                 errors.append(string)
                 logger.log_err(string)
 
             if account and settings.MULTISESSION_MODE < 2:
                 # Load the appropriate Character class
-                character_typeclass = kwargs.get('character_typeclass', settings.BASE_CHARACTER_TYPECLASS)
-                character_home = kwargs.get('home')
+                character_typeclass = kwargs.get(
+                    "character_typeclass", settings.BASE_CHARACTER_TYPECLASS
+                )
+                character_home = kwargs.get("home")
                 Character = class_from_module(character_typeclass)
 
                 # Create the character
                 character, errs = Character.create(
-                    account.key, account, ip=ip, typeclass=character_typeclass,
-                    permissions=permissions, home=character_home
+                    account.key,
+                    account,
+                    ip=ip,
+                    typeclass=character_typeclass,
+                    permissions=permissions,
+                    home=character_home,
                 )
                 errors.extend(errs)
 
@@ -759,7 +782,7 @@ def create(cls, *args, **kwargs):
 
         # Update the throttle to indicate a new account was created from this IP
         if ip and not guest:
-            CREATION_THROTTLE.update(ip, 'Too many accounts being created.')
+            CREATION_THROTTLE.update(ip, "Too many accounts being created.")
         SIGNAL_ACCOUNT_POST_CREATE.send(sender=account, ip=ip)
         return account, errors
 
@@ -787,6 +810,7 @@ def delete(self, *args, **kwargs):
         self.nicks.clear()
         self.aliases.clear()
         super().delete(*args, **kwargs)
+
     # methods inherited from database model
 
     def msg(self, text=None, from_obj=None, session=None, options=None, **kwargs):
@@ -827,7 +851,7 @@ def msg(self, text=None, from_obj=None, session=None, options=None, **kwargs):
         kwargs["options"] = options
 
         if text is not None:
-            kwargs['text'] = to_str(text)
+            kwargs["text"] = to_str(text)
 
         # session relay
         sessions = make_iter(session) if session else self.sessions.all()
@@ -854,17 +878,29 @@ def execute_cmd(self, raw_string, session=None, **kwargs):
                 commands at run-time.
 
         """
-        raw_string = self.nicks.nickreplace(raw_string, categories=("inputline", "channel"), include_account=False)
+        raw_string = self.nicks.nickreplace(
+            raw_string, categories=("inputline", "channel"), include_account=False
+        )
         if not session and _MULTISESSION_MODE in (0, 1):
             # for these modes we use the first/only session
             sessions = self.sessions.get()
             session = sessions[0] if sessions else None
 
-        return cmdhandler.cmdhandler(self, raw_string,
-                                     callertype="account", session=session, **kwargs)
-
-    def search(self, searchdata, return_puppet=False, search_object=False,
-               typeclass=None, nofound_string=None, multimatch_string=None, use_nicks=True, **kwargs):
+        return cmdhandler.cmdhandler(
+            self, raw_string, callertype="account", session=session, **kwargs
+        )
+
+    def search(
+        self,
+        searchdata,
+        return_puppet=False,
+        search_object=False,
+        typeclass=None,
+        nofound_string=None,
+        multimatch_string=None,
+        use_nicks=True,
+        **kwargs,
+    ):
         """
         This is similar to `DefaultObject.search` but defaults to searching
         for Accounts only.
@@ -901,17 +937,25 @@ def search(self, searchdata, return_puppet=False, search_object=False,
         # handle me, self and *me, *self
         if isinstance(searchdata, str):
             # handle wrapping of common terms
-            if searchdata.lower() in ("me", "*me", "self", "*self",):
+            if searchdata.lower() in ("me", "*me", "self", "*self"):
                 return self
         if search_object:
-            matches = ObjectDB.objects.object_search(searchdata, typeclass=typeclass, use_nicks=use_nicks)
+            matches = ObjectDB.objects.object_search(
+                searchdata, typeclass=typeclass, use_nicks=use_nicks
+            )
         else:
-            searchdata = self.nicks.nickreplace(searchdata, categories=("account", ), include_account=False)
+            searchdata = self.nicks.nickreplace(
+                searchdata, categories=("account",), include_account=False
+            )
 
             matches = AccountDB.objects.account_search(searchdata, typeclass=typeclass)
-        matches = _AT_SEARCH_RESULT(matches, self, query=searchdata,
-                                    nofound_string=nofound_string,
-                                    multimatch_string=multimatch_string)
+        matches = _AT_SEARCH_RESULT(
+            matches,
+            self,
+            query=searchdata,
+            nofound_string=nofound_string,
+            multimatch_string=multimatch_string,
+        )
         if matches and return_puppet:
             try:
                 return matches.puppet
@@ -919,7 +963,9 @@ def search(self, searchdata, return_puppet=False, search_object=False,
                 return None
         return matches
 
-    def access(self, accessing_obj, access_type='read', default=False, no_superuser_bypass=False, **kwargs):
+    def access(
+        self, accessing_obj, access_type="read", default=False, no_superuser_bypass=False, **kwargs
+    ):
         """
         Determines if another object has permission to access this
         object in whatever way.
@@ -939,8 +985,12 @@ def access(self, accessing_obj, access_type='read', default=False, no_superuser_
             result (bool): Result of access check.
 
         """
-        result = super().access(accessing_obj, access_type=access_type,
-                                default=default, no_superuser_bypass=no_superuser_bypass)
+        result = super().access(
+            accessing_obj,
+            access_type=access_type,
+            default=default,
+            no_superuser_bypass=no_superuser_bypass,
+        )
         self.at_access(result, accessing_obj, access_type, **kwargs)
         return result
 
@@ -975,9 +1025,11 @@ def basetype_setup(self):
 
         """
         # A basic security setup
-        lockstring = "examine:perm(Admin);edit:perm(Admin);" \
-                     "delete:perm(Admin);boot:perm(Admin);msg:all();" \
-                     "noidletimeout:perm(Builder) or perm(noidletimeout)"
+        lockstring = (
+            "examine:perm(Admin);edit:perm(Admin);"
+            "delete:perm(Admin);boot:perm(Admin);msg:all();"
+            "noidletimeout:perm(Builder) or perm(noidletimeout)"
+        )
         self.locks.add(lockstring)
 
         # The ooc account cmdset
@@ -992,8 +1044,7 @@ def at_account_creation(self):
 
         """
         # set an (empty) attribute holding the characters this account has
-        lockstring = "attrread:perm(Admins);attredit:perm(Admins);" \
-                     "attrcreate:perm(Admins);"
+        lockstring = "attrread:perm(Admins);attredit:perm(Admins);" "attrcreate:perm(Admins);"
         self.attributes.add("_playable_characters", [], lockstring=lockstring)
         self.attributes.add("_saved_protocol_flags", {}, lockstring=lockstring)
 
@@ -1034,7 +1085,7 @@ def at_first_save(self):
             updates = []
             if not cdict.get("key"):
                 if not self.db_key:
-                    self.db_key = "#%i" % self.dbid
+                    self.db_key = f"#{self.dbid}"
                     updates.append("db_key")
             elif self.key != cdict.get("key"):
                 updates.append("db_key")
@@ -1145,19 +1196,20 @@ def _send_to_connect_channel(self, message):
             message (str): A message to send to the connect channel.
 
         """
-        global _CONNECT_CHANNEL
-        if not _CONNECT_CHANNEL:
+        global _MUDINFO_CHANNEL
+        if not _MUDINFO_CHANNEL:
             try:
-                _CONNECT_CHANNEL = ChannelDB.objects.filter(db_key=settings.DEFAULT_CHANNELS[1]["key"])[0]
+                _MUDINFO_CHANNEL = ChannelDB.objects.filter(db_key=settings.CHANNEL_MUDINFO["key"])[
+                    0
+                ]
             except Exception:
                 logger.log_trace()
         now = timezone.now()
-        now = "%02i-%02i-%02i(%02i:%02i)" % (now.year, now.month,
-                                             now.day, now.hour, now.minute)
-        if _CONNECT_CHANNEL:
-            _CONNECT_CHANNEL.tempmsg("[%s, %s]: %s" % (_CONNECT_CHANNEL.key, now, message))
+        now = "%02i-%02i-%02i(%02i:%02i)" % (now.year, now.month, now.day, now.hour, now.minute)
+        if _MUDINFO_CHANNEL:
+            _MUDINFO_CHANNEL.tempmsg(f"[{_MUDINFO_CHANNEL.key}, {now}]: {message}")
         else:
-            logger.log_info("[%s]: %s" % (now, message))
+            logger.log_info(f"[{now}]: {message}")
 
     def at_post_login(self, session=None, **kwargs):
         """
@@ -1184,7 +1236,7 @@ def at_post_login(self, session=None, **kwargs):
         if session:
             session.msg(logged_in={})
 
-        self._send_to_connect_channel("|G%s connected|n" % self.key)
+        self._send_to_connect_channel(f"|G{self.key} connected|n")
         if _MULTISESSION_MODE == 0:
             # in this mode we should have only one character available. We
             # try to auto-connect to our last conneted object, if any
@@ -1206,8 +1258,9 @@ def at_post_login(self, session=None, **kwargs):
             # we make sure to clean up the _playable_characters list in case
             # any was deleted in the interim.
             self.db._playable_characters = [char for char in self.db._playable_characters if char]
-            self.msg(self.at_look(target=self.db._playable_characters,
-                                  session=session), session=session)
+            self.msg(
+                self.at_look(target=self.db._playable_characters, session=session), session=session
+            )
 
     def at_failed_login(self, session, **kwargs):
         """
@@ -1234,8 +1287,8 @@ def at_disconnect(self, reason=None, **kwargs):
 
 
         """
-        reason = " (%s)" % reason if reason else ""
-        self._send_to_connect_channel("|R%s disconnected%s|n" % (self.key, reason))
+        reason = f" ({reason if reason else ''})"
+        self._send_to_connect_channel(f"|R{self.key} disconnected{reason}|n")
 
     def at_post_disconnect(self, **kwargs):
         """
@@ -1352,22 +1405,30 @@ def at_look(self, target=None, session=None, **kwargs):
             is_su = self.is_superuser
 
             # text shown when looking in the ooc area
-            result = ["Account |g%s|n (you are Out-of-Character)" % self.key]
+            result = [f"Account |g{self.key}|n (you are Out-of-Character)"]
 
             nsess = len(sessions)
-            result.append(nsess == 1 and
-                          "\n\n|wConnected session:|n" or
-                          "\n\n|wConnected sessions (%i):|n" % nsess)
+            result.append(
+                nsess == 1
+                and "\n\n|wConnected session:|n"
+                or f"\n\n|wConnected sessions ({nsess}):|n"
+            )
             for isess, sess in enumerate(sessions):
                 csessid = sess.sessid
-                addr = "%s (%s)" % (sess.protocol_key, isinstance(sess.address, tuple) and
-                                    str(sess.address[0]) or
-                                    str(sess.address))
-                result.append("\n %s %s" % (
-                    session and
-                    session.sessid == csessid and
-                    "|w* %s|n" % (isess + 1) or
-                    "  %s" % (isess + 1), addr))
+                addr = "%s (%s)" % (
+                    sess.protocol_key,
+                    isinstance(sess.address, tuple) and str(sess.address[0]) or str(sess.address),
+                )
+                result.append(
+                    "\n %s %s"
+                    % (
+                        session
+                        and session.sessid == csessid
+                        and "|w* %s|n" % (isess + 1)
+                        or "  %s" % (isess + 1),
+                        addr,
+                    )
+                )
             result.append("\n\n |whelp|n - more commands")
             result.append("\n |wooc <Text>|n - talk on public channel")
 
@@ -1375,19 +1436,30 @@ def at_look(self, target=None, session=None, **kwargs):
 
             if is_su or len(characters) < charmax:
                 if not characters:
-                    result.append("\n\n You don't have any characters yet. See |whelp @charcreate|n for creating one.")
+                    result.append(
+                        "\n\n You don't have any characters yet. See |whelp @charcreate|n for creating one."
+                    )
                 else:
                     result.append("\n |w@charcreate <name> [=description]|n - create new character")
-                    result.append("\n |w@chardelete <name>|n - delete a character (cannot be undone!)")
+                    result.append(
+                        "\n |w@chardelete <name>|n - delete a character (cannot be undone!)"
+                    )
 
             if characters:
                 string_s_ending = len(characters) > 1 and "s" or ""
                 result.append("\n |w@ic <character>|n - enter the game (|w@ooc|n to get back here)")
                 if is_su:
-                    result.append("\n\nAvailable character%s (%i/unlimited):" % (string_s_ending, len(characters)))
+                    result.append(
+                        f"\n\nAvailable character{string_s_ending} ({len(characters)}/unlimited):"
+                    )
                 else:
-                    result.append("\n\nAvailable character%s%s:"
-                                  % (string_s_ending, charmax > 1 and " (%i/%i)" % (len(characters), charmax) or ""))
+                    result.append(
+                        "\n\nAvailable character%s%s:"
+                        % (
+                            string_s_ending,
+                            charmax > 1 and " (%i/%i)" % (len(characters), charmax) or "",
+                        )
+                    )
 
                 for char in characters:
                     csessions = char.sessions.all()
@@ -1396,14 +1468,16 @@ def at_look(self, target=None, session=None, **kwargs):
                             # character is already puppeted
                             sid = sess in sessions and sessions.index(sess) + 1
                             if sess and sid:
-                                result.append("\n - |G%s|n [%s] (played by you in session %i)"
-                                              % (char.key, ", ".join(char.permissions.all()), sid))
+                                result.append(
+                                    f"\n - |G{char.key}|n [{', '.join(char.permissions.all())}] (played by you in session {sid})"
+                                )
                             else:
-                                result.append("\n - |R%s|n [%s] (played by someone else)"
-                                              % (char.key, ", ".join(char.permissions.all())))
+                                result.append(
+                                    f"\n - |R{char.key}|n [{', '.join(char.permissions.all())}] (played by someone else)"
+                                )
                     else:
                         # character is "free to puppet"
-                        result.append("\n - %s [%s]" % (char.key, ", ".join(char.permissions.all())))
+                        result.append(f"\n - {char.key} [{', '.join(char.permissions.all())}]")
             look_string = ("-" * 68) + "\n" + "".join(result) + "\n" + ("-" * 68)
             return look_string
 
@@ -1439,11 +1513,11 @@ def authenticate(cls, **kwargs):
         errors = []
         account = None
         username = None
-        ip = kwargs.get('ip', '').strip()
+        ip = kwargs.get("ip", "").strip()
 
         # check if guests are enabled.
         if not settings.GUEST_ENABLED:
-            errors.append('Guest accounts are not enabled on this server.')
+            errors.append("Guest accounts are not enabled on this server.")
             return None, errors
 
         try:
@@ -1455,7 +1529,7 @@ def authenticate(cls, **kwargs):
             if not username:
                 errors.append("All guest accounts are in use. Please try again later.")
                 if ip:
-                    LOGIN_THROTTLE.update(ip, 'Too many requests for Guest access.')
+                    LOGIN_THROTTLE.update(ip, "Too many requests for Guest access.")
                 return None, errors
             else:
                 # build a new account with the found guest username
@@ -1498,7 +1572,7 @@ def at_post_login(self, session=None, **kwargs):
                 overriding the call (unused by default).
 
         """
-        self._send_to_connect_channel("|G%s connected|n" % self.key)
+        self._send_to_connect_channel(f"|G{self.key} connected|n")
         self.puppet_object(session, self.db._last_puppet)
 
     def at_server_shutdown(self):
diff --git a/evennia/accounts/admin.py b/evennia/accounts/admin.py
index 9986e2bf7cb..9e245068dbc 100644
--- a/evennia/accounts/admin.py
+++ b/evennia/accounts/admin.py
@@ -2,8 +2,6 @@
 # This sets up how models are displayed
 # in the web admin interface.
 #
-from builtins import object
-
 from django import forms
 from django.conf import settings
 from django.contrib import admin
@@ -20,34 +18,34 @@ class AccountDBChangeForm(UserChangeForm):
     Modify the accountdb class.
 
     """
+
     class Meta(object):
         model = AccountDB
-        fields = '__all__'
+        fields = "__all__"
 
     username = forms.RegexField(
         label="Username",
         max_length=30,
-        regex=r'^[\w. @+-]+$',
-        widget=forms.TextInput(
-            attrs={'size': '30'}),
+        regex=r"^[\w. @+-]+$",
+        widget=forms.TextInput(attrs={"size": "30"}),
         error_messages={
-            'invalid': "This value may contain only letters, spaces, numbers "
-                       "and @/./+/-/_ characters."},
-        help_text="30 characters or fewer. Letters, spaces, digits and "
-                  "@/./+/-/_ only.")
+            "invalid": "This value may contain only letters, spaces, numbers "
+            "and @/./+/-/_ characters."
+        },
+        help_text="30 characters or fewer. Letters, spaces, digits and " "@/./+/-/_ only.",
+    )
 
     def clean_username(self):
         """
         Clean the username and check its existence.
 
         """
-        username = self.cleaned_data['username']
+        username = self.cleaned_data["username"]
         if username.upper() == self.instance.username.upper():
             return username
         elif AccountDB.objects.filter(username__iexact=username):
-            raise forms.ValidationError('An account with that name '
-                                        'already exists.')
-        return self.cleaned_data['username']
+            raise forms.ValidationError("An account with that name " "already exists.")
+        return self.cleaned_data["username"]
 
 
 class AccountDBCreationForm(UserCreationForm):
@@ -57,28 +55,27 @@ class AccountDBCreationForm(UserCreationForm):
 
     class Meta(object):
         model = AccountDB
-        fields = '__all__'
+        fields = "__all__"
 
     username = forms.RegexField(
         label="Username",
         max_length=30,
-        regex=r'^[\w. @+-]+$',
-        widget=forms.TextInput(
-            attrs={'size': '30'}),
+        regex=r"^[\w. @+-]+$",
+        widget=forms.TextInput(attrs={"size": "30"}),
         error_messages={
-            'invalid': "This value may contain only letters, spaces, numbers "
-                       "and @/./+/-/_ characters."},
-        help_text="30 characters or fewer. Letters, spaces, digits and "
-                  "@/./+/-/_ only.")
+            "invalid": "This value may contain only letters, spaces, numbers "
+            "and @/./+/-/_ characters."
+        },
+        help_text="30 characters or fewer. Letters, spaces, digits and " "@/./+/-/_ only.",
+    )
 
     def clean_username(self):
         """
         Cleanup username.
         """
-        username = self.cleaned_data['username']
+        username = self.cleaned_data["username"]
         if AccountDB.objects.filter(username__iexact=username):
-            raise forms.ValidationError('An account with that name already '
-                                        'exists.')
+            raise forms.ValidationError("An account with that name already " "exists.")
         return username
 
 
@@ -87,61 +84,66 @@ class AccountForm(forms.ModelForm):
     Defines how to display Accounts
 
     """
+
     class Meta(object):
         model = AccountDB
-        fields = '__all__'
+        fields = "__all__"
 
     db_key = forms.RegexField(
         label="Username",
         initial="AccountDummy",
         max_length=30,
-        regex=r'^[\w. @+-]+$',
+        regex=r"^[\w. @+-]+$",
         required=False,
-        widget=forms.TextInput(attrs={'size': '30'}),
+        widget=forms.TextInput(attrs={"size": "30"}),
         error_messages={
-            'invalid': "This value may contain only letters, spaces, numbers"
-                       " and @/./+/-/_ characters."},
+            "invalid": "This value may contain only letters, spaces, numbers"
+            " and @/./+/-/_ characters."
+        },
         help_text="This should be the same as the connected Account's key "
-                  "name. 30 characters or fewer. Letters, spaces, digits and "
-                  "@/./+/-/_ only.")
+        "name. 30 characters or fewer. Letters, spaces, digits and "
+        "@/./+/-/_ only.",
+    )
 
     db_typeclass_path = forms.CharField(
         label="Typeclass",
         initial=settings.BASE_ACCOUNT_TYPECLASS,
-        widget=forms.TextInput(
-            attrs={'size': '78'}),
+        widget=forms.TextInput(attrs={"size": "78"}),
         help_text="Required. Defines what 'type' of entity this is. This "
-                  "variable holds a Python path to a module with a valid "
-                  "Evennia Typeclass. Defaults to "
-                  "settings.BASE_ACCOUNT_TYPECLASS.")
+        "variable holds a Python path to a module with a valid "
+        "Evennia Typeclass. Defaults to "
+        "settings.BASE_ACCOUNT_TYPECLASS.",
+    )
 
     db_permissions = forms.CharField(
         label="Permissions",
         initial=settings.PERMISSION_ACCOUNT_DEFAULT,
         required=False,
-        widget=forms.TextInput(
-            attrs={'size': '78'}),
+        widget=forms.TextInput(attrs={"size": "78"}),
         help_text="In-game permissions. A comma-separated list of text "
-                  "strings checked by certain locks. They are often used for "
-                  "hierarchies, such as letting an Account have permission "
-                  "'Admin', 'Builder' etc. An Account permission can be "
-                  "overloaded by the permissions of a controlled Character. "
-                  "Normal accounts use 'Accounts' by default.")
+        "strings checked by certain locks. They are often used for "
+        "hierarchies, such as letting an Account have permission "
+        "'Admin', 'Builder' etc. An Account permission can be "
+        "overloaded by the permissions of a controlled Character. "
+        "Normal accounts use 'Accounts' by default.",
+    )
 
     db_lock_storage = forms.CharField(
         label="Locks",
-        widget=forms.Textarea(attrs={'cols': '100', 'rows': '2'}),
+        widget=forms.Textarea(attrs={"cols": "100", "rows": "2"}),
         required=False,
         help_text="In-game lock definition string. If not given, defaults "
-                  "will be used. This string should be on the form "
-                  "<i>type:lockfunction(args);type2:lockfunction2(args);...")
+        "will be used. This string should be on the form "
+        "<i>type:lockfunction(args);type2:lockfunction2(args);...",
+    )
     db_cmdset_storage = forms.CharField(
         label="cmdset",
         initial=settings.CMDSET_ACCOUNT,
-        widget=forms.TextInput(attrs={'size': '78'}),
+        widget=forms.TextInput(attrs={"size": "78"}),
         required=False,
         help_text="python path to account cmdset class (set in "
-                  "settings.CMDSET_ACCOUNT by default)")
+        "settings.CMDSET_ACCOUNT by default)",
+    )
 
 
 class AccountInline(admin.StackedInline):
@@ -149,19 +151,29 @@ class AccountInline(admin.StackedInline):
     Inline creation of Account
 
     """
+
     model = AccountDB
     template = "admin/accounts/stacked.html"
     form = AccountForm
     fieldsets = (
-        ("In-game Permissions and Locks",
-         {'fields': ('db_lock_storage',),
-          #{'fields': ('db_permissions', 'db_lock_storage'),
-          'description': "<i>These are permissions/locks for in-game use. "
-                         "They are unrelated to website access rights.</i>"}),
-        ("In-game Account data",
-         {'fields': ('db_typeclass_path', 'db_cmdset_storage'),
-          'description': "<i>These fields define in-game-specific properties "
-                         "for the Account object in-game.</i>"}))
+        (
+            "In-game Permissions and Locks",
+            {
+                "fields": ("db_lock_storage",),
+                # {'fields': ('db_permissions', 'db_lock_storage'),
+                "description": "<i>These are permissions/locks for in-game use. "
+                "They are unrelated to website access rights.</i>",
+            },
+        ),
+        (
+            "In-game Account data",
+            {
+                "fields": ("db_typeclass_path", "db_cmdset_storage"),
+                "description": "<i>These fields define in-game-specific properties "
+                "for the Account object in-game.</i>",
+            },
+        ),
+    )
 
     extra = 1
     max_num = 1
@@ -172,6 +184,7 @@ class AccountTagInline(TagInline):
     Inline Account Tags.
 
     """
+
     model = AccountDB.db_tags.through
     related_field = "accountdb"
 
@@ -181,6 +194,7 @@ class AccountAttributeInline(AttributeInline):
     Inline Account Attributes.
 
     """
+
     model = AccountDB.db_attributes.through
     related_field = "accountdb"
 
@@ -191,30 +205,43 @@ class AccountDBAdmin(BaseUserAdmin):
 
     """
 
-    list_display = ('username', 'email', 'is_staff', 'is_superuser')
+    list_display = ("username", "email", "is_staff", "is_superuser")
     form = AccountDBChangeForm
     add_form = AccountDBCreationForm
     inlines = [AccountTagInline, AccountAttributeInline]
     fieldsets = (
-        (None, {'fields': ('username', 'password', 'email')}),
-        ('Website profile', {
-            'fields': ('first_name', 'last_name'),
-            'description': "<i>These are not used "
-                           "in the default system.</i>"}),
-        ('Website dates', {
-            'fields': ('last_login', 'date_joined'),
-            'description': '<i>Relevant only to the website.</i>'}),
-        ('Website Permissions', {
-            'fields': ('is_active', 'is_staff', 'is_superuser',
-                       'user_permissions', 'groups'),
-            'description': "<i>These are permissions/permission groups for "
-                           "accessing the admin site. They are unrelated to "
-                           "in-game access rights.</i>"}),
-        ('Game Options', {
-            'fields': ('db_typeclass_path', 'db_cmdset_storage',
-                       'db_lock_storage'),
-            'description': '<i>These are attributes that are more relevant '
-                           'to gameplay.</i>'}))
+        (None, {"fields": ("username", "password", "email")}),
+        (
+            "Website profile",
+            {
+                "fields": ("first_name", "last_name"),
+                "description": "<i>These are not used " "in the default system.</i>",
+            },
+        ),
+        (
+            "Website dates",
+            {
+                "fields": ("last_login", "date_joined"),
+                "description": "<i>Relevant only to the website.</i>",
+            },
+        ),
+        (
+            "Website Permissions",
+            {
+                "fields": ("is_active", "is_staff", "is_superuser", "user_permissions", "groups"),
+                "description": "<i>These are permissions/permission groups for "
+                "accessing the admin site. They are unrelated to "
+                "in-game access rights.</i>",
+            },
+        ),
+        (
+            "Game Options",
+            {
+                "fields": ("db_typeclass_path", "db_cmdset_storage", "db_lock_storage"),
+                "description": "<i>These are attributes that are more relevant " "to gameplay.</i>",
+            },
+        ),
+    )
     # ('Game Options', {'fields': (
     #     'db_typeclass_path', 'db_cmdset_storage',
     #     'db_permissions', 'db_lock_storage'),
@@ -222,10 +249,15 @@ class AccountDBAdmin(BaseUserAdmin):
     #                    'more relevant to gameplay.</i>'}))
 
     add_fieldsets = (
-        (None,
-         {'fields': ('username', 'password1', 'password2', 'email'),
-          'description': "<i>These account details are shared by the admin "
-                         "system and the game.</i>"},),)
+        (
+            None,
+            {
+                "fields": ("username", "password1", "password2", "email"),
+                "description": "<i>These account details are shared by the admin "
+                "system and the game.</i>",
+            },
+        ),
+    )
 
     def save_model(self, request, obj, form, change):
         """
@@ -248,6 +280,7 @@ def save_model(self, request, obj, form, change):
     def response_add(self, request, obj, post_url_continue=None):
         from django.http import HttpResponseRedirect
         from django.urls import reverse
+
         return HttpResponseRedirect(reverse("admin:accounts_accountdb_change", args=[obj.id]))
 
 
diff --git a/evennia/accounts/bots.py b/evennia/accounts/bots.py
index 35e73d4aaad..455e10b6291 100644
--- a/evennia/accounts/bots.py
+++ b/evennia/accounts/bots.py
@@ -23,6 +23,7 @@
 
 # Bot helper utilities
 
+
 class BotStarter(DefaultScript):
     """
     This non-repeating script has the
@@ -80,6 +81,7 @@ def at_server_shutdown(self):
         """
         self.db.started = False
 
+
 #
 # Bot base class
 
@@ -100,11 +102,13 @@ def basetype_setup(self):
         # the text encoding to use.
         self.db.encoding = "utf-8"
         # A basic security setup (also avoid idle disconnects)
-        lockstring = "examine:perm(Admin);edit:perm(Admin);delete:perm(Admin);" \
-                     "boot:perm(Admin);msg:false();noidletimeout:true()"
+        lockstring = (
+            "examine:perm(Admin);edit:perm(Admin);delete:perm(Admin);"
+            "boot:perm(Admin);msg:false();noidletimeout:true()"
+        )
         self.locks.add(lockstring)
         # set the basics of being a bot
-        script_key = "%s" % self.key
+        script_key = str(self.key)
         self.scripts.add(BotStarter, key=script_key)
         self.is_bot = True
 
@@ -143,16 +147,25 @@ def at_server_shutdown(self):
 
 # IRC
 
+
 class IRCBot(Bot):
     """
     Bot for handling IRC connections.
 
     """
+
     # override this on a child class to use custom factory
     factory_path = "evennia.server.portal.irc.IRCBotFactory"
 
-    def start(self, ev_channel=None, irc_botname=None, irc_channel=None,
-              irc_network=None, irc_port=None, irc_ssl=None):
+    def start(
+        self,
+        ev_channel=None,
+        irc_botname=None,
+        irc_channel=None,
+        irc_network=None,
+        irc_port=None,
+        irc_ssl=None,
+    ):
         """
         Start by telling the portal to start a new session.
 
@@ -187,7 +200,7 @@ def start(self, ev_channel=None, irc_botname=None, irc_channel=None,
             # connect to Evennia channel
             channel = search.channel_search(ev_channel)
             if not channel:
-                raise RuntimeError("Evennia Channel '%s' not found." % ev_channel)
+                raise RuntimeError(f"Evennia Channel '{ev_channel}' not found.")
             channel = channel[0]
             channel.connect(self)
             self.db.ev_channel = channel
@@ -202,12 +215,14 @@ def start(self, ev_channel=None, irc_botname=None, irc_channel=None,
 
         # instruct the server and portal to create a new session with
         # the stored configuration
-        configdict = {"uid": self.dbid,
-                      "botname": self.db.irc_botname,
-                      "channel": self.db.irc_channel,
-                      "network": self.db.irc_network,
-                      "port": self.db.irc_port,
-                      "ssl": self.db.irc_ssl}
+        configdict = {
+            "uid": self.dbid,
+            "botname": self.db.irc_botname,
+            "channel": self.db.irc_channel,
+            "network": self.db.irc_network,
+            "port": self.db.irc_port,
+            "ssl": self.db.irc_ssl,
+        }
         _SESSIONS.start_bot_session(self.factory_path, configdict)
 
     def at_msg_send(self, **kwargs):
@@ -275,8 +290,11 @@ def msg(self, text=None, **kwargs):
             # cache channel lookup
             self.ndb.ev_channel = self.db.ev_channel
 
-        if ("from_channel" in options and text and
-                self.ndb.ev_channel.dbid == options["from_channel"]):
+        if (
+            "from_channel" in options
+            and text
+            and self.ndb.ev_channel.dbid == options["from_channel"]
+        ):
             if not from_obj or from_obj != [self]:
                 super().msg(channel=text)
 
@@ -307,19 +325,19 @@ def execute_cmd(self, session=None, txt=None, **kwargs):
         if kwargs["type"] == "nicklist":
             # the return of a nicklist request
             if hasattr(self, "_nicklist_callers") and self._nicklist_callers:
-                chstr = "%s (%s:%s)" % (self.db.irc_channel, self.db.irc_network, self.db.irc_port)
+                chstr = f"{self.db.irc_channel} ({self.db.irc_network}:{self.db.irc_port})"
                 nicklist = ", ".join(sorted(kwargs["nicklist"], key=lambda n: n.lower()))
                 for obj in self._nicklist_callers:
-                    obj.msg("Nicks at %s:\n %s" % (chstr, nicklist))
+                    obj.msg(f"Nicks at {chstr}:\n {nicklist}")
                 self._nicklist_callers = []
             return
 
         elif kwargs["type"] == "ping":
             # the return of a ping
             if hasattr(self, "_ping_callers") and self._ping_callers:
-                chstr = "%s (%s:%s)" % (self.db.irc_channel, self.db.irc_network, self.db.irc_port)
+                chstr = f"{self.db.irc_channel} ({self.db.irc_network}:{self.db.irc_port})"
                 for obj in self._ping_callers:
-                    obj.msg("IRC ping return from %s took %ss." % (chstr, kwargs["timing"]))
+                    obj.msg(f"IRC ping return from {chstr} took {kwargs['timing']}s.")
                 self._ping_callers = []
             return
 
@@ -338,13 +356,18 @@ def execute_cmd(self, session=None, txt=None, **kwargs):
                     delta_cmd = t0 - sess.cmd_last_visible
                     delta_conn = t0 - session.conn_time
                     account = sess.get_account()
-                    whos.append("%s (%s/%s)" % (utils.crop("|w%s|n" % account.name, width=25),
-                                                utils.time_format(delta_conn, 0),
-                                                utils.time_format(delta_cmd, 1)))
-                text = "Who list (online/idle): %s" % ", ".join(sorted(whos, key=lambda w: w.lower()))
+                    whos.append(
+                        "%s (%s/%s)"
+                        % (
+                            utils.crop("|w%s|n" % account.name, width=25),
+                            utils.time_format(delta_conn, 0),
+                            utils.time_format(delta_cmd, 1),
+                        )
+                    )
+                text = f"Who list (online/idle): {', '.join(sorted(whos, key=lambda w: w.lower()))}"
             elif txt.lower().startswith("about"):
                 # some bot info
-                text = "This is an Evennia IRC bot connecting from '%s'." % settings.SERVERNAME
+                text = f"This is an Evennia IRC bot connecting from '{settings.SERVERNAME}'."
             else:
                 text = "I understand 'who' and 'about'."
             super().msg(privmsg=((text,), {"user": user}))
@@ -352,10 +375,10 @@ def execute_cmd(self, session=None, txt=None, **kwargs):
             # something to send to the main channel
             if kwargs["type"] == "action":
                 # An action (irc pose)
-                text = "%s@%s %s" % (kwargs["user"], kwargs["channel"], txt)
+                text = f"{kwargs['user']}@{kwargs['channel']} {txt}"
             else:
                 # msg - A normal channel message
-                text = "%s@%s: %s" % (kwargs["user"], kwargs["channel"], txt)
+                text = f"{kwargs['user']}@{kwargs['channel']}: {txt}"
 
             if not self.ndb.ev_channel and self.db.ev_channel:
                 # cache channel lookup
@@ -364,6 +387,7 @@ def execute_cmd(self, session=None, txt=None, **kwargs):
             if self.ndb.ev_channel:
                 self.ndb.ev_channel.msg(text, senders=self)
 
+
 #
 # RSS
 
@@ -401,7 +425,7 @@ def start(self, ev_channel=None, rss_url=None, rss_rate=None):
             # connect to Evennia channel
             channel = search.channel_search(ev_channel)
             if not channel:
-                raise RuntimeError("Evennia Channel '%s' not found." % ev_channel)
+                raise RuntimeError(f"Evennia Channel '{ev_channel}' not found.")
             channel = channel[0]
             self.db.ev_channel = channel
         if rss_url:
@@ -410,9 +434,7 @@ def start(self, ev_channel=None, rss_url=None, rss_rate=None):
             self.db.rss_rate = rss_rate
         # instruct the server and portal to create a new session with
         # the stored configuration
-        configdict = {"uid": self.dbid,
-                      "url": self.db.rss_url,
-                      "rate": self.db.rss_rate}
+        configdict = {"uid": self.dbid, "url": self.db.rss_url, "rate": self.db.rss_rate}
         _SESSIONS.start_bot_session("evennia.server.portal.rss.RSSBotFactory", configdict)
 
     def execute_cmd(self, txt=None, session=None, **kwargs):
@@ -437,12 +459,14 @@ def execute_cmd(self, txt=None, session=None, **kwargs):
 
 # Grapevine bot
 
+
 class GrapevineBot(Bot):
     """
     g Grapevine (https://grapevine.haus) relayer. The channel to connect to is the first
     name in the settings.GRAPEVINE_CHANNELS list.
 
     """
+
     factory_path = "evennia.server.portal.grapevine.RestartingWebsocketServerFactory"
 
     def start(self, ev_channel=None, grapevine_channel=None):
@@ -463,7 +487,7 @@ def start(self, ev_channel=None, grapevine_channel=None):
             # connect to Evennia channel
             channel = search.channel_search(ev_channel)
             if not channel:
-                raise RuntimeError("Evennia Channel '%s' not found." % ev_channel)
+                raise RuntimeError(f"Evennia Channel '{ev_channel}' not found.")
             channel = channel[0]
             channel.connect(self)
             self.db.ev_channel = channel
@@ -472,8 +496,7 @@ def start(self, ev_channel=None, grapevine_channel=None):
             self.db.grapevine_channel = grapevine_channel
 
         # these will be made available as properties on the protocol factory
-        configdict = {"uid": self.dbid,
-                      "grapevine_channel": self.db.grapevine_channel}
+        configdict = {"uid": self.dbid, "grapevine_channel": self.db.grapevine_channel}
 
         _SESSIONS.start_bot_session(self.factory_path, configdict)
 
@@ -501,8 +524,11 @@ def msg(self, text=None, **kwargs):
             # cache channel lookup
             self.ndb.ev_channel = self.db.ev_channel
 
-        if ("from_channel" in options and text and
-                self.ndb.ev_channel.dbid == options["from_channel"]):
+        if (
+            "from_channel" in options
+            and text
+            and self.ndb.ev_channel.dbid == options["from_channel"]
+        ):
             if not from_obj or from_obj != [self]:
                 # send outputfunc channel(msg, chan, sender)
 
@@ -511,11 +537,25 @@ def msg(self, text=None, **kwargs):
                 # prefix since we pass that explicitly anyway
                 prefix, text = text.split(":", 1)
 
-                super().msg(channel=(text.strip(), self.db.grapevine_channel,
-                                     ", ".join(obj.key for obj in from_obj), {}))
-
-    def execute_cmd(self, txt=None, session=None, event=None, grapevine_channel=None,
-                    sender=None, game=None, **kwargs):
+                super().msg(
+                    channel=(
+                        text.strip(),
+                        self.db.grapevine_channel,
+                        ", ".join(obj.key for obj in from_obj),
+                        {},
+                    )
+                )
+
+    def execute_cmd(
+        self,
+        txt=None,
+        session=None,
+        event=None,
+        grapevine_channel=None,
+        sender=None,
+        game=None,
+        **kwargs,
+    ):
         """
         Take incoming data from protocol and send it to connected channel. This is
         triggered by the bot_data_in Inputfunc.
diff --git a/evennia/accounts/manager.py b/evennia/accounts/manager.py
index e8be5e41a77..3679444d00d 100644
--- a/evennia/accounts/manager.py
+++ b/evennia/accounts/manager.py
@@ -5,7 +5,8 @@
 import datetime
 from django.utils import timezone
 from django.contrib.auth.models import UserManager
-from evennia.typeclasses.managers import (TypedObjectManager, TypeclassManager)
+from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
+
 __all__ = ("AccountManager",)
 
 
@@ -13,6 +14,7 @@
 # Account Manager
 #
 
+
 class AccountDBManager(TypedObjectManager, UserManager):
     """
     This AccountManager implements methods for searching
@@ -90,8 +92,7 @@ def get_recently_connected_accounts(self, days=7):
         end_date = timezone.now()
         tdelta = datetime.timedelta(days)
         start_date = end_date - tdelta
-        return self.filter(last_login__range=(
-            start_date, end_date)).order_by('-last_login')
+        return self.filter(last_login__range=(start_date, end_date)).order_by("-last_login")
 
     def get_account_from_email(self, uemail):
         """
@@ -164,14 +165,22 @@ def search_account(self, ostring, exact=True, typeclass=None):
         if typeclass:
             # we accept both strings and actual typeclasses
             if callable(typeclass):
-                typeclass = "%s.%s" % (typeclass.__module__, typeclass.__name__)
+                typeclass = f"{typeclass.__module__}.{typeclass.__name__}"
             else:
-                typeclass = "%s" % typeclass
+                typeclass = str(typeclass)
             query["db_typeclass_path"] = typeclass
         if exact:
-            return self.filter(**query)
+            matches = self.filter(**query)
         else:
-            return self.filter(**query)
+            matches = self.filter(**query)
+        if not matches:
+            # try alias match
+            matches = self.filter(
+                db_tags__db_tagtype__iexact="alias",
+                **{"db_tags__db_key__iexact" if exact else "db_tags__db_key__icontains": ostring},
+            )
+        return matches
+
     # back-compatibility alias
     account_search = search_account
 
diff --git a/evennia/accounts/migrations/0001_initial.py b/evennia/accounts/migrations/0001_initial.py
index 9e7386c88cd..9fb41390eb3 100644
--- a/evennia/accounts/migrations/0001_initial.py
+++ b/evennia/accounts/migrations/0001_initial.py
@@ -8,42 +8,168 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('auth', '0001_initial'),
-        ('typeclasses', '0001_initial'),
-    ]
+    dependencies = [("auth", "0001_initial"), ("typeclasses", "0001_initial")]
 
     operations = [
         migrations.CreateModel(
-            name='AccountDB',
+            name="AccountDB",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, max_length=30, verbose_name='username', validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username.', 'invalid')])),
-                ('first_name', models.CharField(max_length=30, verbose_name='first name', blank=True)),
-                ('last_name', models.CharField(max_length=30, verbose_name='last name', blank=True)),
-                ('email', models.EmailField(max_length=75, verbose_name='email address', blank=True)),
-                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
-                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
-                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('db_key', models.CharField(max_length=255, verbose_name='key', db_index=True)),
-                ('db_typeclass_path', models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass')),
-                ('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
-                ('db_lock_storage', models.TextField(help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks', blank=True)),
-                ('db_is_connected', models.BooleanField(default=False, help_text='If account is connected to game or not', verbose_name='is_connected')),
-                ('db_cmdset_storage', models.CharField(help_text='optional python path to a cmdset class. If creating a Character, this will default to settings.CMDSET_CHARACTER.', max_length=255, null=True, verbose_name='cmdset')),
-                ('db_is_bot', models.BooleanField(default=False, help_text='Used to identify irc/rss bots', verbose_name='is_bot')),
-                ('db_attributes', models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)),
-                ('db_tags', models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True)),
-                ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of his/her group.', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                ("password", models.CharField(max_length=128, verbose_name="password")),
+                (
+                    "last_login",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="last login"
+                    ),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        help_text="Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        unique=True,
+                        max_length=30,
+                        verbose_name="username",
+                        validators=[
+                            django.core.validators.RegexValidator(
+                                "^[\\w.@+-]+$", "Enter a valid username.", "invalid"
+                            )
+                        ],
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(max_length=30, verbose_name="first name", blank=True),
+                ),
+                (
+                    "last_name",
+                    models.CharField(max_length=30, verbose_name="last name", blank=True),
+                ),
+                (
+                    "email",
+                    models.EmailField(max_length=75, verbose_name="email address", blank=True),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now, verbose_name="date joined"
+                    ),
+                ),
+                ("db_key", models.CharField(max_length=255, verbose_name="key", db_index=True)),
+                (
+                    "db_typeclass_path",
+                    models.CharField(
+                        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                        max_length=255,
+                        null=True,
+                        verbose_name="typeclass",
+                    ),
+                ),
+                (
+                    "db_date_created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                        verbose_name="locks",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_is_connected",
+                    models.BooleanField(
+                        default=False,
+                        help_text="If account is connected to game or not",
+                        verbose_name="is_connected",
+                    ),
+                ),
+                (
+                    "db_cmdset_storage",
+                    models.CharField(
+                        help_text="optional python path to a cmdset class. If creating a Character, this will default to settings.CMDSET_CHARACTER.",
+                        max_length=255,
+                        null=True,
+                        verbose_name="cmdset",
+                    ),
+                ),
+                (
+                    "db_is_bot",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Used to identify irc/rss bots",
+                        verbose_name="is_bot",
+                    ),
+                ),
+                (
+                    "db_attributes",
+                    models.ManyToManyField(
+                        help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                        to="typeclasses.Attribute",
+                        null=True,
+                    ),
+                ),
+                (
+                    "db_tags",
+                    models.ManyToManyField(
+                        help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                        to="typeclasses.Tag",
+                        null=True,
+                    ),
+                ),
+                (
+                    "groups",
+                    models.ManyToManyField(
+                        related_query_name="user",
+                        related_name="user_set",
+                        to="auth.Group",
+                        blank=True,
+                        help_text="The groups this user belongs to. A user will get all permissions granted to each of his/her group.",
+                        verbose_name="groups",
+                    ),
+                ),
+                (
+                    "user_permissions",
+                    models.ManyToManyField(
+                        related_query_name="user",
+                        related_name="user_set",
+                        to="auth.Permission",
+                        blank=True,
+                        help_text="Specific permissions for this user.",
+                        verbose_name="user permissions",
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Account',
-                'verbose_name_plural': 'Accounts',
-            },
+            options={"verbose_name": "Account", "verbose_name_plural": "Accounts"},
             bases=(models.Model,),
-        ),
+        )
     ]
diff --git a/evennia/accounts/migrations/0002_move_defaults.py b/evennia/accounts/migrations/0002_move_defaults.py
index f0b3d6dd519..2fe9143e1ff 100644
--- a/evennia/accounts/migrations/0002_move_defaults.py
+++ b/evennia/accounts/migrations/0002_move_defaults.py
@@ -13,10 +13,6 @@ def convert_defaults(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0001_initial'),
-    ]
+    dependencies = [("accounts", "0001_initial")]
 
-    operations = [
-        migrations.RunPython(convert_defaults),
-    ]
+    operations = [migrations.RunPython(convert_defaults)]
diff --git a/evennia/accounts/migrations/0003_auto_20150209_2234.py b/evennia/accounts/migrations/0003_auto_20150209_2234.py
index 81bb39abdb0..1a17b2c7a51 100644
--- a/evennia/accounts/migrations/0003_auto_20150209_2234.py
+++ b/evennia/accounts/migrations/0003_auto_20150209_2234.py
@@ -6,31 +6,17 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0002_move_defaults'),
-    ]
+    dependencies = [("accounts", "0002_move_defaults")]
 
     operations = [
         migrations.CreateModel(
-            name='DefaultAccount',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('accounts.accountdb',),
+            name="DefaultAccount", fields=[], options={"proxy": True}, bases=("accounts.accountdb",)
         ),
         migrations.CreateModel(
-            name='DefaultGuest',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('accounts.defaultaccount',),
-        ),
-        migrations.AlterModelOptions(
-            name='accountdb',
-            options={'verbose_name': 'Account'},
+            name="DefaultGuest",
+            fields=[],
+            options={"proxy": True},
+            bases=("accounts.defaultaccount",),
         ),
+        migrations.AlterModelOptions(name="accountdb", options={"verbose_name": "Account"}),
     ]
diff --git a/evennia/accounts/migrations/0004_auto_20150403_2339.py b/evennia/accounts/migrations/0004_auto_20150403_2339.py
index 2ce75241cf0..51217a83e5c 100644
--- a/evennia/accounts/migrations/0004_auto_20150403_2339.py
+++ b/evennia/accounts/migrations/0004_auto_20150403_2339.py
@@ -8,41 +8,52 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0003_auto_20150209_2234'),
-    ]
+    dependencies = [("accounts", "0003_auto_20150209_2234")]
 
     operations = [
-        migrations.DeleteModel(
-            name='DefaultGuest',
-        ),
-        migrations.DeleteModel(
-            name='DefaultAccount',
-        ),
+        migrations.DeleteModel(name="DefaultGuest"),
+        migrations.DeleteModel(name="DefaultAccount"),
         migrations.AlterModelManagers(
-            name='accountdb',
-            managers=[
-                ('objects', evennia.accounts.manager.AccountDBManager()),
-            ],
+            name="accountdb", managers=[("objects", evennia.accounts.manager.AccountDBManager())]
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='email',
-            field=models.EmailField(max_length=254, verbose_name='email address', blank=True),
+            model_name="accountdb",
+            name="email",
+            field=models.EmailField(max_length=254, verbose_name="email address", blank=True),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='groups',
-            field=models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups'),
+            model_name="accountdb",
+            name="groups",
+            field=models.ManyToManyField(
+                related_query_name="user",
+                related_name="user_set",
+                to="auth.Group",
+                blank=True,
+                help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+                verbose_name="groups",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='last_login',
-            field=models.DateTimeField(null=True, verbose_name='last login', blank=True),
+            model_name="accountdb",
+            name="last_login",
+            field=models.DateTimeField(null=True, verbose_name="last login", blank=True),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, max_length=30, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.', 'invalid')], help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', unique=True, verbose_name='username'),
+            model_name="accountdb",
+            name="username",
+            field=models.CharField(
+                error_messages={"unique": "A user with that username already exists."},
+                max_length=30,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        "^[\\w.@+-]+$",
+                        "Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.",
+                        "invalid",
+                    )
+                ],
+                help_text="Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                unique=True,
+                verbose_name="username",
+            ),
         ),
     ]
diff --git a/evennia/accounts/migrations/0005_auto_20160905_0902.py b/evennia/accounts/migrations/0005_auto_20160905_0902.py
index 22f5955c1b3..12f5f154df6 100644
--- a/evennia/accounts/migrations/0005_auto_20160905_0902.py
+++ b/evennia/accounts/migrations/0005_auto_20160905_0902.py
@@ -8,14 +8,24 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0004_auto_20150403_2339'),
-    ]
+    dependencies = [("accounts", "0004_auto_20150403_2339")]
 
     operations = [
         migrations.AlterField(
-            model_name='accountdb',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=30, unique=True, validators=[django.core.validators.RegexValidator('^[\\w.@+-]+$', 'Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.')], verbose_name='username'),
-        ),
+            model_name="accountdb",
+            name="username",
+            field=models.CharField(
+                error_messages={"unique": "A user with that username already exists."},
+                help_text="Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                max_length=30,
+                unique=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        "^[\\w.@+-]+$",
+                        "Enter a valid username. This value may contain only letters, numbers and @/./+/-/_ characters.",
+                    )
+                ],
+                verbose_name="username",
+            ),
+        )
     ]
diff --git a/evennia/accounts/migrations/0006_auto_20170606_1731.py b/evennia/accounts/migrations/0006_auto_20170606_1731.py
index 50e084d242f..5303526e33f 100644
--- a/evennia/accounts/migrations/0006_auto_20170606_1731.py
+++ b/evennia/accounts/migrations/0006_auto_20170606_1731.py
@@ -8,24 +8,35 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0005_auto_20160905_0902'),
-    ]
+    dependencies = [("accounts", "0005_auto_20160905_0902")]
 
     operations = [
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="accountdb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="accountdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.ASCIIUsernameValidator()], verbose_name='username'),
+            model_name="accountdb",
+            name="username",
+            field=models.CharField(
+                error_messages={"unique": "A user with that username already exists."},
+                help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                max_length=150,
+                unique=True,
+                validators=[django.contrib.auth.validators.ASCIIUsernameValidator()],
+                verbose_name="username",
+            ),
         ),
     ]
diff --git a/evennia/accounts/migrations/0007_copy_player_to_account.py b/evennia/accounts/migrations/0007_copy_player_to_account.py
index 0e573f2fa5a..3ac4cb1848f 100644
--- a/evennia/accounts/migrations/0007_copy_player_to_account.py
+++ b/evennia/accounts/migrations/0007_copy_player_to_account.py
@@ -8,31 +8,33 @@
 
 def forwards(apps, schema_editor):
     try:
-        PlayerDB = apps.get_model('players', 'PlayerDB')
+        PlayerDB = apps.get_model("players", "PlayerDB")
     except LookupError:
         # playerdb not available. Skip.
         return
 
-    AccountDB = apps.get_model('accounts', 'AccountDB')
+    AccountDB = apps.get_model("accounts", "AccountDB")
     for player in PlayerDB.objects.all():
-        account = AccountDB(id=player.id,
-                            password=player.password,
-                            is_superuser=player.is_superuser,
-                            last_login=player.last_login,
-                            username=player.username,
-                            first_name=player.first_name,
-                            last_name=player.last_name,
-                            email=player.email,
-                            is_staff=player.is_staff,
-                            is_active=player.is_active,
-                            date_joined=player.date_joined,
-                            db_key=player.db_key,
-                            db_typeclass_path=player.db_typeclass_path,
-                            db_date_created=player.db_date_created,
-                            db_lock_storage=player.db_lock_storage,
-                            db_is_connected=player.db_is_connected,
-                            db_cmdset_storage=player.db_cmdset_storage,
-                            db_is_bot=player.db_is_bot)
+        account = AccountDB(
+            id=player.id,
+            password=player.password,
+            is_superuser=player.is_superuser,
+            last_login=player.last_login,
+            username=player.username,
+            first_name=player.first_name,
+            last_name=player.last_name,
+            email=player.email,
+            is_staff=player.is_staff,
+            is_active=player.is_active,
+            date_joined=player.date_joined,
+            db_key=player.db_key,
+            db_typeclass_path=player.db_typeclass_path,
+            db_date_created=player.db_date_created,
+            db_lock_storage=player.db_lock_storage,
+            db_is_connected=player.db_is_connected,
+            db_cmdset_storage=player.db_cmdset_storage,
+            db_is_bot=player.db_is_bot,
+        )
         account.save()
         for group in player.groups.all():
             account.groups.add(group)
@@ -46,13 +48,9 @@ def forwards(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0006_auto_20170606_1731'),
-    ]
+    dependencies = [("accounts", "0006_auto_20170606_1731")]
 
-    operations = [
-        migrations.RunPython(forwards, migrations.RunPython.noop)
-    ]
+    operations = [migrations.RunPython(forwards, migrations.RunPython.noop)]
 
-    if global_apps.is_installed('players'):
-        dependencies.append(('players', '0006_auto_20170606_1731'))
+    if global_apps.is_installed("players"):
+        dependencies.append(("players", "0006_auto_20170606_1731"))
diff --git a/evennia/accounts/migrations/0008_auto_20190128_1820.py b/evennia/accounts/migrations/0008_auto_20190128_1820.py
index dbef6f41fdc..9437f900d9a 100644
--- a/evennia/accounts/migrations/0008_auto_20190128_1820.py
+++ b/evennia/accounts/migrations/0008_auto_20190128_1820.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 18:20
-from __future__ import unicode_literals
 
 import django.contrib.auth.validators
 from django.db import migrations, models
@@ -9,65 +8,93 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('accounts', '0007_copy_player_to_account'),
-    ]
+    dependencies = [("accounts", "0007_copy_player_to_account")]
 
     operations = [
         migrations.AlterModelManagers(
-            name='accountdb',
-            managers=[
-                ('objects', evennia.accounts.manager.AccountDBManager()),
-            ],
+            name="accountdb", managers=[("objects", evennia.accounts.manager.AccountDBManager())]
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="accountdb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_cmdset_storage',
-            field=models.CharField(help_text='optional python path to a cmdset class. If creating a Character, this will default to settings.CMDSET_CHARACTER.', max_length=255, null=True, verbose_name='cmdset'),
+            model_name="accountdb",
+            name="db_cmdset_storage",
+            field=models.CharField(
+                help_text="optional python path to a cmdset class. If creating a Character, this will default to settings.CMDSET_CHARACTER.",
+                max_length=255,
+                null=True,
+                verbose_name="cmdset",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='creation date'),
+            model_name="accountdb",
+            name="db_date_created",
+            field=models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_is_bot',
-            field=models.BooleanField(default=False, help_text='Used to identify irc/rss bots', verbose_name='is_bot'),
+            model_name="accountdb",
+            name="db_is_bot",
+            field=models.BooleanField(
+                default=False, help_text="Used to identify irc/rss bots", verbose_name="is_bot"
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_is_connected',
-            field=models.BooleanField(default=False, help_text='If player is connected to game or not', verbose_name='is_connected'),
+            model_name="accountdb",
+            name="db_is_connected",
+            field=models.BooleanField(
+                default=False,
+                help_text="If player is connected to game or not",
+                verbose_name="is_connected",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_key',
-            field=models.CharField(db_index=True, max_length=255, verbose_name='key'),
+            model_name="accountdb",
+            name="db_key",
+            field=models.CharField(db_index=True, max_length=255, verbose_name="key"),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks'),
+            model_name="accountdb",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True,
+                help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                verbose_name="locks",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="accountdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='db_typeclass_path',
-            field=models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass'),
+            model_name="accountdb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
         ),
         migrations.AlterField(
-            model_name='accountdb',
-            name='username',
-            field=models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username'),
+            model_name="accountdb",
+            name="username",
+            field=models.CharField(
+                error_messages={"unique": "A user with that username already exists."},
+                help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                max_length=150,
+                unique=True,
+                validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
+                verbose_name="username",
+            ),
         ),
     ]
diff --git a/evennia/accounts/migrations/0009_auto_20191025_0831.py b/evennia/accounts/migrations/0009_auto_20191025_0831.py
new file mode 100644
index 00000000000..f61e9e89316
--- /dev/null
+++ b/evennia/accounts/migrations/0009_auto_20191025_0831.py
@@ -0,0 +1,27 @@
+# Generated by Django 2.2.6 on 2019-10-25 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("accounts", "0008_auto_20190128_1820")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="accountdb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                db_index=True,
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="accountdb",
+            name="last_name",
+            field=models.CharField(blank=True, max_length=150, verbose_name="last name"),
+        ),
+    ]
diff --git a/evennia/accounts/models.py b/evennia/accounts/models.py
index a0283e2aef5..06d46d9777f 100644
--- a/evennia/accounts/models.py
+++ b/evennia/accounts/models.py
@@ -15,8 +15,6 @@
 account info and OOC account configuration variables etc.
 
 """
-from builtins import object
-
 from django.conf import settings
 from django.db import models
 from django.contrib.auth.models import AbstractUser
@@ -29,8 +27,8 @@
 
 __all__ = ("AccountDB",)
 
-#_ME = _("me")
-#_SELF = _("self")
+# _ME = _("me")
+# _SELF = _("self")
 
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
 
@@ -41,11 +39,12 @@
 _TYPECLASS = None
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # AccountDB
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class AccountDB(TypedObject, AbstractUser):
     """
@@ -85,14 +84,22 @@ class AccountDB(TypedObject, AbstractUser):
 
     # store a connected flag here too, not just in sessionhandler.
     # This makes it easier to track from various out-of-process locations
-    db_is_connected = models.BooleanField(default=False,
-                                          verbose_name="is_connected",
-                                          help_text="If player is connected to game or not")
+    db_is_connected = models.BooleanField(
+        default=False,
+        verbose_name="is_connected",
+        help_text="If player is connected to game or not",
+    )
     # database storage of persistant cmdsets.
-    db_cmdset_storage = models.CharField('cmdset', max_length=255, null=True,
-                                         help_text="optional python path to a cmdset class. If creating a Character, this will default to settings.CMDSET_CHARACTER.")
+    db_cmdset_storage = models.CharField(
+        "cmdset",
+        max_length=255,
+        null=True,
+        help_text="optional python path to a cmdset class. If creating a Character, this will default to settings.CMDSET_CHARACTER.",
+    )
     # marks if this is a "virtual" bot account object
-    db_is_bot = models.BooleanField(default=False, verbose_name="is_bot", help_text="Used to identify irc/rss bots")
+    db_is_bot = models.BooleanField(
+        default=False, verbose_name="is_bot", help_text="Used to identify irc/rss bots"
+    )
 
     # Database manager
     objects = AccountDBManager()
@@ -103,20 +110,20 @@ class AccountDB(TypedObject, AbstractUser):
     __applabel__ = "accounts"
 
     class Meta(object):
-        verbose_name = 'Account'
+        verbose_name = "Account"
 
     # cmdset_storage property
     # This seems very sensitive to caching, so leaving it be for now /Griatch
-    #@property
+    # @property
     def __cmdset_storage_get(self):
         """
         Getter. Allows for value = self.name. Returns a list of cmdset_storage.
         """
         storage = self.db_cmdset_storage
         # we need to check so storage is not None
-        return [path.strip() for path in storage.split(',')] if storage else []
+        return [path.strip() for path in storage.split(",")] if storage else []
 
-    #@cmdset_storage.setter
+    # @cmdset_storage.setter
     def __cmdset_storage_set(self, value):
         """
         Setter. Allows for self.name = value. Stores as a comma-separated
@@ -125,11 +132,12 @@ def __cmdset_storage_set(self, value):
         _SA(self, "db_cmdset_storage", ",".join(str(val).strip() for val in make_iter(value)))
         _GA(self, "save")()
 
-    #@cmdset_storage.deleter
+    # @cmdset_storage.deleter
     def __cmdset_storage_del(self):
         "Deleter. Allows for del self.name"
         _SA(self, "db_cmdset_storage", None)
         _GA(self, "save")()
+
     cmdset_storage = property(__cmdset_storage_get, __cmdset_storage_set, __cmdset_storage_del)
 
     #
@@ -137,12 +145,12 @@ def __cmdset_storage_del(self):
     #
 
     def __str__(self):
-        return smart_str("%s(account %s)" % (self.name, self.dbid))
+        return smart_str(f"{self.name}(account {self.dbid})")
 
     def __repr__(self):
-        return "%s(account#%s)" % (self.name, self.dbid)
+        return f"{self.name}(account#{self.dbid})"
 
-    #@property
+    # @property
     def __username_get(self):
         return self.username
 
@@ -159,7 +167,7 @@ def __username_del(self):
     name = property(__username_get, __username_set, __username_del)
     key = property(__username_get, __username_set, __username_del)
 
-    #@property
+    # @property
     def __uid_get(self):
         "Getter. Retrieves the user id"
         return self.id
@@ -169,4 +177,5 @@ def __uid_set(self, value):
 
     def __uid_del(self):
         raise Exception("User id cannot be deleted!")
+
     uid = property(__uid_get, __uid_set, __uid_del)
diff --git a/evennia/accounts/tests.py b/evennia/accounts/tests.py
index 67cca232465..c4b3e80391e 100644
--- a/evennia/accounts/tests.py
+++ b/evennia/accounts/tests.py
@@ -20,12 +20,15 @@ class TestAccountSessionHandler(TestCase):
 
     def setUp(self):
         self.account = create.create_account(
-            "TestAccount%s" % randint(0, 999999), email="test@test.com",
-            password="testpassword", typeclass=DefaultAccount)
+            f"TestAccount{randint(0, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
         self.handler = AccountSessionHandler(self.account)
 
     def tearDown(self):
-        if hasattr(self, 'account'):
+        if hasattr(self, "account"):
             self.account.delete()
 
     def test_get(self):
@@ -67,22 +70,24 @@ def test_count(self):
 class TestDefaultGuest(EvenniaTest):
     "Check DefaultGuest class"
 
-    ip = '212.216.134.22'
-    
+    ip = "212.216.134.22"
+
     @override_settings(GUEST_ENABLED=False)
     def test_create_not_enabled(self):
         # Guest account should not be permitted
         account, errors = DefaultGuest.authenticate(ip=self.ip)
-        self.assertFalse(account, 'Guest account was created despite being disabled.')
+        self.assertFalse(account, "Guest account was created despite being disabled.")
 
     def test_authenticate(self):
         # Create a guest account
         account, errors = DefaultGuest.authenticate(ip=self.ip)
-        self.assertTrue(account, 'Guest account should have been created.')
+        self.assertTrue(account, "Guest account should have been created.")
 
         # Create a second guest account
         account, errors = DefaultGuest.authenticate(ip=self.ip)
-        self.assertFalse(account, 'Two guest accounts were created with a single entry on the guest list!')
+        self.assertFalse(
+            account, "Two guest accounts were created with a single entry on the guest list!"
+        )
 
     @patch("evennia.accounts.accounts.ChannelDB.objects.get_channel")
     def test_create(self, get_channel):
@@ -112,42 +117,52 @@ def test_at_post_disconnect(self):
 
 
 class TestDefaultAccountAuth(EvenniaTest):
-
     def setUp(self):
         super(TestDefaultAccountAuth, self).setUp()
 
         self.password = "testpassword"
         self.account.delete()
-        self.account = create.create_account("TestAccount%s" % randint(100000, 999999), email="test@test.com", password=self.password, typeclass=DefaultAccount)
+        self.account = create.create_account(
+            f"TestAccount{randint(100000, 999999)}",
+            email="test@test.com",
+            password=self.password,
+            typeclass=DefaultAccount,
+        )
 
     def test_authentication(self):
         "Confirm Account authentication method is authenticating/denying users."
         # Valid credentials
         obj, errors = DefaultAccount.authenticate(self.account.name, self.password)
-        self.assertTrue(obj, 'Account did not authenticate given valid credentials.')
+        self.assertTrue(obj, "Account did not authenticate given valid credentials.")
 
         # Invalid credentials
-        obj, errors = DefaultAccount.authenticate(self.account.name, 'xyzzy')
-        self.assertFalse(obj, 'Account authenticated using invalid credentials.')
+        obj, errors = DefaultAccount.authenticate(self.account.name, "xyzzy")
+        self.assertFalse(obj, "Account authenticated using invalid credentials.")
 
     def test_create(self):
         "Confirm Account creation is working as expected."
         # Create a normal account
-        account, errors = DefaultAccount.create(username='ziggy', password='stardust11')
-        self.assertTrue(account, 'New account should have been created.')
+        account, errors = DefaultAccount.create(username="ziggy", password="stardust11")
+        self.assertTrue(account, "New account should have been created.")
 
         # Try creating a duplicate account
-        account2, errors = DefaultAccount.create(username='Ziggy', password='starman11')
-        self.assertFalse(account2, 'Duplicate account name should not have been allowed.')
+        account2, errors = DefaultAccount.create(username="Ziggy", password="starman11")
+        self.assertFalse(account2, "Duplicate account name should not have been allowed.")
         account.delete()
 
     def test_throttle(self):
         "Confirm throttle activates on too many failures."
         for x in range(20):
-            obj, errors = DefaultAccount.authenticate(self.account.name, 'xyzzy', ip='12.24.36.48')
-            self.assertFalse(obj, 'Authentication was provided a bogus password; this should NOT have returned an account!')
+            obj, errors = DefaultAccount.authenticate(self.account.name, "xyzzy", ip="12.24.36.48")
+            self.assertFalse(
+                obj,
+                "Authentication was provided a bogus password; this should NOT have returned an account!",
+            )
 
-        self.assertTrue('too many login failures' in errors[-1].lower(), 'Failed logins should have been throttled.')
+        self.assertTrue(
+            "too many login failures" in errors[-1].lower(),
+            "Failed logins should have been throttled.",
+        )
 
     def test_username_validation(self):
         "Check username validators deny relevant usernames"
@@ -156,7 +171,7 @@ def test_username_validation(self):
         if not uses_database("mysql"):
             # TODO As of Mar 2019, mysql does not pass this test due to collation problems
             # that has not been possible to resolve
-            result, error = DefaultAccount.validate_username('¯\_(ツ)_/¯')
+            result, error = DefaultAccount.validate_username("¯\_(ツ)_/¯")
             self.assertFalse(result, "Validator allowed kanji in username.")
 
         # Should not allow duplicate username
@@ -164,35 +179,44 @@ def test_username_validation(self):
         self.assertFalse(result, "Duplicate username should not have passed validation.")
 
         # Should not allow username too short
-        result, error = DefaultAccount.validate_username('xx')
+        result, error = DefaultAccount.validate_username("xx")
         self.assertFalse(result, "2-character username passed validation.")
 
     def test_password_validation(self):
         "Check password validators deny bad passwords"
 
-        account = create.create_account("TestAccount%s" % randint(100000, 999999),
-                email="test@test.com", password="testpassword", typeclass=DefaultAccount)
-        for bad in ('', '123', 'password', 'TestAccount', '#', 'xyzzy'):
+        account = create.create_account(
+            f"TestAccount{randint(100000, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
+        for bad in ("", "123", "password", "TestAccount", "#", "xyzzy"):
             self.assertFalse(account.validate_password(bad, account=self.account)[0])
 
         "Check validators allow sufficiently complex passwords"
-        for better in ('Mxyzptlk', "j0hn, i'M 0n1y d4nc1nG"):
+        for better in ("Mxyzptlk", "j0hn, i'M 0n1y d4nc1nG"):
             self.assertTrue(account.validate_password(better, account=self.account)[0])
         account.delete()
 
     def test_password_change(self):
         "Check password setting and validation is working as expected"
-        account = create.create_account("TestAccount%s" % randint(100000, 999999),
-                email="test@test.com", password="testpassword", typeclass=DefaultAccount)
+        account = create.create_account(
+            f"TestAccount{randint(100000, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
 
         from django.core.exceptions import ValidationError
+
         # Try setting some bad passwords
-        for bad in ('', '#', 'TestAccount', 'password'):
+        for bad in ("", "#", "TestAccount", "password"):
             valid, error = account.validate_password(bad, account)
             self.assertFalse(valid)
 
         # Try setting a better password (test for False; returns None on success)
-        self.assertFalse(account.set_password('Mxyzptlk'))
+        self.assertFalse(account.set_password("Mxyzptlk"))
         account.delete()
 
 
@@ -228,8 +252,11 @@ def test_puppet_object_already_puppeting(self):
         import evennia.server.sessionhandler
 
         account = create.create_account(
-            "TestAccount%s" % randint(0, 999999), email="test@test.com",
-            password="testpassword", typeclass=DefaultAccount)
+            f"TestAccount{randint(0, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
         self.s1.uid = account.uid
         evennia.server.sessionhandler.SESSIONS[self.s1.uid] = self.s1
 
@@ -239,7 +266,9 @@ def test_puppet_object_already_puppeting(self):
         obj = Mock()
         self.s1.puppet = obj
         account.puppet_object(self.s1, obj)
-        self.s1.data_out.assert_called_with(options=None, text="You are already puppeting this object.")
+        self.s1.data_out.assert_called_with(
+            options=None, text="You are already puppeting this object."
+        )
         self.assertIsNone(obj.at_post_puppet.call_args)
 
     def test_puppet_object_no_permission(self):
@@ -247,7 +276,12 @@ def test_puppet_object_no_permission(self):
 
         import evennia.server.sessionhandler
 
-        account = create.create_account("TestAccount%s" % randint(0, 999999), email="test@test.com", password="testpassword", typeclass=DefaultAccount)
+        account = create.create_account(
+            f"TestAccount{randint(0, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
         self.s1.uid = account.uid
         evennia.server.sessionhandler.SESSIONS[self.s1.uid] = self.s1
 
@@ -257,7 +291,9 @@ def test_puppet_object_no_permission(self):
 
         account.puppet_object(self.s1, obj)
 
-        self.assertTrue(self.s1.data_out.call_args[1]['text'].startswith("You don't have permission to puppet"))
+        self.assertTrue(
+            self.s1.data_out.call_args[1]["text"].startswith("You don't have permission to puppet")
+        )
         self.assertIsNone(obj.at_post_puppet.call_args)
 
     @override_settings(MULTISESSION_MODE=0)
@@ -266,7 +302,12 @@ def test_puppet_object_joining_other_session(self):
 
         import evennia.server.sessionhandler
 
-        account = create.create_account("TestAccount%s" % randint(0, 999999), email="test@test.com", password="testpassword", typeclass=DefaultAccount)
+        account = create.create_account(
+            f"TestAccount{randint(0, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
         self.s1.uid = account.uid
         evennia.server.sessionhandler.SESSIONS[self.s1.uid] = self.s1
 
@@ -281,7 +322,9 @@ def test_puppet_object_joining_other_session(self):
 
         account.puppet_object(self.s1, obj)
         # works because django.conf.settings.MULTISESSION_MODE is not in (1, 3)
-        self.assertTrue(self.s1.data_out.call_args[1]['text'].endswith("from another of your sessions.|n"))
+        self.assertTrue(
+            self.s1.data_out.call_args[1]["text"].endswith("from another of your sessions.|n")
+        )
         self.assertTrue(obj.at_post_puppet.call_args[1] == {})
 
     def test_puppet_object_already_puppeted(self):
@@ -289,7 +332,12 @@ def test_puppet_object_already_puppeted(self):
 
         import evennia.server.sessionhandler
 
-        account = create.create_account("TestAccount%s" % randint(0, 999999), email="test@test.com", password="testpassword", typeclass=DefaultAccount)
+        account = create.create_account(
+            f"TestAccount{randint(0, 999999)}",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=DefaultAccount,
+        )
         self.account = account
         self.s1.uid = account.uid
         evennia.server.sessionhandler.SESSIONS[self.s1.uid] = self.s1
@@ -304,28 +352,33 @@ def test_puppet_object_already_puppeted(self):
         obj.at_post_puppet = Mock()
 
         account.puppet_object(self.s1, obj)
-        self.assertTrue(self.s1.data_out.call_args[1]['text'].endswith("is already puppeted by another Account."))
+        self.assertTrue(
+            self.s1.data_out.call_args[1]["text"].endswith(
+                "is already puppeted by another Account."
+            )
+        )
         self.assertIsNone(obj.at_post_puppet.call_args)
 
 
 class TestAccountPuppetDeletion(EvenniaTest):
-
     @override_settings(MULTISESSION_MODE=2)
     def test_puppet_deletion(self):
         # Check for existing chars
-        self.assertFalse(self.account.db._playable_characters, 
-                         'Account should not have any chars by default.')
+        self.assertFalse(
+            self.account.db._playable_characters, "Account should not have any chars by default."
+        )
 
         # Add char1 to account's playable characters
         self.account.db._playable_characters.append(self.char1)
-        self.assertTrue(self.account.db._playable_characters, 
-                        'Char was not added to account.')
+        self.assertTrue(self.account.db._playable_characters, "Char was not added to account.")
 
         # See what happens when we delete char1.
         self.char1.delete()
         # Playable char list should be empty.
-        self.assertFalse(self.account.db._playable_characters,
-                         'Playable character list is not empty! %s' % self.account.db._playable_characters)
+        self.assertFalse(
+            self.account.db._playable_characters,
+            f"Playable character list is not empty! {self.account.db._playable_characters}",
+        )
 
 
 class TestDefaultAccountEv(EvenniaTest):
@@ -333,6 +386,7 @@ class TestDefaultAccountEv(EvenniaTest):
     Testing using the EvenniaTest parent
 
     """
+
     def test_characters_property(self):
         "test existence of None in _playable_characters Attr"
         self.account.db._playable_characters = [self.char1, None]
@@ -353,7 +407,9 @@ def test_idle_time(self, mock_time):
         self.assertEqual(idle, 10)
 
         # test no sessions
-        with patch("evennia.accounts.accounts._SESSIONS.sessions_from_account", return_value=[]) as mock_sessh:
+        with patch(
+            "evennia.accounts.accounts._SESSIONS.sessions_from_account", return_value=[]
+        ) as mock_sessh:
             idle = self.account.idle_time
             self.assertEqual(idle, None)
 
@@ -364,18 +420,21 @@ def test_connection_time(self, mock_time):
         self.assertEqual(conn, 10)
 
         # test no sessions
-        with patch("evennia.accounts.accounts._SESSIONS.sessions_from_account", return_value=[]) as mock_sessh: 
+        with patch(
+            "evennia.accounts.accounts._SESSIONS.sessions_from_account", return_value=[]
+        ) as mock_sessh:
             idle = self.account.connection_time
             self.assertEqual(idle, None)
 
     def test_create_account(self):
         acct = create.account(
-            "TestAccount3", "test@test.com", "testpassword123",
+            "TestAccount3",
+            "test@test.com",
+            "testpassword123",
             locks="test:all()",
             tags=[("tag1", "category1"), ("tag2", "category2", "data1"), ("tag3", None)],
-            attributes=[("key1", "value1", "category1",
-                         "edit:false()", True),
-                        ("key2", "value2")])
+            attributes=[("key1", "value1", "category1", "edit:false()", True), ("key2", "value2")],
+        )
         acct.save()
         self.assertTrue(acct.pk)
 
@@ -389,7 +448,7 @@ def test_at_look(self):
         ret = self.account.at_look(target=self.obj1, session=self.session)
         self.assertTrue("Obj" in ret)
         ret = self.account.at_look(target="Invalid", session=self.session)
-        self.assertEqual(ret, 'Invalid has no in-game appearance.')
+        self.assertEqual(ret, "Invalid has no in-game appearance.")
 
     def test_msg(self):
         self.account.msg
diff --git a/evennia/commands/cmdhandler.py b/evennia/commands/cmdhandler.py
index a8c23a97ffe..e091f90468d 100644
--- a/evennia/commands/cmdhandler.py
+++ b/evennia/commands/cmdhandler.py
@@ -63,7 +63,7 @@
 
 # This decides which command parser is to be used.
 # You have to restart the server for changes to take effect.
-_COMMAND_PARSER = utils.variable_from_module(*settings.COMMAND_PARSER.rsplit('.', 1))
+_COMMAND_PARSER = utils.variable_from_module(*settings.COMMAND_PARSER.rsplit(".", 1))
 
 # System command names - import these variables rather than trying to
 # remember the actual string constants. If not defined, Evennia
@@ -82,7 +82,7 @@
 CMD_LOGINSTART = "__unloggedin_look_command"
 
 # Function for handling multiple command matches.
-_SEARCH_AT_RESULT = utils.variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+_SEARCH_AT_RESULT = utils.variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
 
 # Output strings. The first is the IN_GAME_ERRORS return, the second
 # is the normal "production message to echo to the account.
@@ -93,7 +93,8 @@
 """,
     """
 An untrapped error occurred. Please file a bug report detailing the steps to reproduce.
-""")
+""",
+)
 
 _ERROR_CMDSETS = (
     """
@@ -103,7 +104,8 @@
     """
 A cmdset merger-error occurred. Please file a bug report detailing the
 steps to reproduce.
-""")
+""",
+)
 
 _ERROR_NOCMDSETS = (
     """
@@ -114,7 +116,8 @@
 No command sets found! This is a sign of a critical bug.  If
 disconnecting/reconnecting doesn't" solve the problem, try to contact
 the server admin through" some other means for assistance.
-""")
+""",
+)
 
 _ERROR_CMDHANDLER = (
     """
@@ -125,10 +128,12 @@
     """
 A command handler bug occurred. Please notify staff - they should
 likely file a bug report with the Evennia project.
-""")
+""",
+)
 
-_ERROR_RECURSION_LIMIT = "Command recursion limit ({recursion_limit}) " \
-                         "reached for '{raw_cmdname}' ({cmdclass})."
+_ERROR_RECURSION_LIMIT = (
+    "Command recursion limit ({recursion_limit}) " "reached for '{raw_cmdname}' ({cmdclass})."
+)
 
 
 # delayed imports
@@ -137,6 +142,7 @@
 
 # helper functions
 
+
 def _msg_err(receiver, stringtuple):
     """
     Helper function for returning an error to the caller.
@@ -153,13 +159,19 @@ def _msg_err(receiver, stringtuple):
     tracestring = format_exc()
     logger.log_trace()
     if _IN_GAME_ERRORS:
-        receiver.msg(string.format(traceback=tracestring,
-                                   errmsg=stringtuple[0].strip(),
-                                   timestamp=timestamp).strip())
+        receiver.msg(
+            string.format(
+                traceback=tracestring, errmsg=stringtuple[0].strip(), timestamp=timestamp
+            ).strip()
+        )
     else:
-        receiver.msg(string.format(traceback=tracestring.splitlines()[-1],
-                                   errmsg=stringtuple[1].strip(),
-                                   timestamp=timestamp).strip())
+        receiver.msg(
+            string.format(
+                traceback=tracestring.splitlines()[-1],
+                errmsg=stringtuple[1].strip(),
+                timestamp=timestamp,
+            ).strip()
+        )
 
 
 def _progressive_cmd_run(cmd, generator, response=None):
@@ -227,6 +239,7 @@ def _process_input(caller, prompt, result, cmd, generator):
 
 # custom Exceptions
 
+
 class NoCmdSets(Exception):
     "No cmdsets found. Critical error."
     pass
@@ -248,6 +261,7 @@ def __init__(self, raw_string):
         self.args = (raw_string,)
         self.raw_string = raw_string
 
+
 # Helper function
 
 
@@ -280,6 +294,7 @@ def get_and_merge_cmdsets(caller, session, account, obj, callertype, raw_string)
 
     """
     try:
+
         @inlineCallbacks
         def _get_channel_cmdset(account_or_obj):
             """
@@ -308,8 +323,9 @@ def _get_local_obj_cmdsets(obj):
                 if location:
                     # Gather all cmdsets stored on objects in the room and
                     # also in the caller's inventory and the location itself
-                    local_objlist = yield (location.contents_get(exclude=obj) +
-                                           obj.contents_get() + [location])
+                    local_objlist = yield (
+                        location.contents_get(exclude=obj) + obj.contents_get() + [location]
+                    )
                     local_objlist = [o for o in local_objlist if not o._is_deleted]
                     for lobj in local_objlist:
                         try:
@@ -320,11 +336,18 @@ def _get_local_obj_cmdsets(obj):
                     # the call-type lock is checked here, it makes sure an account
                     # is not seeing e.g. the commands on a fellow account (which is why
                     # the no_superuser_bypass must be True)
-                    local_obj_cmdsets = \
-                        yield list(chain.from_iterable(
-                            lobj.cmdset.cmdset_stack for lobj in local_objlist
-                            if (lobj.cmdset.current and
-                                lobj.access(caller, access_type='call', no_superuser_bypass=True))))
+                    local_obj_cmdsets = yield list(
+                        chain.from_iterable(
+                            lobj.cmdset.cmdset_stack
+                            for lobj in local_objlist
+                            if (
+                                lobj.cmdset.current
+                                and lobj.access(
+                                    caller, access_type="call", no_superuser_bypass=True
+                                )
+                            )
+                        )
+                    )
                     for cset in local_obj_cmdsets:
                         # This is necessary for object sets, or we won't be able to
                         # separate the command sets from each other in a busy room. We
@@ -370,7 +393,9 @@ def _get_cmdsets(obj):
                         local_obj_cmdsets = yield _get_local_obj_cmdsets(obj)
                         if current.no_exits:
                             # filter out all exits
-                            local_obj_cmdsets = [cmdset for cmdset in local_obj_cmdsets if cmdset.key != "ExitCmdSet"]
+                            local_obj_cmdsets = [
+                                cmdset for cmdset in local_obj_cmdsets if cmdset.key != "ExitCmdSet"
+                            ]
                         cmdsets += local_obj_cmdsets
                     if not current.no_channels:
                         # also objs may have channels
@@ -392,7 +417,9 @@ def _get_cmdsets(obj):
                     local_obj_cmdsets = yield _get_local_obj_cmdsets(obj)
                     if current.no_exits:
                         # filter out all exits
-                        local_obj_cmdsets = [cmdset for cmdset in local_obj_cmdsets if cmdset.key != "ExitCmdSet"]
+                        local_obj_cmdsets = [
+                            cmdset for cmdset in local_obj_cmdsets if cmdset.key != "ExitCmdSet"
+                        ]
                     cmdsets += local_obj_cmdsets
                 if not current.no_channels:
                     # also objs may have channels
@@ -408,7 +435,9 @@ def _get_cmdsets(obj):
                 local_obj_cmdsets = yield _get_local_obj_cmdsets(obj)
                 if current.no_exits:
                     # filter out all exits
-                    local_obj_cmdsets = [cmdset for cmdset in local_obj_cmdsets if cmdset.key != "ExitCmdSet"]
+                    local_obj_cmdsets = [
+                        cmdset for cmdset in local_obj_cmdsets if cmdset.key != "ExitCmdSet"
+                    ]
                 cmdsets += yield local_obj_cmdsets
             if not current.no_channels:
                 # also objs may have channels
@@ -417,11 +446,11 @@ def _get_cmdsets(obj):
             raise Exception("get_and_merge_cmdsets: callertype %s is not valid." % callertype)
 
         # weed out all non-found sets
-        cmdsets = yield [cmdset for cmdset in cmdsets
-                         if cmdset and cmdset.key != "_EMPTY_CMDSET"]
+        cmdsets = yield [cmdset for cmdset in cmdsets if cmdset and cmdset.key != "_EMPTY_CMDSET"]
         # report cmdset errors to user (these should already have been logged)
-        yield [report_to.msg(cmdset.errmessage) for cmdset in cmdsets
-               if cmdset.key == "_CMDSET_ERROR"]
+        yield [
+            report_to.msg(cmdset.errmessage) for cmdset in cmdsets if cmdset.key == "_CMDSET_ERROR"
+        ]
 
         if cmdsets:
             # faster to do tuple on list than to build tuple directly
@@ -463,14 +492,23 @@ def _get_cmdsets(obj):
     except Exception:
         _msg_err(caller, _ERROR_CMDSETS)
         raise
-        #raise ErrorReported
+        # raise ErrorReported
+
 
 # Main command-handler function
 
 
 @inlineCallbacks
-def cmdhandler(called_by, raw_string, _testing=False, callertype="session", session=None,
-               cmdobj=None, cmdobj_key=None, **kwargs):
+def cmdhandler(
+    called_by,
+    raw_string,
+    _testing=False,
+    callertype="session",
+    session=None,
+    cmdobj=None,
+    cmdobj_key=None,
+    **kwargs,
+):
     """
     This is the main mechanism that handles any string sent to the engine.
 
@@ -557,7 +595,7 @@ def _run_command(cmd, cmdname, args, raw_cmdname, cmdset, session, account):
             # since this may be different for every command when
             # merging multuple cmdsets
 
-            if hasattr(cmd, 'obj') and hasattr(cmd.obj, 'scripts'):
+            if hasattr(cmd, "obj") and hasattr(cmd.obj, "scripts"):
                 # cmd.obj is automatically made available by the cmdhandler.
                 # we make sure to validate its scripts.
                 yield cmd.obj.scripts.validate()
@@ -572,9 +610,11 @@ def _run_command(cmd, cmdname, args, raw_cmdname, cmdset, session, account):
 
             _COMMAND_NESTING[called_by] += 1
             if _COMMAND_NESTING[called_by] > _COMMAND_RECURSION_LIMIT:
-                err = _ERROR_RECURSION_LIMIT.format(recursion_limit=_COMMAND_RECURSION_LIMIT,
-                                                    raw_cmdname=raw_cmdname,
-                                                    cmdclass=cmd.__class__)
+                err = _ERROR_RECURSION_LIMIT.format(
+                    recursion_limit=_COMMAND_RECURSION_LIMIT,
+                    raw_cmdname=raw_cmdname,
+                    cmdclass=cmd.__class__,
+                )
                 raise RuntimeError(err)
 
             # pre-command hook
@@ -653,8 +693,9 @@ def _run_command(cmd, cmdname, args, raw_cmdname, cmdset, session, account):
 
             else:
                 # no explicit cmdobject given, figure it out
-                cmdset = yield get_and_merge_cmdsets(caller, session, account, obj,
-                                                     callertype, raw_string)
+                cmdset = yield get_and_merge_cmdsets(
+                    caller, session, account, obj, callertype, raw_string
+                )
                 if not cmdset:
                     # this is bad and shouldn't happen.
                     raise NoCmdSets
@@ -683,7 +724,9 @@ def _run_command(cmd, cmdname, args, raw_cmdname, cmdset, session, account):
                         syscmd.matches = matches
                     else:
                         # fall back to default error handling
-                        sysarg = yield _SEARCH_AT_RESULT([match[2] for match in matches], caller, query=matches[0][0])
+                        sysarg = yield _SEARCH_AT_RESULT(
+                            [match[2] for match in matches], caller, query=matches[0][0]
+                        )
                     raise ExecSystemCommand(syscmd, sysarg)
 
                 cmdname, args, cmd, raw_cmdname = "", "", None, ""
@@ -701,17 +744,22 @@ def _run_command(cmd, cmdname, args, raw_cmdname, cmdset, session, account):
                     else:
                         # fallback to default error text
                         sysarg = _("Command '%s' is not available.") % raw_string
-                        suggestions = string_suggestions(raw_string,
-                                                         cmdset.get_all_cmd_keys_and_aliases(caller),
-                                                         cutoff=0.7, maxnum=3)
+                        suggestions = string_suggestions(
+                            raw_string,
+                            cmdset.get_all_cmd_keys_and_aliases(caller),
+                            cutoff=0.7,
+                            maxnum=3,
+                        )
                         if suggestions:
-                            sysarg += _(" Maybe you meant %s?") % utils.list_to_string(suggestions, _('or'), addquote=True)
+                            sysarg += _(" Maybe you meant %s?") % utils.list_to_string(
+                                suggestions, _("or"), addquote=True
+                            )
                         else:
-                            sysarg += _(" Type \"help\" for help.")
+                            sysarg += _(' Type "help" for help.')
                     raise ExecSystemCommand(syscmd, sysarg)
 
                 # Check if this is a Channel-cmd match.
-                if hasattr(cmd, 'is_channel') and cmd.is_channel:
+                if hasattr(cmd, "is_channel") and cmd.is_channel:
                     # even if a user-defined syscmd is not defined, the
                     # found cmd is already a system command in its own right.
                     syscmd = yield cmdset.get(CMD_CHANNEL)
@@ -738,8 +786,9 @@ def _run_command(cmd, cmdname, args, raw_cmdname, cmdset, session, account):
             sysarg = exc.sysarg
 
             if syscmd:
-                ret = yield _run_command(syscmd, syscmd.key, sysarg,
-                                         unformatted_raw_string, cmdset, session, account)
+                ret = yield _run_command(
+                    syscmd, syscmd.key, sysarg, unformatted_raw_string, cmdset, session, account
+                )
                 returnValue(ret)
             elif sysarg:
                 # return system arg
diff --git a/evennia/commands/cmdparser.py b/evennia/commands/cmdparser.py
index 2c78a247ab5..914dbb6df9c 100644
--- a/evennia/commands/cmdparser.py
+++ b/evennia/commands/cmdparser.py
@@ -59,24 +59,39 @@ def build_matches(raw_string, cmdset, include_prefixes=False):
         matches (list) A list of match tuples created by `cmdparser.create_match`.
 
     """
-    l_raw_string = raw_string.lower()
     matches = []
     try:
         if include_prefixes:
             # use the cmdname as-is
+            l_raw_string = raw_string.lower()
             for cmd in cmdset:
-                matches.extend([create_match(cmdname, raw_string, cmd, cmdname)
-                                for cmdname in [cmd.key] + cmd.aliases
-                                if cmdname and l_raw_string.startswith(cmdname.lower()) and
-                                (not cmd.arg_regex or
-                                    cmd.arg_regex.match(l_raw_string[len(cmdname):]))])
+                matches.extend(
+                    [
+                        create_match(cmdname, raw_string, cmd, cmdname)
+                        for cmdname in [cmd.key] + cmd.aliases
+                        if cmdname
+                        and l_raw_string.startswith(cmdname.lower())
+                        and (not cmd.arg_regex or cmd.arg_regex.match(l_raw_string[len(cmdname) :]))
+                    ]
+                )
         else:
             # strip prefixes set in settings
+            raw_string = (
+                raw_string.lstrip(_CMD_IGNORE_PREFIXES) if len(raw_string) > 1 else raw_string
+            )
+            l_raw_string = raw_string.lower()
             for cmd in cmdset:
                 for raw_cmdname in [cmd.key] + cmd.aliases:
-                    cmdname = raw_cmdname.lstrip(_CMD_IGNORE_PREFIXES) if len(raw_cmdname) > 1 else raw_cmdname
-                    if cmdname and l_raw_string.startswith(cmdname.lower()) and \
-                            (not cmd.arg_regex or cmd.arg_regex.match(l_raw_string[len(cmdname):])):
+                    cmdname = (
+                        raw_cmdname.lstrip(_CMD_IGNORE_PREFIXES)
+                        if len(raw_cmdname) > 1
+                        else raw_cmdname
+                    )
+                    if (
+                        cmdname
+                        and l_raw_string.startswith(cmdname.lower())
+                        and (not cmd.arg_regex or cmd.arg_regex.match(l_raw_string[len(cmdname) :]))
+                    ):
                         matches.append(create_match(cmdname, raw_string, cmd, raw_cmdname))
     except Exception:
         log_trace("cmdhandler error. raw_input:%s" % raw_string)
@@ -164,18 +179,19 @@ def cmdparser(raw_string, cmdset, caller, match_index=None):
             return cmdparser(new_raw_string, cmdset, caller, match_index=int(mindex))
         if _CMD_IGNORE_PREFIXES:
             # still no match. Try to strip prefixes
-            raw_string = raw_string.lstrip(_CMD_IGNORE_PREFIXES) if len(raw_string) > 1 else raw_string
+            raw_string = (
+                raw_string.lstrip(_CMD_IGNORE_PREFIXES) if len(raw_string) > 1 else raw_string
+            )
             matches = build_matches(raw_string, cmdset, include_prefixes=False)
 
     # only select command matches we are actually allowed to call.
-    matches = [match for match in matches if match[2].access(caller, 'cmd')]
+    matches = [match for match in matches if match[2].access(caller, "cmd")]
 
     # try to bring the number of matches down to 1
     if len(matches) > 1:
         # See if it helps to analyze the match with preserved case but only if
         # it leaves at least one match.
-        trimmed = [match for match in matches
-                   if raw_string.startswith(match[0])]
+        trimmed = [match for match in matches if raw_string.startswith(match[0])]
         if trimmed:
             matches = trimmed
 
@@ -184,14 +200,14 @@ def cmdparser(raw_string, cmdset, caller, match_index=None):
         matches = sorted(matches, key=lambda m: m[3])
         # only pick the matches with highest count quality
         quality = [mat[3] for mat in matches]
-        matches = matches[-quality.count(quality[-1]):]
+        matches = matches[-quality.count(quality[-1]) :]
 
     if len(matches) > 1:
         # still multiple matches. Fall back to ratio-based quality.
         matches = sorted(matches, key=lambda m: m[4])
         # only pick the highest rated ratio match
         quality = [mat[4] for mat in matches]
-        matches = matches[-quality.count(quality[-1]):]
+        matches = matches[-quality.count(quality[-1]) :]
 
     if len(matches) > 1 and match_index is not None and 0 < match_index <= len(matches):
         # We couldn't separate match by quality, but we have an
diff --git a/evennia/commands/cmdset.py b/evennia/commands/cmdset.py
index 95bbf9da225..5bb3ec8d282 100644
--- a/evennia/commands/cmdset.py
+++ b/evennia/commands/cmdset.py
@@ -26,11 +26,10 @@
     to affect the low-priority cmdset.  Ex: A1,A3 + B1,B2,B4,B5 = B2,B4,B5
 
 """
-from future.utils import listvalues, with_metaclass
-
 from weakref import WeakKeyDictionary
 from django.utils.translation import ugettext as _
 from evennia.utils.utils import inherits_from, is_iter
+
 __all__ = ("CmdSet",)
 
 
@@ -40,6 +39,7 @@ class _CmdSetMeta(type):
     the cmdset class.
 
     """
+
     def __init__(cls, *args, **kwargs):
         """
         Fixes some things in the cmdclass
@@ -47,7 +47,7 @@ def __init__(cls, *args, **kwargs):
         """
         # by default we key the cmdset the same as the
         # name of its class.
-        if not hasattr(cls, 'key') or not cls.key:
+        if not hasattr(cls, "key") or not cls.key:
             cls.key = cls.__name__
         cls.path = "%s.%s" % (cls.__module__, cls.__name__)
 
@@ -57,7 +57,7 @@ def __init__(cls, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
 
-class CmdSet(with_metaclass(_CmdSetMeta, object)):
+class CmdSet(object, metaclass=_CmdSetMeta):
     """
     This class describes a unique cmdset that understands priorities.
     CmdSets can be merged and made to perform various set operations
@@ -158,9 +158,18 @@ class CmdSet(with_metaclass(_CmdSetMeta, object)):
     key_mergetypes = {}
     errmessage = ""
     # pre-store properties to duplicate straight off
-    to_duplicate = ("key", "cmdsetobj", "no_exits", "no_objs",
-                    "no_channels", "permanent", "mergetype",
-                    "priority", "duplicates", "errmessage")
+    to_duplicate = (
+        "key",
+        "cmdsetobj",
+        "no_exits",
+        "no_objs",
+        "no_channels",
+        "permanent",
+        "mergetype",
+        "priority",
+        "duplicates",
+        "errmessage",
+    )
 
     def __init__(self, cmdsetobj=None, key=None):
         """
@@ -213,8 +222,7 @@ def _union(self, cmdset_a, cmdset_b):
         if cmdset_a.duplicates and cmdset_a.priority == cmdset_b.priority:
             cmdset_c.commands.extend(cmdset_b.commands)
         else:
-            cmdset_c.commands.extend([cmd for cmd in cmdset_b
-                                      if cmd not in cmdset_a])
+            cmdset_c.commands.extend([cmd for cmd in cmdset_b if cmd not in cmdset_a])
         return cmdset_c
 
     def _intersect(self, cmdset_a, cmdset_b):
@@ -326,7 +334,7 @@ def __str__(self):
             commands (str): Representation of commands in Cmdset.
 
         """
-        return ", ".join([str(cmd) for cmd in sorted(self.commands, key=lambda o:o.key)])
+        return ", ".join([str(cmd) for cmd in sorted(self.commands, key=lambda o: o.key)])
 
     def __iter__(self):
         """
@@ -377,8 +385,9 @@ def __add__(self, cmdset_a):
             # A higher or equal priority to B
 
             # preserve system __commands
-            sys_commands = sys_commands_a + [cmd for cmd in sys_commands_b
-                                             if cmd not in sys_commands_a]
+            sys_commands = sys_commands_a + [
+                cmd for cmd in sys_commands_b if cmd not in sys_commands_a
+            ]
 
             mergetype = cmdset_a.key_mergetypes.get(self.key, cmdset_a.mergetype)
             if mergetype == "Intersect":
@@ -393,7 +402,9 @@ def __add__(self, cmdset_a):
             # pass through options whenever they are set, unless the merging or higher-prio
             # set changes the setting (i.e. has a non-None value). We don't pass through
             # the duplicates setting; that is per-merge
-            cmdset_c.no_channels = self.no_channels if cmdset_a.no_channels is None else cmdset_a.no_channels
+            cmdset_c.no_channels = (
+                self.no_channels if cmdset_a.no_channels is None else cmdset_a.no_channels
+            )
             cmdset_c.no_exits = self.no_exits if cmdset_a.no_exits is None else cmdset_a.no_exits
             cmdset_c.no_objs = self.no_objs if cmdset_a.no_objs is None else cmdset_a.no_objs
 
@@ -401,8 +412,9 @@ def __add__(self, cmdset_a):
             # B higher priority than A
 
             # preserver system __commands
-            sys_commands = sys_commands_b + [cmd for cmd in sys_commands_a
-                                             if cmd not in sys_commands_b]
+            sys_commands = sys_commands_b + [
+                cmd for cmd in sys_commands_a if cmd not in sys_commands_b
+            ]
 
             mergetype = self.key_mergetypes.get(cmdset_a.key, self.mergetype)
             if mergetype == "Intersect":
@@ -417,7 +429,9 @@ def __add__(self, cmdset_a):
             # pass through options whenever they are set, unless the higher-prio
             # set changes the setting (i.e. has a non-None value). We don't pass through
             # the duplicates setting; that is per-merge
-            cmdset_c.no_channels = cmdset_a.no_channels if self.no_channels is None else self.no_channels
+            cmdset_c.no_channels = (
+                cmdset_a.no_channels if self.no_channels is None else self.no_channels
+            )
             cmdset_c.no_exits = cmdset_a.no_exits if self.no_exits is None else self.no_exits
             cmdset_c.no_objs = cmdset_a.no_objs if self.no_objs is None else self.no_objs
 
@@ -467,8 +481,7 @@ def add(self, cmd):
                 string += "infinite loop. When adding a cmdset to another, "
                 string += "make sure they are not themself cyclically added to "
                 string += "the new cmdset somewhere in the chain."
-                raise RuntimeError(_(string) % {"cmd": cmd,
-                                                "class": self.__class__})
+                raise RuntimeError(_(string) % {"cmd": cmd, "class": self.__class__})
             cmds = cmd.commands
         elif is_iter(cmd):
             cmds = [self._instantiate(c) for c in cmd]
@@ -478,7 +491,7 @@ def add(self, cmd):
         system_commands = self.system_commands
         for cmd in cmds:
             # add all commands
-            if not hasattr(cmd, 'obj'):
+            if not hasattr(cmd, "obj"):
                 cmd.obj = self.cmdsetobj
             try:
                 ic = commands.index(cmd)
@@ -580,12 +593,13 @@ def make_unique(self, caller):
         for cmd in self.commands:
             if cmd.key in unique:
                 ocmd = unique[cmd.key]
-                if (hasattr(cmd, 'obj') and cmd.obj == caller) and not \
-                        (hasattr(ocmd, 'obj') and ocmd.obj == caller):
+                if (hasattr(cmd, "obj") and cmd.obj == caller) and not (
+                    hasattr(ocmd, "obj") and ocmd.obj == caller
+                ):
                     unique[cmd.key] = cmd
             else:
                 unique[cmd.key] = cmd
-        self.commands = listvalues(unique)
+        self.commands = list(unique.values())
 
     def get_all_cmd_keys_and_aliases(self, caller=None):
         """
@@ -603,8 +617,7 @@ def get_all_cmd_keys_and_aliases(self, caller=None):
         """
         names = []
         if caller:
-            [names.extend(cmd._keyaliases) for cmd in self.commands
-             if cmd.access(caller)]
+            [names.extend(cmd._keyaliases) for cmd in self.commands if cmd.access(caller)]
         else:
             [names.extend(cmd._keyaliases) for cmd in self.commands]
         return names
diff --git a/evennia/commands/cmdsethandler.py b/evennia/commands/cmdsethandler.py
index d332c7fcd28..e855d551e9d 100644
--- a/evennia/commands/cmdsethandler.py
+++ b/evennia/commands/cmdsethandler.py
@@ -63,8 +63,6 @@
 example, you can have a 'On a boat' set, onto which you then tack on
 the 'Fishing' set. Fishing from a boat? No problem!
 """
-from builtins import object
-from future.utils import raise_
 import sys
 from traceback import format_exc
 from importlib import import_module
@@ -75,6 +73,7 @@
 from evennia.server.models import ServerConfig
 
 from django.utils.translation import ugettext as _
+
 __all__ = ("import_cmdset", "CmdSetHandler")
 
 _CACHED_CMDSETS = {}
@@ -88,37 +87,41 @@
 _ERROR_CMDSET_IMPORT = _(
     """{traceback}
 Error loading cmdset '{path}'
-(Traceback was logged {timestamp})""")
+(Traceback was logged {timestamp})"""
+)
 
 _ERROR_CMDSET_KEYERROR = _(
     """Error loading cmdset: No cmdset class '{classname}' in '{path}'.
-(Traceback was logged {timestamp})""")
+(Traceback was logged {timestamp})"""
+)
 
 _ERROR_CMDSET_SYNTAXERROR = _(
     """{traceback}
 SyntaxError encountered when loading cmdset '{path}'.
-(Traceback was logged {timestamp})""")
+(Traceback was logged {timestamp})"""
+)
 
 _ERROR_CMDSET_EXCEPTION = _(
     """{traceback}
 Compile/Run error when loading cmdset '{path}'.",
-(Traceback was logged {timestamp})""")
+(Traceback was logged {timestamp})"""
+)
 
 _ERROR_CMDSET_FALLBACK = _(
     """
 Error encountered for cmdset at path '{path}'.
 Replacing with fallback '{fallback_path}'.
-""")
-
-_ERROR_CMDSET_NO_FALLBACK = _(
-    """Fallback path '{fallback_path}' failed to generate a cmdset."""
+"""
 )
 
+_ERROR_CMDSET_NO_FALLBACK = _("""Fallback path '{fallback_path}' failed to generate a cmdset.""")
+
 
 class _ErrorCmdSet(CmdSet):
     """
     This is a special cmdset used to report errors.
     """
+
     key = "_CMDSET_ERROR"
     errmessage = "Error when loading cmdset."
 
@@ -127,6 +130,7 @@ class _EmptyCmdSet(CmdSet):
     """
     This cmdset represents an empty cmdset
     """
+
     key = "_EMPTY_CMDSET"
     priority = -101
     mergetype = "Union"
@@ -155,8 +159,9 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
             for the benefit of the handler.
 
     """
-    python_paths = [path] + ["%s.%s" % (prefix, path)
-                             for prefix in _CMDSET_PATHS if not path.startswith(prefix)]
+    python_paths = [path] + [
+        "%s.%s" % (prefix, path) for prefix in _CMDSET_PATHS if not path.startswith(prefix)
+    ]
     errstring = ""
     for python_path in python_paths:
 
@@ -172,22 +177,22 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
             if not cmdsetclass:
                 try:
                     module = import_module(modpath, package="evennia")
-                except ImportError:
+                except ImportError as exc:
                     if len(trace()) > 2:
                         # error in module, make sure to not hide it.
-                        exc = sys.exc_info()
-                        raise_(exc[1], None, exc[2])
+                        dum, dum, tb = sys.exc_info()
+                        raise exc.with_traceback(tb)
                     else:
                         # try next suggested path
                         errstring += _("\n(Unsuccessfully tried '%s')." % python_path)
                         continue
                 try:
                     cmdsetclass = getattr(module, classname)
-                except AttributeError:
+                except AttributeError as exc:
                     if len(trace()) > 2:
                         # Attribute error within module, don't hide it
-                        exc = sys.exc_info()
-                        raise_(exc[1], None, exc[2])
+                        dum, dum, tb = sys.exc_info()
+                        raise exc.with_traceback(tb)
                     else:
                         errstring += _("\n(Unsuccessfully tried '%s')." % python_path)
                         continue
@@ -201,30 +206,44 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
             logger.log_trace()
             errstring += _ERROR_CMDSET_IMPORT
             if _IN_GAME_ERRORS:
-                errstring = errstring.format(path=python_path, traceback=format_exc(), timestamp=logger.timeformat())
+                errstring = errstring.format(
+                    path=python_path, traceback=format_exc(), timestamp=logger.timeformat()
+                )
             else:
-                errstring = errstring.format(path=python_path, traceback=err, timestamp=logger.timeformat())
+                errstring = errstring.format(
+                    path=python_path, traceback=err, timestamp=logger.timeformat()
+                )
             break
         except KeyError:
             logger.log_trace()
             errstring += _ERROR_CMDSET_KEYERROR
-            errstring = errstring.format(classname=classname, path=python_path, timestamp=logger.timeformat())
+            errstring = errstring.format(
+                classname=classname, path=python_path, timestamp=logger.timeformat()
+            )
             break
         except SyntaxError as err:
             logger.log_trace()
             errstring += _ERROR_CMDSET_SYNTAXERROR
             if _IN_GAME_ERRORS:
-                errstring = errstring.format(path=python_path, traceback=format_exc(), timestamp=logger.timeformat())
+                errstring = errstring.format(
+                    path=python_path, traceback=format_exc(), timestamp=logger.timeformat()
+                )
             else:
-                errstring = errstring.format(path=python_path, traceback=err, timestamp=logger.timeformat())
+                errstring = errstring.format(
+                    path=python_path, traceback=err, timestamp=logger.timeformat()
+                )
             break
         except Exception as err:
             logger.log_trace()
             errstring += _ERROR_CMDSET_EXCEPTION
             if _IN_GAME_ERRORS:
-                errstring = errstring.format(path=python_path, traceback=format_exc(), timestamp=logger.timeformat())
+                errstring = errstring.format(
+                    path=python_path, traceback=format_exc(), timestamp=logger.timeformat()
+                )
             else:
-                errstring = errstring.format(path=python_path, traceback=err, timestamp=logger.timeformat())
+                errstring = errstring.format(
+                    path=python_path, traceback=err, timestamp=logger.timeformat()
+                )
             break
 
     if errstring:
@@ -239,6 +258,7 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False):
         return err_cmdset
     return None  # undefined error
 
+
 # classes
 
 
@@ -298,9 +318,14 @@ def __str__(self):
                     permstring = "perm"
                 if mergetype != cmdset.mergetype:
                     mergetype = "%s^" % (mergetype)
-                string += "\n %i: <%s (%s, prio %i, %s)>: %s" % \
-                    (snum, cmdset.key, mergetype,
-                     cmdset.priority, permstring, cmdset)
+                string += "\n %i: <%s (%s, prio %i, %s)>: %s" % (
+                    snum,
+                    cmdset.key,
+                    mergetype,
+                    cmdset.priority,
+                    permstring,
+                    cmdset,
+                )
                 mergelist.append(str(snum))
             string += "\n"
 
@@ -312,19 +337,24 @@ def __str__(self):
             mergetype = mergetype.format(mergetype=mergetype, cmdset=merged_on)
         if mergelist:
             tmpstring = _(" <Merged {mergelist} {mergetype}, prio {prio}>: {current}")
-            string += tmpstring.format(mergelist="+".join(mergelist),
-                                       mergetype=mergetype, prio=self.current.priority,
-                                       current=self.current)
+            string += tmpstring.format(
+                mergelist="+".join(mergelist),
+                mergetype=mergetype,
+                prio=self.current.priority,
+                current=self.current,
+            )
         else:
             permstring = "non-perm"
             if self.current.permanent:
                 permstring = "perm"
             tmpstring = _(" <{key} ({mergetype}, prio {prio}, {permstring})>:\n {keylist}")
-            string += tmpstring.format(key=self.current.key, mergetype=mergetype,
-                                       prio=self.current.priority,
-                                       permstring=permstring,
-                                       keylist=", ".join(cmd.key for
-                                                         cmd in sorted(self.current, key=lambda o: o.key)))
+            string += tmpstring.format(
+                key=self.current.key,
+                mergetype=mergetype,
+                prio=self.current.priority,
+                permstring=permstring,
+                keylist=", ".join(cmd.key for cmd in sorted(self.current, key=lambda o: o.key)),
+            )
         return string.strip()
 
     def _import_cmdset(self, cmdset_path, emit_to_obj=None):
@@ -365,23 +395,27 @@ def update(self, init_mode=False):
                     elif path:
                         cmdset = self._import_cmdset(path)
                         if cmdset:
-                            if cmdset.key == '_CMDSET_ERROR':
+                            if cmdset.key == "_CMDSET_ERROR":
                                 # If a cmdset fails to load, check if we have a fallback path to use
                                 fallback_path = _CMDSET_FALLBACKS.get(path, None)
                                 if fallback_path:
-                                    err = _ERROR_CMDSET_FALLBACK.format(path=path, fallback_path=fallback_path)
+                                    err = _ERROR_CMDSET_FALLBACK.format(
+                                        path=path, fallback_path=fallback_path
+                                    )
                                     logger.log_err(err)
                                     if _IN_GAME_ERRORS:
                                         self.obj.msg(err)
                                     cmdset = self._import_cmdset(fallback_path)
                                 # If no cmdset is returned from the fallback, we can't go further
                                 if not cmdset:
-                                    err = _ERROR_CMDSET_NO_FALLBACK.format(fallback_path=fallback_path)
+                                    err = _ERROR_CMDSET_NO_FALLBACK.format(
+                                        fallback_path=fallback_path
+                                    )
                                     logger.log_err(err)
                                     if _IN_GAME_ERRORS:
                                         self.obj.msg(err)
                                     continue
-                            cmdset.permanent = cmdset.key != '_CMDSET_ERROR'
+                            cmdset.permanent = cmdset.key != "_CMDSET_ERROR"
                             self.cmdset_stack.append(cmdset)
 
         # merge the stack into a new merged cmdset
@@ -431,9 +465,9 @@ def add(self, cmdset, emit_to_obj=None, permanent=False, default_cmdset=False):
         elif isinstance(cmdset, str):
             # this is (maybe) a python path. Try to import from cache.
             cmdset = self._import_cmdset(cmdset)
-        if cmdset and cmdset.key != '_CMDSET_ERROR':
+        if cmdset and cmdset.key != "_CMDSET_ERROR":
             cmdset.permanent = permanent
-            if permanent and cmdset.key != '_CMDSET_ERROR':
+            if permanent and cmdset.key != "_CMDSET_ERROR":
                 # store the path permanently
                 storage = self.obj.cmdset_storage or [""]
                 if default_cmdset:
@@ -500,13 +534,15 @@ def remove(self, cmdset=None, default_cmdset=False):
                 self.obj.cmdset_storage = storage
         else:
             # try it as a callable
-            if callable(cmdset) and hasattr(cmdset, 'path'):
-                delcmdsets = [cset for cset in self.cmdset_stack[1:]
-                              if cset.path == cmdset.path]
+            if callable(cmdset) and hasattr(cmdset, "path"):
+                delcmdsets = [cset for cset in self.cmdset_stack[1:] if cset.path == cmdset.path]
             else:
                 # try it as a path or key
-                delcmdsets = [cset for cset in self.cmdset_stack[1:]
-                              if cset.path == cmdset or cset.key == cmdset]
+                delcmdsets = [
+                    cset
+                    for cset in self.cmdset_stack[1:]
+                    if cset.path == cmdset or cset.key == cmdset
+                ]
             storage = []
 
             if any(cset.permanent for cset in delcmdsets):
@@ -532,6 +568,7 @@ def remove(self, cmdset=None, default_cmdset=False):
                     pass
         # re-sync the cmdsethandler.
         self.update()
+
     # legacy alias
     delete = remove
 
@@ -541,6 +578,7 @@ def remove_default(self):
 
         """
         self.remove(default_cmdset=True)
+
     # legacy alias
     delete_default = remove_default
 
@@ -584,22 +622,26 @@ def has(self, cmdset, must_be_default=False):
             has_cmdset (bool): Whether or not the cmdset is in the handler.
 
         """
-        if callable(cmdset) and hasattr(cmdset, 'path'):
+        if callable(cmdset) and hasattr(cmdset, "path"):
             # try it as a callable
             if must_be_default:
                 return self.cmdset_stack and (self.cmdset_stack[0].path == cmdset.path)
             else:
-                return any([cset for cset in self.cmdset_stack
-                            if cset.path == cmdset.path])
+                return any([cset for cset in self.cmdset_stack if cset.path == cmdset.path])
         else:
             # try it as a path or key
             if must_be_default:
                 return self.cmdset_stack and (
-                    self.cmdset_stack[0].key == cmdset or
-                    self.cmdset_stack[0].path == cmdset)
+                    self.cmdset_stack[0].key == cmdset or self.cmdset_stack[0].path == cmdset
+                )
             else:
-                return any([cset for cset in self.cmdset_stack
-                            if cset.path == cmdset or cset.key == cmdset])
+                return any(
+                    [
+                        cset
+                        for cset in self.cmdset_stack
+                        if cset.path == cmdset or cset.key == cmdset
+                    ]
+                )
 
     # backwards-compatability alias
     has_cmdset = has
diff --git a/evennia/commands/command.py b/evennia/commands/command.py
index ce9fbb1885c..535ce15dd91 100644
--- a/evennia/commands/command.py
+++ b/evennia/commands/command.py
@@ -4,8 +4,6 @@
 All commands in Evennia inherit from the 'Command' class in this module.
 
 """
-from builtins import range
-
 import re
 import math
 
@@ -16,8 +14,6 @@
 from evennia.utils.evtable import EvTable
 from evennia.utils.ansi import ANSIString
 
-from future.utils import with_metaclass
-
 
 def _init_command(cls, **kwargs):
     """
@@ -41,12 +37,10 @@ def _init_command(cls, **kwargs):
     cls.key = cls.key.lower()
     if cls.aliases and not is_iter(cls.aliases):
         try:
-            cls.aliases = [str(alias).strip().lower()
-                           for alias in cls.aliases.split(',')]
+            cls.aliases = [str(alias).strip().lower() for alias in cls.aliases.split(",")]
         except Exception:
             cls.aliases = []
-    cls.aliases = list(set(alias for alias in cls.aliases
-                           if alias and alias != cls.key))
+    cls.aliases = list(set(alias for alias in cls.aliases if alias and alias != cls.key))
 
     # optimization - a set is much faster to match against than a list
     cls._matchset = set([cls.key] + cls.aliases)
@@ -59,24 +53,24 @@ def _init_command(cls, **kwargs):
 
     # pre-process locks as defined in class definition
     temp = []
-    if hasattr(cls, 'permissions'):
+    if hasattr(cls, "permissions"):
         cls.locks = cls.permissions
-    if not hasattr(cls, 'locks'):
+    if not hasattr(cls, "locks"):
         # default if one forgets to define completely
         cls.locks = "cmd:all()"
     if "cmd:" not in cls.locks:
         cls.locks = "cmd:all();" + cls.locks
-    for lockstring in cls.locks.split(';'):
-        if lockstring and ':' not in lockstring:
+    for lockstring in cls.locks.split(";"):
+        if lockstring and ":" not in lockstring:
             lockstring = "cmd:%s" % lockstring
         temp.append(lockstring)
     cls.lock_storage = ";".join(temp)
 
-    if hasattr(cls, 'arg_regex') and isinstance(cls.arg_regex, str):
+    if hasattr(cls, "arg_regex") and isinstance(cls.arg_regex, str):
         cls.arg_regex = re.compile(r"%s" % cls.arg_regex, re.I + re.UNICODE)
     if not hasattr(cls, "auto_help"):
         cls.auto_help = True
-    if not hasattr(cls, 'is_exit'):
+    if not hasattr(cls, "is_exit"):
         cls.is_exit = False
     if not hasattr(cls, "help_category"):
         cls.help_category = "general"
@@ -87,10 +81,12 @@ class CommandMeta(type):
     """
     The metaclass cleans up all properties on the class
     """
+
     def __init__(cls, *args, **kwargs):
         _init_command(cls, **kwargs)
         super().__init__(*args, **kwargs)
 
+
 #    The Command class is the basic unit of an Evennia command; when
 #    defining new commands, the admin subclass this class and
 #    define their own parser method to handle the input. The
@@ -99,7 +95,7 @@ def __init__(cls, *args, **kwargs):
 #    parsing errors.
 
 
-class Command(with_metaclass(CommandMeta, object)):
+class Command(object, metaclass=CommandMeta):
     """
     Base command
 
@@ -219,7 +215,7 @@ def __hash__(self):
         str, too.
 
         """
-        return hash('\n'.join(self._matchset))
+        return hash("\n".join(self._matchset))
 
     def __ne__(self, cmd):
         """
@@ -287,7 +283,7 @@ def set_aliases(self, new_aliases):
 
         """
         if isinstance(new_aliases, str):
-            new_aliases = new_aliases.split(';')
+            new_aliases = new_aliases.split(";")
         aliases = (str(alias).strip().lower() for alias in make_iter(new_aliases))
         self.aliases = list(set(alias for alias in aliases if alias != self.key))
         self._optimize()
@@ -323,8 +319,7 @@ def access(self, srcobj, access_type="cmd", default=False):
         """
         return self.lockhandler.check(srcobj, access_type, default=default)
 
-    def msg(self, text=None, to_obj=None, from_obj=None,
-            session=None, **kwargs):
+    def msg(self, text=None, to_obj=None, from_obj=None, session=None, **kwargs):
         """
         This is a shortcut instead of calling msg() directly on an
         object - it will detect if caller is an Object or an Account and
@@ -414,7 +409,9 @@ def func(self):
         set in self.parse())
 
         """
-        variables = '\n'.join(" |w{}|n ({}): {}".format(key, type(val), val) for key, val in self.__dict__.items())
+        variables = "\n".join(
+            " |w{}|n ({}): {}".format(key, type(val), val) for key, val in self.__dict__.items()
+        )
         string = f"""
 Command {self} has no defined `func()` - showing on-command variables:
 {variables}
@@ -434,8 +431,10 @@ def func(self):
         string += "object storing cmdset (self.obj): |w%s|n\n" % self.obj
         string += "command string given (self.cmdstring): |w%s|n\n" % self.cmdstring
         # show cmdset.key instead of cmdset to shorten output
-        string += fill("current cmdset (self.cmdset): |w%s|n\n" %
-                       (self.cmdset.key if self.cmdset.key else self.cmdset.__class__))
+        string += fill(
+            "current cmdset (self.cmdset): |w%s|n\n"
+            % (self.cmdset.key if self.cmdset.key else self.cmdset.__class__)
+        )
 
         self.caller.msg(string)
 
@@ -457,7 +456,7 @@ def get_extra_info(self, caller, **kwargs):
             object, conventionally with a preceding space.
 
         """
-        if hasattr(self, 'obj') and self.obj and self.obj != caller:
+        if hasattr(self, "obj") and self.obj and self.obj != caller:
             return " (%s)" % self.obj.get_display_name(caller).strip()
         return ""
 
@@ -490,7 +489,7 @@ def client_width(self):
 
         """
         if self.session:
-            return self.session.protocol_flags['SCREENWIDTH'][0]
+            return self.session.protocol_flags["SCREENWIDTH"][0]
 
     def styled_table(self, *args, **kwargs):
         """
@@ -507,35 +506,48 @@ def styled_table(self, *args, **kwargs):
                 or incomplete and ready for use with `.add_row` or `.add_collumn`.
 
         """
-        border_color = self.account.options.get('border_color')
-        column_color = self.account.options.get('column_names_color')
+        border_color = self.account.options.get("border_color")
+        column_color = self.account.options.get("column_names_color")
 
-        colornames = ['|%s%s|n' % (column_color, col) for col in args]
+        colornames = ["|%s%s|n" % (column_color, col) for col in args]
 
-        h_line_char = kwargs.pop('header_line_char', '~')
-        header_line_char = ANSIString(f'|{border_color}{h_line_char}|n')
-        c_char = kwargs.pop('corner_char', '+')
-        corner_char = ANSIString(f'|{border_color}{c_char}|n')
+        h_line_char = kwargs.pop("header_line_char", "~")
+        header_line_char = ANSIString(f"|{border_color}{h_line_char}|n")
+        c_char = kwargs.pop("corner_char", "+")
+        corner_char = ANSIString(f"|{border_color}{c_char}|n")
 
-        b_left_char = kwargs.pop('border_left_char', '||')
-        border_left_char = ANSIString(f'|{border_color}{b_left_char}|n')
+        b_left_char = kwargs.pop("border_left_char", "||")
+        border_left_char = ANSIString(f"|{border_color}{b_left_char}|n")
 
-        b_right_char = kwargs.pop('border_right_char', '||')
-        border_right_char = ANSIString(f'|{border_color}{b_right_char}|n')
+        b_right_char = kwargs.pop("border_right_char", "||")
+        border_right_char = ANSIString(f"|{border_color}{b_right_char}|n")
 
-        b_bottom_char = kwargs.pop('border_bottom_char', '-')
-        border_bottom_char = ANSIString(f'|{border_color}{b_bottom_char}|n')
+        b_bottom_char = kwargs.pop("border_bottom_char", "-")
+        border_bottom_char = ANSIString(f"|{border_color}{b_bottom_char}|n")
 
-        b_top_char = kwargs.pop('border_top_char', '-')
-        border_top_char = ANSIString(f'|{border_color}{b_top_char}|n')
+        b_top_char = kwargs.pop("border_top_char", "-")
+        border_top_char = ANSIString(f"|{border_color}{b_top_char}|n")
 
-        table = EvTable(*colornames, header_line_char=header_line_char, corner_char=corner_char,
-                        border_left_char=border_left_char, border_right_char=border_right_char,
-                        border_top_char=border_top_char, **kwargs)
+        table = EvTable(
+            *colornames,
+            header_line_char=header_line_char,
+            corner_char=corner_char,
+            border_left_char=border_left_char,
+            border_right_char=border_right_char,
+            border_top_char=border_top_char,
+            **kwargs,
+        )
         return table
 
-    def _render_decoration(self, header_text=None, fill_character=None, edge_character=None,
-                      mode='header', color_header=True, width=None):
+    def _render_decoration(
+        self,
+        header_text=None,
+        fill_character=None,
+        edge_character=None,
+        mode="header",
+        color_header=True,
+        width=None,
+    ):
         """
         Helper for formatting a string into a pretty display, for a header, separator or footer.
 
@@ -554,9 +566,9 @@ def _render_decoration(self, header_text=None, fill_character=None, edge_charact
         """
 
         colors = dict()
-        colors['border'] = self.account.options.get('border_color')
-        colors['headertext'] = self.account.options.get('%s_text_color' % mode)
-        colors['headerstar'] = self.account.options.get('%s_star_color' % mode)
+        colors["border"] = self.account.options.get("border_color")
+        colors["headertext"] = self.account.options.get("%s_text_color" % mode)
+        colors["headerstar"] = self.account.options.get("%s_star_color" % mode)
 
         width = width or self.client_width()
         if edge_character:
@@ -565,17 +577,19 @@ def _render_decoration(self, header_text=None, fill_character=None, edge_charact
         if header_text:
             if color_header:
                 header_text = ANSIString(header_text).clean()
-                header_text = ANSIString('|n|%s%s|n' % (colors['headertext'], header_text))
-            if mode == 'header':
-                begin_center = ANSIString("|n|%s<|%s* |n" % (colors['border'], colors['headerstar']))
-                end_center = ANSIString("|n |%s*|%s>|n" % (colors['headerstar'], colors['border']))
+                header_text = ANSIString("|n|%s%s|n" % (colors["headertext"], header_text))
+            if mode == "header":
+                begin_center = ANSIString(
+                    "|n|%s<|%s* |n" % (colors["border"], colors["headerstar"])
+                )
+                end_center = ANSIString("|n |%s*|%s>|n" % (colors["headerstar"], colors["border"]))
                 center_string = ANSIString(begin_center + header_text + end_center)
             else:
-                center_string = ANSIString('|n |%s%s |n' % (colors['headertext'], header_text))
+                center_string = ANSIString("|n |%s%s |n" % (colors["headertext"], header_text))
         else:
-            center_string = ''
+            center_string = ""
 
-        fill_character = self.account.options.get('%s_fill' % mode)
+        fill_character = self.account.options.get("%s_fill" % mode)
 
         remain_fill = width - len(center_string)
         if remain_fill % 2 == 0:
@@ -585,13 +599,15 @@ def _render_decoration(self, header_text=None, fill_character=None, edge_charact
             right_width = math.floor(remain_fill / 2)
             left_width = math.ceil(remain_fill / 2)
 
-        right_fill = ANSIString('|n|%s%s|n' % (colors['border'], fill_character * int(right_width)))
-        left_fill = ANSIString('|n|%s%s|n' % (colors['border'], fill_character * int(left_width)))
+        right_fill = ANSIString("|n|%s%s|n" % (colors["border"], fill_character * int(right_width)))
+        left_fill = ANSIString("|n|%s%s|n" % (colors["border"], fill_character * int(left_width)))
 
         if edge_character:
-            edge_fill = ANSIString('|n|%s%s|n' % (colors['border'], edge_character))
+            edge_fill = ANSIString("|n|%s%s|n" % (colors["border"], edge_character))
             main_string = ANSIString(center_string)
-            final_send = ANSIString(edge_fill) + left_fill + main_string + right_fill + ANSIString(edge_fill)
+            final_send = (
+                ANSIString(edge_fill) + left_fill + main_string + right_fill + ANSIString(edge_fill)
+            )
         else:
             final_send = left_fill + ANSIString(center_string) + right_fill
         return final_send
@@ -601,8 +617,8 @@ def styled_header(self, *args, **kwargs):
         Create a pretty header.
         """
 
-        if 'mode' not in kwargs:
-            kwargs['mode'] = 'header'
+        if "mode" not in kwargs:
+            kwargs["mode"] = "header"
         return self._render_decoration(*args, **kwargs)
 
     def styled_separator(self, *args, **kwargs):
@@ -610,8 +626,8 @@ def styled_separator(self, *args, **kwargs):
         Create a separator.
 
         """
-        if 'mode' not in kwargs:
-            kwargs['mode'] = 'separator'
+        if "mode" not in kwargs:
+            kwargs["mode"] = "separator"
         return self._render_decoration(*args, **kwargs)
 
     def styled_footer(self, *args, **kwargs):
@@ -619,8 +635,8 @@ def styled_footer(self, *args, **kwargs):
         Create a pretty footer.
 
         """
-        if 'mode' not in kwargs:
-            kwargs['mode'] = 'footer'
+        if "mode" not in kwargs:
+            kwargs["mode"] = "footer"
         return self._render_decoration(*args, **kwargs)
 
 
diff --git a/evennia/commands/default/account.py b/evennia/commands/default/account.py
index 1a54bbc131e..33e8aed55b7 100644
--- a/evennia/commands/default/account.py
+++ b/evennia/commands/default/account.py
@@ -18,8 +18,6 @@
 method. Otherwise all text will be returned to all connected sessions.
 
 """
-from builtins import range
-
 import time
 from codecs import lookup as codecs_lookup
 from django.conf import settings
@@ -32,9 +30,21 @@
 _MULTISESSION_MODE = settings.MULTISESSION_MODE
 
 # limit symbol import for API
-__all__ = ("CmdOOCLook", "CmdIC", "CmdOOC", "CmdPassword", "CmdQuit",
-           "CmdCharCreate", "CmdOption", "CmdSessions", "CmdWho",
-           "CmdColorTest", "CmdQuell")
+__all__ = (
+    "CmdOOCLook",
+    "CmdIC",
+    "CmdOOC",
+    "CmdPassword",
+    "CmdQuit",
+    "CmdCharCreate",
+    "CmdOption",
+    "CmdSessions",
+    "CmdWho",
+    "CmdColorTest",
+    "CmdQuell",
+    "CmdCharDelete",
+    "CmdStyle",
+)
 
 
 class MuxAccountLookCommand(COMMAND_DEFAULT_CLASS):
@@ -62,8 +72,9 @@ def parse(self):
                 self.account.db._playable_characters = playable
         # store playable property
         if self.args:
-            self.playable = dict((utils.to_str(char.key.lower()), char)
-                                 for char in playable).get(self.args.lower(), None)
+            self.playable = dict((utils.to_str(char.key.lower()), char) for char in playable).get(
+                self.args.lower(), None
+            )
         else:
             self.playable = playable
 
@@ -121,6 +132,7 @@ class CmdCharCreate(COMMAND_DEFAULT_CLASS):
     always be able to access your character using lower-case letters
     if you want.
     """
+
     key = "charcreate"
     locks = "cmd:pperm(Player)"
     help_category = "General"
@@ -139,12 +151,13 @@ def func(self):
 
         charmax = _MAX_NR_CHARACTERS
 
-        if not account.is_superuser and \
-                (account.db._playable_characters and
-                 len(account.db._playable_characters) >= charmax):
+        if not account.is_superuser and (
+            account.db._playable_characters and len(account.db._playable_characters) >= charmax
+        ):
             self.msg("You may only create a maximum of %i characters." % charmax)
             return
         from evennia.objects.models import ObjectDB
+
         typeclass = settings.BASE_CHARACTER_TYPECLASS
 
         if ObjectDB.objects.filter(db_typeclass_path=typeclass, db_key__iexact=key):
@@ -158,21 +171,27 @@ def func(self):
         start_location = ObjectDB.objects.get_id(settings.START_LOCATION)
         default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME)
         permissions = settings.PERMISSION_ACCOUNT_DEFAULT
-        new_character = create.create_object(typeclass, key=key,
-                                             location=start_location,
-                                             home=default_home,
-                                             permissions=permissions)
+        new_character = create.create_object(
+            typeclass, key=key, location=start_location, home=default_home, permissions=permissions
+        )
         # only allow creator (and developers) to puppet this char
-        new_character.locks.add("puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer);delete:id(%i) or perm(Admin)" %
-                                (new_character.id, account.id, account.id))
+        new_character.locks.add(
+            "puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer);delete:id(%i) or perm(Admin)"
+            % (new_character.id, account.id, account.id)
+        )
         account.db._playable_characters.append(new_character)
         if desc:
             new_character.db.desc = desc
         elif not new_character.db.desc:
             new_character.db.desc = "This is a character."
-        self.msg("Created new character %s. Use |wic %s|n to enter the game as this character."
-                 % (new_character.key, new_character.key))
-        logger.log_sec('Character Created: %s (Caller: %s, IP: %s).' % (new_character, account, self.session.address))
+        self.msg(
+            "Created new character %s. Use |wic %s|n to enter the game as this character."
+            % (new_character.key, new_character.key)
+        )
+        logger.log_sec(
+            "Character Created: %s (Caller: %s, IP: %s)."
+            % (new_character, account, self.session.address)
+        )
 
 
 class CmdCharDelete(COMMAND_DEFAULT_CLASS):
@@ -184,6 +203,7 @@ class CmdCharDelete(COMMAND_DEFAULT_CLASS):
 
     Permanently deletes one of your characters.
     """
+
     key = "chardelete"
     locks = "cmd:pperm(Player)"
     help_category = "General"
@@ -197,13 +217,18 @@ def func(self):
             return
 
         # use the playable_characters list to search
-        match = [char for char in utils.make_iter(account.db._playable_characters)
-                 if char.key.lower() == self.args.lower()]
+        match = [
+            char
+            for char in utils.make_iter(account.db._playable_characters)
+            if char.key.lower() == self.args.lower()
+        ]
         if not match:
             self.msg("You have no such character to delete.")
             return
         elif len(match) > 1:
-            self.msg("Aborting - there are two characters with the same name. Ask an admin to delete the right one.")
+            self.msg(
+                "Aborting - there are two characters with the same name. Ask an admin to delete the right one."
+            )
             return
         else:  # one match
             from evennia.utils.evmenu import get_input
@@ -213,10 +238,15 @@ def _callback(caller, callback_prompt, result):
                     # only take action
                     delobj = caller.ndb._char_to_delete
                     key = delobj.key
-                    caller.db._playable_characters = [pc for pc in caller.db._playable_characters if pc != delobj]
+                    caller.db._playable_characters = [
+                        pc for pc in caller.db._playable_characters if pc != delobj
+                    ]
                     delobj.delete()
                     self.msg("Character '%s' was permanently deleted." % key)
-                    logger.log_sec('Character Deleted: %s (Caller: %s, IP: %s).' % (key, account, self.session.address))
+                    logger.log_sec(
+                        "Character Deleted: %s (Caller: %s, IP: %s)."
+                        % (key, account, self.session.address)
+                    )
                 else:
                     self.msg("Deletion was aborted.")
                 del caller.ndb._char_to_delete
@@ -225,11 +255,13 @@ def _callback(caller, callback_prompt, result):
             account.ndb._char_to_delete = match
 
             # Return if caller has no permission to delete this
-            if not match.access(account, 'delete'):
+            if not match.access(account, "delete"):
                 self.msg("You do not have permission to delete this character.")
                 return
 
-            prompt = "|rThis will permanently destroy '%s'. This cannot be undone.|n Continue yes/[no]?"
+            prompt = (
+                "|rThis will permanently destroy '%s'. This cannot be undone.|n Continue yes/[no]?"
+            )
             get_input(account, prompt % match.key, _callback)
 
 
@@ -275,23 +307,33 @@ def func(self):
                 return
         if not new_character:
             # search for a matching character
-            new_character = [char for char in search.object_search(self.args) if char.access(account, "puppet")]
+            new_character = [
+                char for char in search.object_search(self.args) if char.access(account, "puppet")
+            ]
             if not new_character:
                 self.msg("That is not a valid character choice.")
                 return
             if len(new_character) > 1:
-                self.msg("Multiple targets with the same name:\n %s"
-                         % ", ".join("%s(#%s)" % (obj.key, obj.id) for obj in new_character))
+                self.msg(
+                    "Multiple targets with the same name:\n %s"
+                    % ", ".join("%s(#%s)" % (obj.key, obj.id) for obj in new_character)
+                )
                 return
             else:
                 new_character = new_character[0]
         try:
             account.puppet_object(session, new_character)
             account.db._last_puppet = new_character
-            logger.log_sec('Puppet Success: (Caller: %s, Target: %s, IP: %s).' % (account, new_character, self.session.address))
+            logger.log_sec(
+                "Puppet Success: (Caller: %s, Target: %s, IP: %s)."
+                % (account, new_character, self.session.address)
+            )
         except RuntimeError as exc:
             self.msg("|rYou cannot become |C%s|n: %s" % (new_character.name, exc))
-            logger.log_sec('Puppet Failed: %s (Caller: %s, Target: %s, IP: %s).' % (exc, account, new_character, self.session.address))
+            logger.log_sec(
+                "Puppet Failed: %s (Caller: %s, Target: %s, IP: %s)."
+                % (exc, account, new_character, self.session.address)
+            )
 
 
 # note that this is inheriting from MuxAccountLookCommand,
@@ -356,6 +398,7 @@ class CmdSessions(COMMAND_DEFAULT_CLASS):
     Lists the sessions currently connected to your account.
 
     """
+
     key = "sessions"
     locks = "cmd:all()"
     help_category = "General"
@@ -367,17 +410,18 @@ def func(self):
         """Implement function"""
         account = self.account
         sessions = account.sessions.all()
-        table = self.styled_table("|wsessid",
-                                 "|wprotocol",
-                                 "|whost",
-                                 "|wpuppet/character",
-                                 "|wlocation")
+        table = self.styled_table(
+            "|wsessid", "|wprotocol", "|whost", "|wpuppet/character", "|wlocation"
+        )
         for sess in sorted(sessions, key=lambda x: x.sessid):
             char = account.get_puppet(sess)
-            table.add_row(str(sess.sessid), str(sess.protocol_key),
-                          isinstance(sess.address, tuple) and sess.address[0] or sess.address,
-                          char and str(char) or "None",
-                          char and str(char.location) or "N/A")
+            table.add_row(
+                str(sess.sessid),
+                str(sess.protocol_key),
+                isinstance(sess.address, tuple) and sess.address[0] or sess.address,
+                char and str(char) or "None",
+                char and str(char.location) or "N/A",
+            )
             self.msg("|wYour current session(s):|n\n%s" % table)
 
 
@@ -413,19 +457,23 @@ def func(self):
         if self.cmdstring == "doing":
             show_session_data = False
         else:
-            show_session_data = account.check_permstring("Developer") or account.check_permstring("Admins")
+            show_session_data = account.check_permstring("Developer") or account.check_permstring(
+                "Admins"
+            )
 
         naccounts = SESSIONS.account_count()
         if show_session_data:
             # privileged info
-            table = self.styled_table("|wAccount Name",
-                                    "|wOn for",
-                                    "|wIdle",
-                                    "|wPuppeting",
-                                    "|wRoom",
-                                    "|wCmds",
-                                    "|wProtocol",
-                                    "|wHost")
+            table = self.styled_table(
+                "|wAccount Name",
+                "|wOn for",
+                "|wIdle",
+                "|wPuppeting",
+                "|wRoom",
+                "|wCmds",
+                "|wProtocol",
+                "|wHost",
+            )
             for session in session_list:
                 if not session.logged_in:
                     continue
@@ -434,14 +482,16 @@ def func(self):
                 account = session.get_account()
                 puppet = session.get_puppet()
                 location = puppet.location.key if puppet and puppet.location else "None"
-                table.add_row(utils.crop(account.get_display_name(account), width=25),
-                              utils.time_format(delta_conn, 0),
-                              utils.time_format(delta_cmd, 1),
-                              utils.crop(puppet.get_display_name(account) if puppet else "None", width=25),
-                              utils.crop(location, width=25),
-                              session.cmd_total,
-                              session.protocol_key,
-                              isinstance(session.address, tuple) and session.address[0] or session.address)
+                table.add_row(
+                    utils.crop(account.get_display_name(account), width=25),
+                    utils.time_format(delta_conn, 0),
+                    utils.time_format(delta_cmd, 1),
+                    utils.crop(puppet.get_display_name(account) if puppet else "None", width=25),
+                    utils.crop(location, width=25),
+                    session.cmd_total,
+                    session.protocol_key,
+                    isinstance(session.address, tuple) and session.address[0] or session.address,
+                )
         else:
             # unprivileged
             table = self.styled_table("|wAccount name", "|wOn for", "|wIdle")
@@ -451,12 +501,16 @@ def func(self):
                 delta_cmd = time.time() - session.cmd_last_visible
                 delta_conn = time.time() - session.conn_time
                 account = session.get_account()
-                table.add_row(utils.crop(account.get_display_name(account), width=25),
-                              utils.time_format(delta_conn, 0),
-                              utils.time_format(delta_cmd, 1))
+                table.add_row(
+                    utils.crop(account.get_display_name(account), width=25),
+                    utils.time_format(delta_conn, 0),
+                    utils.time_format(delta_cmd, 1),
+                )
         is_one = naccounts == 1
-        self.msg("|wAccounts:|n\n%s\n%s unique account%s logged in."
-                 % (table, "One" if is_one else naccounts, "" if is_one else "s"))
+        self.msg(
+            "|wAccounts:|n\n%s\n%s unique account%s logged in."
+            % (table, "One" if is_one else naccounts, "" if is_one else "s")
+        )
 
 
 class CmdOption(COMMAND_DEFAULT_CLASS):
@@ -476,6 +530,7 @@ class CmdOption(COMMAND_DEFAULT_CLASS):
 
 
     """
+
     key = "option"
     aliases = "options"
     switch_options = ("save", "clear")
@@ -513,14 +568,18 @@ def func(self):
                 if len(options["SCREENWIDTH"]) == 1:
                     options["SCREENWIDTH"] = options["SCREENWIDTH"][0]
                 else:
-                    options["SCREENWIDTH"] = "  \n".join("%s : %s" % (screenid, size)
-                                                         for screenid, size in options["SCREENWIDTH"].items())
+                    options["SCREENWIDTH"] = "  \n".join(
+                        "%s : %s" % (screenid, size)
+                        for screenid, size in options["SCREENWIDTH"].items()
+                    )
             if "SCREENHEIGHT" in options:
                 if len(options["SCREENHEIGHT"]) == 1:
                     options["SCREENHEIGHT"] = options["SCREENHEIGHT"][0]
                 else:
-                    options["SCREENHEIGHT"] = "  \n".join("%s : %s" % (screenid, size)
-                                                          for screenid, size in options["SCREENHEIGHT"].items())
+                    options["SCREENHEIGHT"] = "  \n".join(
+                        "%s : %s" % (screenid, size)
+                        for screenid, size in options["SCREENHEIGHT"].items()
+                    )
             options.pop("TTYPE", None)
 
             header = ("Name", "Value", "Saved") if saved_options else ("Name", "Value")
@@ -529,7 +588,9 @@ def func(self):
                 row = [key, options[key]]
                 if saved_options:
                     saved = " |YYes|n" if key in saved_options else ""
-                    changed = "|y*|n" if key in saved_options and flags[key] != saved_options[key] else ""
+                    changed = (
+                        "|y*|n" if key in saved_options and flags[key] != saved_options[key] else ""
+                    )
                     row.append("%s%s" % (saved, changed))
                 table.add_row(*row)
             self.msg("|wClient settings (%s):|n\n%s|n" % (self.session.protocol_key, table))
@@ -565,30 +626,35 @@ def update(new_name, new_val, validator):
                     self.msg("Option |w%s|n was kept as '|w%s|n'." % (new_name, old_val))
                 else:
                     flags[new_name] = new_val
-                    self.msg("Option |w%s|n was changed from '|w%s|n' to '|w%s|n'." % (new_name, old_val, new_val))
+                    self.msg(
+                        "Option |w%s|n was changed from '|w%s|n' to '|w%s|n'."
+                        % (new_name, old_val, new_val)
+                    )
                 return {new_name: new_val}
             except Exception as err:
                 self.msg("|rCould not set option |w%s|r:|n %s" % (new_name, err))
                 return False
 
-        validators = {"ANSI": validate_bool,
-                      "CLIENTNAME": utils.to_str,
-                      "ENCODING": validate_encoding,
-                      "MCCP": validate_bool,
-                      "NOGOAHEAD": validate_bool,
-                      "MXP": validate_bool,
-                      "NOCOLOR": validate_bool,
-                      "NOPKEEPALIVE": validate_bool,
-                      "OOB": validate_bool,
-                      "RAW": validate_bool,
-                      "SCREENHEIGHT": validate_size,
-                      "SCREENWIDTH": validate_size,
-                      "SCREENREADER": validate_bool,
-                      "TERM": utils.to_str,
-                      "UTF-8": validate_bool,
-                      "XTERM256": validate_bool,
-                      "INPUTDEBUG": validate_bool,
-                      "FORCEDENDLINE": validate_bool}
+        validators = {
+            "ANSI": validate_bool,
+            "CLIENTNAME": utils.to_str,
+            "ENCODING": validate_encoding,
+            "MCCP": validate_bool,
+            "NOGOAHEAD": validate_bool,
+            "MXP": validate_bool,
+            "NOCOLOR": validate_bool,
+            "NOPKEEPALIVE": validate_bool,
+            "OOB": validate_bool,
+            "RAW": validate_bool,
+            "SCREENHEIGHT": validate_size,
+            "SCREENWIDTH": validate_size,
+            "SCREENREADER": validate_bool,
+            "TERM": utils.to_str,
+            "UTF-8": validate_bool,
+            "XTERM256": validate_bool,
+            "INPUTDEBUG": validate_bool,
+            "FORCEDENDLINE": validate_bool,
+        }
 
         name = self.lhs.upper()
         val = self.rhs.strip()
@@ -623,6 +689,7 @@ class CmdPassword(COMMAND_DEFAULT_CLASS):
 
     Changes your password. Make sure to pick a safe one.
     """
+
     key = "password"
     locks = "cmd:pperm(Player)"
 
@@ -652,7 +719,10 @@ def func(self):
             account.set_password(newpass)
             account.save()
             self.msg("Password changed.")
-            logger.log_sec('Password Changed: %s (Caller: %s, IP: %s).' % (account, account, self.session.address))
+            logger.log_sec(
+                "Password Changed: %s (Caller: %s, IP: %s)."
+                % (account, account, self.session.address)
+            )
 
 
 class CmdQuit(COMMAND_DEFAULT_CLASS):
@@ -668,6 +738,7 @@ class CmdQuit(COMMAND_DEFAULT_CLASS):
     Gracefully disconnect your current session from the
     game. Use the /all switch to disconnect from all sessions.
     """
+
     key = "quit"
     switch_options = ("all",)
     locks = "cmd:all()"
@@ -679,8 +750,10 @@ def func(self):
         """hook function"""
         account = self.account
 
-        if 'all' in self.switches:
-            account.msg("|RQuitting|n all sessions. Hope to see you soon again.", session=self.session)
+        if "all" in self.switches:
+            account.msg(
+                "|RQuitting|n all sessions. Hope to see you soon again.", session=self.session
+            )
             reason = "quit/all"
             for session in account.sessions.all():
                 account.disconnect_session_from_account(session, reason)
@@ -690,7 +763,10 @@ def func(self):
             if nsess == 2:
                 account.msg("|RQuitting|n. One session is still connected.", session=self.session)
             elif nsess > 2:
-                account.msg("|RQuitting|n. %i sessions are still connected." % (nsess - 1), session=self.session)
+                account.msg(
+                    "|RQuitting|n. %i sessions are still connected." % (nsess - 1),
+                    session=self.session,
+                )
             else:
                 # we are quitting the last available session
                 account.msg("|RQuitting|n. Hope to see you again, soon.", session=self.session)
@@ -710,6 +786,7 @@ class CmdColorTest(COMMAND_DEFAULT_CLASS):
     standard. No checking is done to determine your client supports
     color - if not you will see rubbish appear.
     """
+
     key = "color"
     locks = "cmd:all()"
     help_category = "General"
@@ -721,7 +798,7 @@ class CmdColorTest(COMMAND_DEFAULT_CLASS):
     # relevant color tags to display. Replace if using another schema.
     # This command can only show one set of markup.
     slice_bright_fg = slice(7, 15)  # from ANSI_PARSER.ansi_map
-    slice_dark_fg = slice(15, 23)   # from ANSI_PARSER.ansi_map
+    slice_dark_fg = slice(15, 23)  # from ANSI_PARSER.ansi_map
     slice_dark_bg = slice(-8, None)  # from ANSI_PARSER.ansi_map
     slice_bright_bg = slice(None, None)  # from ANSI_PARSER.ansi_xterm256_bright_bg_map
 
@@ -737,8 +814,12 @@ def table_format(self, table):
         max_widths = [max([len(str(val)) for val in col]) for col in table]
         ftable = []
         for irow in range(len(table[0])):
-            ftable.append([str(col[irow]).ljust(max_widths[icol]) + " " *
-                           extra_space for icol, col in enumerate(table)])
+            ftable.append(
+                [
+                    str(col[irow]).ljust(max_widths[icol]) + " " * extra_space
+                    for icol, col in enumerate(table)
+                ]
+            )
         return ftable
 
     def func(self):
@@ -747,26 +828,37 @@ def func(self):
         if self.args.startswith("a"):
             # show ansi 16-color table
             from evennia.utils import ansi
+
             ap = ansi.ANSI_PARSER
             # ansi colors
             # show all ansi color-related codes
-            bright_fg = ["%s%s|n" % (code, code.replace("|", "||"))
-                         for code, _ in ap.ansi_map[self.slice_bright_fg]]
-            dark_fg = ["%s%s|n" % (code, code.replace("|", "||"))
-                       for code, _ in ap.ansi_map[self.slice_dark_fg]]
-            dark_bg = ["%s%s|n" % (code.replace("\\", ""), code.replace("|", "||").replace("\\", ""))
-                       for code, _ in ap.ansi_map[self.slice_dark_bg]]
-            bright_bg = ["%s%s|n" % (code.replace("\\", ""), code.replace("|", "||").replace("\\", ""))
-                         for code, _ in ap.ansi_xterm256_bright_bg_map[self.slice_bright_bg]]
+            bright_fg = [
+                "%s%s|n" % (code, code.replace("|", "||"))
+                for code, _ in ap.ansi_map[self.slice_bright_fg]
+            ]
+            dark_fg = [
+                "%s%s|n" % (code, code.replace("|", "||"))
+                for code, _ in ap.ansi_map[self.slice_dark_fg]
+            ]
+            dark_bg = [
+                "%s%s|n" % (code.replace("\\", ""), code.replace("|", "||").replace("\\", ""))
+                for code, _ in ap.ansi_map[self.slice_dark_bg]
+            ]
+            bright_bg = [
+                "%s%s|n" % (code.replace("\\", ""), code.replace("|", "||").replace("\\", ""))
+                for code, _ in ap.ansi_xterm256_bright_bg_map[self.slice_bright_bg]
+            ]
             dark_fg.extend(["" for _ in range(len(bright_fg) - len(dark_fg))])
             table = utils.format_table([bright_fg, dark_fg, bright_bg, dark_bg])
             string = "ANSI colors:"
             for row in table:
                 string += "\n " + " ".join(row)
             self.msg(string)
-            self.msg("||X : black. ||/ : return, ||- : tab, ||_ : space, ||* : invert, ||u : underline\n"
-                     "To combine background and foreground, add background marker last, e.g. ||r||[B.\n"
-                     "Note: bright backgrounds like ||[r requires your client handling Xterm256 colors.")
+            self.msg(
+                "||X : black. ||/ : return, ||- : tab, ||_ : space, ||* : invert, ||u : underline\n"
+                "To combine background and foreground, add background marker last, e.g. ||r||[B.\n"
+                "Note: bright backgrounds like ||[r requires your client handling Xterm256 colors."
+            )
 
         elif self.args.startswith("x"):
             # show xterm256 table
@@ -777,8 +869,10 @@ def func(self):
                         # foreground table
                         table[ir].append("|%i%i%i%s|n" % (ir, ig, ib, "||%i%i%i" % (ir, ig, ib)))
                         # background table
-                        table[6 + ir].append("|%i%i%i|[%i%i%i%s|n"
-                                             % (5 - ir, 5 - ig, 5 - ib, ir, ig, ib, "||[%i%i%i" % (ir, ig, ib)))
+                        table[6 + ir].append(
+                            "|%i%i%i|[%i%i%i%s|n"
+                            % (5 - ir, 5 - ig, 5 - ib, ir, ig, ib, "||[%i%i%i" % (ir, ig, ib))
+                        )
             table = self.table_format(table)
             string = "Xterm256 colors (if not all hues show, your client might not report that it can handle xterm256):"
             string += "\n" + "\n".join("".join(row) for row in table)
@@ -847,24 +941,30 @@ def _recache_locks(self, account):
     def func(self):
         """Perform the command"""
         account = self.account
-        permstr = account.is_superuser and " (superuser)" or "(%s)" % (", ".join(account.permissions.all()))
-        if self.cmdstring in ('unquell', 'unquell'):
-            if not account.attributes.get('_quell'):
+        permstr = (
+            account.is_superuser
+            and " (superuser)"
+            or "(%s)" % (", ".join(account.permissions.all()))
+        )
+        if self.cmdstring in ("unquell", "unquell"):
+            if not account.attributes.get("_quell"):
                 self.msg("Already using normal Account permissions %s." % permstr)
             else:
-                account.attributes.remove('_quell')
+                account.attributes.remove("_quell")
                 self.msg("Account permissions %s restored." % permstr)
         else:
-            if account.attributes.get('_quell'):
+            if account.attributes.get("_quell"):
                 self.msg("Already quelling Account %s permissions." % permstr)
                 return
-            account.attributes.add('_quell', True)
+            account.attributes.add("_quell", True)
             puppet = self.session.puppet
             if puppet:
                 cpermstr = "(%s)" % ", ".join(puppet.permissions.all())
                 cpermstr = "Quelling to current puppet's permissions %s." % cpermstr
-                cpermstr += "\n(Note: If this is higher than Account permissions %s," \
-                            " the lowest of the two will be used.)" % permstr
+                cpermstr += (
+                    "\n(Note: If this is higher than Account permissions %s,"
+                    " the lowest of the two will be used.)" % permstr
+                )
                 cpermstr += "\nUse unquell to return to normal permission usage."
                 self.msg(cpermstr)
             else:
@@ -886,7 +986,7 @@ class CmdStyle(COMMAND_DEFAULT_CLASS):
     """
 
     key = "style"
-    switch_options = ['clear']
+    switch_options = ["clear"]
 
     def func(self):
         if not self.args:
@@ -895,11 +995,12 @@ def func(self):
         self.set()
 
     def list_styles(self):
-        table = self.styled_table('Option', 'Description', 'Type', 'Value', width=78)
+        table = self.styled_table("Option", "Description", "Type", "Value", width=78)
         for op_key in self.account.options.options_dict.keys():
             op_found = self.account.options.get(op_key, return_obj=True)
-            table.add_row(op_key, op_found.description,
-                          op_found.__class__.__name__, op_found.display())
+            table.add_row(
+                op_key, op_found.description, op_found.__class__.__name__, op_found.display()
+            )
         self.msg(str(table))
 
     def set(self):
@@ -908,4 +1009,4 @@ def set(self):
         except ValueError as e:
             self.msg(str(e))
             return
-        self.msg('Style %s set to %s' % (self.lhs, result))
+        self.msg("Style %s set to %s" % (self.lhs, result))
diff --git a/evennia/commands/default/admin.py b/evennia/commands/default/admin.py
index f87bd5d16ec..62f5cdef540 100644
--- a/evennia/commands/default/admin.py
+++ b/evennia/commands/default/admin.py
@@ -16,8 +16,16 @@
 PERMISSION_HIERARCHY = [p.lower() for p in settings.PERMISSION_HIERARCHY]
 
 # limit members for API inclusion
-__all__ = ("CmdBoot", "CmdBan", "CmdUnban",
-           "CmdEmit", "CmdNewPassword", "CmdPerm", "CmdWall", "CmdForce")
+__all__ = (
+    "CmdBoot",
+    "CmdBan",
+    "CmdUnban",
+    "CmdEmit",
+    "CmdNewPassword",
+    "CmdPerm",
+    "CmdWall",
+    "CmdForce",
+)
 
 
 class CmdBoot(COMMAND_DEFAULT_CLASS):
@@ -49,14 +57,14 @@ def func(self):
             caller.msg("Usage: boot[/switches] <account> [:reason]")
             return
 
-        if ':' in args:
-            args, reason = [a.strip() for a in args.split(':', 1)]
+        if ":" in args:
+            args, reason = [a.strip() for a in args.split(":", 1)]
         else:
             args, reason = args, ""
 
         boot_list = []
 
-        if 'sid' in self.switches:
+        if "sid" in self.switches:
             # Boot a particular session id.
             sessions = SESSIONS.get_sessions(True)
             for sess in sessions:
@@ -71,8 +79,8 @@ def func(self):
                 caller.msg("Account %s was not found." % args)
                 return
             pobj = pobj[0]
-            if not pobj.access(caller, 'boot'):
-                string = "You don't have the permission to boot %s." % (pobj.key, )
+            if not pobj.access(caller, "boot"):
+                string = "You don't have the permission to boot %s." % (pobj.key,)
                 caller.msg(string)
                 return
             # we have a bootable object with a connected user
@@ -87,7 +95,7 @@ def func(self):
         # Carry out the booting of the sessions in the boot list.
 
         feedback = None
-        if 'quiet' not in self.switches:
+        if "quiet" not in self.switches:
             feedback = "You have been disconnected by %s.\n" % caller.name
             if reason:
                 feedback += "\nReason given: %s" % reason
@@ -97,7 +105,10 @@ def func(self):
             session.account.disconnect_session_from_account(session)
 
         if pobj and boot_list:
-            logger.log_sec('Booted: %s (Reason: %s, Caller: %s, IP: %s).' % (pobj, reason, caller, self.session.address))
+            logger.log_sec(
+                "Booted: %s (Reason: %s, Caller: %s, IP: %s)."
+                % (pobj, reason, caller, self.session.address)
+            )
 
 
 # regex matching IP addresses with wildcards, eg. 233.122.4.*
@@ -118,9 +129,7 @@ def list_bans(cmd, banlist):
 
     table = cmd.styled_table("|wid", "|wname/ip", "|wdate", "|wreason")
     for inum, ban in enumerate(banlist):
-        table.add_row(str(inum + 1),
-                      ban[0] and ban[0] or ban[1],
-                      ban[3], ban[4])
+        table.add_row(str(inum + 1), ban[0] and ban[0] or ban[1], ban[3], ban[4])
     return "|wActive bans:|n\n%s" % table
 
 
@@ -157,6 +166,7 @@ class CmdBan(COMMAND_DEFAULT_CLASS):
     or region.
 
     """
+
     key = "ban"
     aliases = ["bans"]
     locks = "cmd:perm(ban) or perm(Developer)"
@@ -175,20 +185,20 @@ def func(self):
         'reason' is any optional info given to the command. Unset
         values in each tuple is set to the empty string.
         """
-        banlist = ServerConfig.objects.conf('server_bans')
+        banlist = ServerConfig.objects.conf("server_bans")
         if not banlist:
             banlist = []
 
-        if not self.args or (self.switches and
-                             not any(switch in ('ip', 'name')
-                                     for switch in self.switches)):
+        if not self.args or (
+            self.switches and not any(switch in ("ip", "name") for switch in self.switches)
+        ):
             self.caller.msg(list_bans(self, banlist))
             return
 
         now = time.ctime()
         reason = ""
-        if ':' in self.args:
-            ban, reason = self.args.rsplit(':', 1)
+        if ":" in self.args:
+            ban, reason = self.args.rsplit(":", 1)
         else:
             ban = self.args
         ban = ban.lower()
@@ -202,15 +212,18 @@ def func(self):
             typ = "IP"
             ban = ipban[0]
             # replace * with regex form and compile it
-            ipregex = ban.replace('.', '\.')
-            ipregex = ipregex.replace('*', '[0-9]{1,3}')
+            ipregex = ban.replace(".", "\.")
+            ipregex = ipregex.replace("*", "[0-9]{1,3}")
             ipregex = re.compile(r"%s" % ipregex)
             bantup = ("", ban, ipregex, now, reason)
         # save updated banlist
         banlist.append(bantup)
-        ServerConfig.objects.conf('server_bans', banlist)
+        ServerConfig.objects.conf("server_bans", banlist)
         self.caller.msg("%s-Ban |w%s|n was added." % (typ, ban))
-        logger.log_sec('Banned %s: %s (Caller: %s, IP: %s).' % (typ, ban.strip(), self.caller, self.session.address))
+        logger.log_sec(
+            "Banned %s: %s (Caller: %s, IP: %s)."
+            % (typ, ban.strip(), self.caller, self.session.address)
+        )
 
 
 class CmdUnban(COMMAND_DEFAULT_CLASS):
@@ -226,6 +239,7 @@ class CmdUnban(COMMAND_DEFAULT_CLASS):
     unban.
 
     """
+
     key = "unban"
     locks = "cmd:perm(unban) or perm(Developer)"
     help_category = "Admin"
@@ -233,7 +247,7 @@ class CmdUnban(COMMAND_DEFAULT_CLASS):
     def func(self):
         """Implement unbanning"""
 
-        banlist = ServerConfig.objects.conf('server_bans')
+        banlist = ServerConfig.objects.conf("server_bans")
 
         if not self.args:
             self.caller.msg(list_bans(self, banlist))
@@ -253,11 +267,13 @@ def func(self):
             # all is ok, clear ban
             ban = banlist[num - 1]
             del banlist[num - 1]
-            ServerConfig.objects.conf('server_bans', banlist)
+            ServerConfig.objects.conf("server_bans", banlist)
             value = " ".join([s for s in ban[:2]])
-            self.caller.msg("Cleared ban %s: %s" %
-                            (num, value))
-            logger.log_sec('Unbanned: %s (Caller: %s, IP: %s).' % (value.strip(), self.caller, self.session.address))
+            self.caller.msg("Cleared ban %s: %s" % (num, value))
+            logger.log_sec(
+                "Unbanned: %s (Caller: %s, IP: %s)."
+                % (value.strip(), self.caller, self.session.address)
+            )
 
 
 class CmdEmit(COMMAND_DEFAULT_CLASS):
@@ -280,6 +296,7 @@ class CmdEmit(COMMAND_DEFAULT_CLASS):
     limited forms of emit, for sending to rooms and
     to accounts respectively.
     """
+
     key = "emit"
     aliases = ["pemit", "remit"]
     switch_options = ("room", "accounts", "contents")
@@ -300,15 +317,15 @@ def func(self):
             caller.msg(string)
             return
 
-        rooms_only = 'rooms' in self.switches
-        accounts_only = 'accounts' in self.switches
-        send_to_contents = 'contents' in self.switches
+        rooms_only = "rooms" in self.switches
+        accounts_only = "accounts" in self.switches
+        send_to_contents = "contents" in self.switches
 
         # we check which command was used to force the switches
-        if self.cmdstring == 'remit':
+        if self.cmdstring == "remit":
             rooms_only = True
             send_to_contents = True
-        elif self.cmdstring == 'pemit':
+        elif self.cmdstring == "pemit":
             accounts_only = True
 
         if not self.rhs:
@@ -329,7 +346,7 @@ def func(self):
             if accounts_only and not obj.has_account:
                 caller.msg("%s has no active account. Ignored." % objname)
                 continue
-            if obj.access(caller, 'tell'):
+            if obj.access(caller, "tell"):
                 obj.msg(message)
                 if send_to_contents and hasattr(obj, "msg_contents"):
                     obj.msg_contents(message)
@@ -382,9 +399,10 @@ def func(self):
         account.save()
         self.msg("%s - new password set to '%s'." % (account.name, newpass))
         if account.character != caller:
-            account.msg("%s has changed your password to '%s'." % (caller.name,
-                                                                   newpass))
-        logger.log_sec('Password Changed: %s (Caller: %s, IP: %s).' % (account, caller, self.session.address))
+            account.msg("%s has changed your password to '%s'." % (caller.name, newpass))
+        logger.log_sec(
+            "Password Changed: %s (Caller: %s, IP: %s)." % (account, caller, self.session.address)
+        )
 
 
 class CmdPerm(COMMAND_DEFAULT_CLASS):
@@ -402,6 +420,7 @@ class CmdPerm(COMMAND_DEFAULT_CLASS):
     This command sets/clears individual permission strings on an object
     or account. If no permission is given, list all permissions on <object>.
     """
+
     key = "perm"
     aliases = "setperm"
     switch_options = ("del", "account")
@@ -420,7 +439,7 @@ def func(self):
             caller.msg(string)
             return
 
-        accountmode = 'account' in self.switches or lhs.startswith('*')
+        accountmode = "account" in self.switches or lhs.startswith("*")
         lhs = lhs.lstrip("*")
 
         if accountmode:
@@ -431,7 +450,7 @@ def func(self):
             return
 
         if not rhs:
-            if not obj.access(caller, 'examine'):
+            if not obj.access(caller, "examine"):
                 caller.msg("You are not allowed to examine this object.")
                 return
 
@@ -440,9 +459,11 @@ def func(self):
                 string += "<None>"
             else:
                 string += ", ".join(obj.permissions.all())
-                if (hasattr(obj, 'account') and
-                    hasattr(obj.account, 'is_superuser') and
-                        obj.account.is_superuser):
+                if (
+                    hasattr(obj, "account")
+                    and hasattr(obj.account, "is_superuser")
+                    and obj.account.is_superuser
+                ):
                     string += "\n(... but this object is currently controlled by a SUPERUSER! "
                     string += "All access checks are passed automatically.)"
             caller.msg(string)
@@ -451,22 +472,33 @@ def func(self):
         # we supplied an argument on the form obj = perm
         locktype = "edit" if accountmode else "control"
         if not obj.access(caller, locktype):
-            caller.msg("You are not allowed to edit this %s's permissions."
-                       % ("account" if accountmode else "object"))
+            caller.msg(
+                "You are not allowed to edit this %s's permissions."
+                % ("account" if accountmode else "object")
+            )
             return
 
         caller_result = []
         target_result = []
-        if 'del' in switches:
+        if "del" in switches:
             # delete the given permission(s) from object.
             for perm in self.rhslist:
                 obj.permissions.remove(perm)
                 if obj.permissions.get(perm):
-                    caller_result.append("\nPermissions %s could not be removed from %s." % (perm, obj.name))
+                    caller_result.append(
+                        "\nPermissions %s could not be removed from %s." % (perm, obj.name)
+                    )
                 else:
-                    caller_result.append("\nPermission %s removed from %s (if they existed)." % (perm, obj.name))
-                    target_result.append("\n%s revokes the permission(s) %s from you." % (caller.name, perm))
-                    logger.log_sec('Permissions Deleted: %s, %s (Caller: %s, IP: %s).' % (perm, obj, caller, self.session.address))
+                    caller_result.append(
+                        "\nPermission %s removed from %s (if they existed)." % (perm, obj.name)
+                    )
+                    target_result.append(
+                        "\n%s revokes the permission(s) %s from you." % (caller.name, perm)
+                    )
+                    logger.log_sec(
+                        "Permissions Deleted: %s, %s (Caller: %s, IP: %s)."
+                        % (perm, obj, caller, self.session.address)
+                    )
         else:
             # add a new permission
             permissions = obj.permissions.all()
@@ -475,20 +507,32 @@ def func(self):
 
                 # don't allow to set a permission higher in the hierarchy than
                 # the one the caller has (to prevent self-escalation)
-                if (perm.lower() in PERMISSION_HIERARCHY and not
-                        obj.locks.check_lockstring(caller, "dummy:perm(%s)" % perm)):
-                    caller.msg("You cannot assign a permission higher than the one you have yourself.")
+                if perm.lower() in PERMISSION_HIERARCHY and not obj.locks.check_lockstring(
+                    caller, "dummy:perm(%s)" % perm
+                ):
+                    caller.msg(
+                        "You cannot assign a permission higher than the one you have yourself."
+                    )
                     return
 
                 if perm in permissions:
-                    caller_result.append("\nPermission '%s' is already defined on %s." % (perm, obj.name))
+                    caller_result.append(
+                        "\nPermission '%s' is already defined on %s." % (perm, obj.name)
+                    )
                 else:
                     obj.permissions.add(perm)
                     plystring = "the Account" if accountmode else "the Object/Character"
-                    caller_result.append("\nPermission '%s' given to %s (%s)." % (perm, obj.name, plystring))
-                    target_result.append("\n%s gives you (%s, %s) the permission '%s'."
-                                         % (caller.name, obj.name, plystring, perm))
-                    logger.log_sec('Permissions Added: %s, %s (Caller: %s, IP: %s).' % (obj, perm, caller, self.session.address))
+                    caller_result.append(
+                        "\nPermission '%s' given to %s (%s)." % (perm, obj.name, plystring)
+                    )
+                    target_result.append(
+                        "\n%s gives you (%s, %s) the permission '%s'."
+                        % (caller.name, obj.name, plystring, perm)
+                    )
+                    logger.log_sec(
+                        "Permissions Added: %s, %s (Caller: %s, IP: %s)."
+                        % (obj, perm, caller, self.session.address)
+                    )
 
         caller.msg("".join(caller_result).strip())
         if target_result:
@@ -505,6 +549,7 @@ class CmdWall(COMMAND_DEFAULT_CLASS):
     Announces a message to all connected sessions
     including all currently unlogged in.
     """
+
     key = "wall"
     locks = "cmd:perm(wall) or perm(Admin)"
     help_category = "Admin"
@@ -514,7 +559,7 @@ def func(self):
         if not self.args:
             self.caller.msg("Usage: wall <message>")
             return
-        message = "%s shouts \"%s\"" % (self.caller.name, self.args)
+        message = '%s shouts "%s"' % (self.caller.name, self.args)
         self.msg("Announcing to all connected sessions ...")
         SESSIONS.announce_all(message)
 
@@ -529,6 +574,7 @@ class CmdForce(COMMAND_DEFAULT_CLASS):
     Example:
         force bob=get stick
     """
+
     key = "force"
     locks = "cmd:perm(spawn) or perm(Builder)"
     help_category = "Building"
diff --git a/evennia/commands/default/batchprocess.py b/evennia/commands/default/batchprocess.py
index 2c4d7966349..de3c0819d13 100644
--- a/evennia/commands/default/batchprocess.py
+++ b/evennia/commands/default/batchprocess.py
@@ -18,7 +18,6 @@
 
 """
 import re
-from builtins import range
 
 from django.conf import settings
 from evennia.utils.batchprocessors import BATCHCMD, BATCHCODE
@@ -85,6 +84,7 @@
 # Helper functions
 # -------------------------------------------------------------
 
+
 def format_header(caller, entry):
     """
     Formats a header
@@ -101,7 +101,7 @@ def format_header(caller, entry):
     header = "|w%02i/%02i|G: %s|n" % (ptr, stacklen, header)
     # add extra space to the side for padding.
     header = "%s%s" % (header, " " * (width - len(header)))
-    header = header.replace('\n', '\\n')
+    header = header.replace("\n", "\\n")
 
     return header
 
@@ -111,7 +111,7 @@ def format_code(entry):
     Formats the viewing of code and errors
     """
     code = ""
-    for line in entry.split('\n'):
+    for line in entry.split("\n"):
         code += "\n|G>>>|n %s" % line
     return code.strip()
 
@@ -142,8 +142,7 @@ def batch_code_exec(caller):
     code = stack[ptr]
 
     caller.msg(format_header(caller, code))
-    err = BATCHCODE.code_exec(code,
-                              extra_environ={"caller": caller}, debug=debug)
+    err = BATCHCODE.code_exec(code, extra_environ={"caller": caller}, debug=debug)
     if err:
         caller.msg(format_code(err))
         return False
@@ -186,7 +185,7 @@ def show_curr(caller, showall=False):
     codeall = entry.strip()
     string += "|G(hh for help)"
     if showall:
-        for line in codeall.split('\n'):
+        for line in codeall.split("\n"):
             string += "\n|G||n %s" % line
     caller.msg(string)
 
@@ -215,6 +214,7 @@ def purge_processor(caller):
 
     caller.scripts.validate()  # this will purge interactive mode
 
+
 # -------------------------------------------------------------
 # main access commands
 # -------------------------------------------------------------
@@ -235,6 +235,7 @@ class CmdBatchCommands(_COMMAND_DEFAULT_CLASS):
     Runs batches of commands from a batch-cmd text file (*.ev).
 
     """
+
     key = "batchcommands"
     aliases = ["batchcommand", "batchcmd"]
     switch_options = ("interactive",)
@@ -264,8 +265,10 @@ def func(self):
                 err = "{}\n".format(str(err))
             else:
                 err = ""
-            string = "%s'%s' could not load. You have to supply python paths " \
-                     "from one of the defined batch-file directories\n (%s)."
+            string = (
+                "%s'%s' could not load. You have to supply python paths "
+                "from one of the defined batch-file directories\n (%s)."
+            )
             caller.msg(string % (err, python_path, ", ".join(settings.BASE_BATCHPROCESS_PATHS)))
             return
         if not commands:
@@ -283,7 +286,7 @@ def func(self):
         caller.ndb.batch_cmdset_backup = list(caller.cmdset.cmdset_stack)
         caller.cmdset.add(BatchSafeCmdSet)
 
-        if 'inter' in switches or 'interactive' in switches:
+        if "inter" in switches or "interactive" in switches:
             # Allow more control over how batch file is executed
 
             # Set interactive state directly
@@ -292,9 +295,10 @@ def func(self):
             caller.msg("\nBatch-command processor - Interactive mode for %s ..." % python_path)
             show_curr(caller)
         else:
-            caller.msg("Running Batch-command processor - Automatic mode "
-                       "for %s (this might take some time) ..."
-                       % python_path)
+            caller.msg(
+                "Running Batch-command processor - Automatic mode "
+                "for %s (this might take some time) ..." % python_path
+            )
 
             procpool = False
             if "PythonProcPool" in utils.server_services():
@@ -313,11 +317,13 @@ def errback(e):
                     caller.msg("  |RError from processor: '%s'" % e)
                     purge_processor(caller)
 
-                utils.run_async(_PROCPOOL_BATCHCMD_SOURCE,
-                                commands=commands,
-                                caller=caller,
-                                at_return=callback,
-                                at_err=errback)
+                utils.run_async(
+                    _PROCPOOL_BATCHCMD_SOURCE,
+                    commands=commands,
+                    caller=caller,
+                    at_return=callback,
+                    at_err=errback,
+                )
             else:
                 # run in-process (might block)
                 for _ in range(len(commands)):
@@ -351,6 +357,7 @@ class CmdBatchCode(_COMMAND_DEFAULT_CLASS):
     Runs batches of commands from a batch-code text file (*.py).
 
     """
+
     key = "batchcode"
     aliases = ["batchcodes"]
     switch_options = ("interactive", "debug")
@@ -367,7 +374,7 @@ def func(self):
             caller.msg("Usage: batchcode[/interactive/debug] <path.to.file>")
             return
         python_path = self.args
-        debug = 'debug' in self.switches
+        debug = "debug" in self.switches
 
         # parse indata file
         try:
@@ -380,8 +387,10 @@ def func(self):
                 err = "{}\n".format(str(err))
             else:
                 err = ""
-            string = "%s'%s' could not load. You have to supply python paths " \
-                     "from one of the defined batch-file directories\n (%s)."
+            string = (
+                "%s'%s' could not load. You have to supply python paths "
+                "from one of the defined batch-file directories\n (%s)."
+            )
             caller.msg(string % (err, python_path, ", ".join(settings.BASE_BATCHPROCESS_PATHS)))
             return
         if not codes:
@@ -400,7 +409,7 @@ def func(self):
         caller.ndb.batch_cmdset_backup = list(caller.cmdset.cmdset_stack)
         caller.cmdset.add(BatchSafeCmdSet)
 
-        if 'inter' in switches or 'interactive'in switches:
+        if "inter" in switches or "interactive" in switches:
             # Allow more control over how batch file is executed
 
             # Set interactive state directly
@@ -426,11 +435,14 @@ def callback(r):
                 def errback(e):
                     caller.msg("  |RError from processor: '%s'" % e)
                     purge_processor(caller)
-                utils.run_async(_PROCPOOL_BATCHCODE_SOURCE,
-                                codes=codes,
-                                caller=caller,
-                                at_return=callback,
-                                at_err=errback)
+
+                utils.run_async(
+                    _PROCPOOL_BATCHCODE_SOURCE,
+                    codes=codes,
+                    caller=caller,
+                    at_return=callback,
+                    at_err=errback,
+                )
             else:
                 # un in-process (will block)
                 for _ in range(len(codes)):
@@ -450,6 +462,7 @@ def errback(e):
 # (these are the same for both processors)
 # -------------------------------------------------------------
 
+
 class CmdStateAbort(_COMMAND_DEFAULT_CLASS):
     """
     abort
@@ -458,6 +471,7 @@ class CmdStateAbort(_COMMAND_DEFAULT_CLASS):
     the default cmdset, regardless of what current cmdset the processor might
     have put us in (e.g. when testing buggy scripts etc).
     """
+
     key = "abort"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -475,6 +489,7 @@ class CmdStateLL(_COMMAND_DEFAULT_CLASS):
     Look at the full source for the current
     command definition.
     """
+
     key = "ll"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -489,6 +504,7 @@ class CmdStatePP(_COMMAND_DEFAULT_CLASS):
 
     Process the currently shown command definition.
     """
+
     key = "pp"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -511,6 +527,7 @@ class CmdStateRR(_COMMAND_DEFAULT_CLASS):
     Reload the batch file, keeping the current
     position in it.
     """
+
     key = "rr"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -533,6 +550,7 @@ class CmdStateRRR(_COMMAND_DEFAULT_CLASS):
     Reload the batch file, starting over
     from the beginning.
     """
+
     key = "rrr"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -554,6 +572,7 @@ class CmdStateNN(_COMMAND_DEFAULT_CLASS):
 
     Go to next command. No commands are executed.
     """
+
     key = "nn"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -576,6 +595,7 @@ class CmdStateNL(_COMMAND_DEFAULT_CLASS):
     Go to next command, viewing its full source.
     No commands are executed.
     """
+
     key = "nl"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -598,6 +618,7 @@ class CmdStateBB(_COMMAND_DEFAULT_CLASS):
     Backwards to previous command. No commands
     are executed.
     """
+
     key = "bb"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -620,6 +641,7 @@ class CmdStateBL(_COMMAND_DEFAULT_CLASS):
     Backwards to previous command, viewing its full
     source. No commands are executed.
     """
+
     key = "bl"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -643,6 +665,7 @@ class CmdStateSS(_COMMAND_DEFAULT_CLASS):
     one. If steps is given,
     process this many commands.
     """
+
     key = "ss"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -672,6 +695,7 @@ class CmdStateSL(_COMMAND_DEFAULT_CLASS):
     one, viewing its full source. If steps is given,
     process this many commands.
     """
+
     key = "sl"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -700,6 +724,7 @@ class CmdStateCC(_COMMAND_DEFAULT_CLASS):
     Continue to process all remaining
     commands.
     """
+
     key = "cc"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -728,6 +753,7 @@ class CmdStateJJ(_COMMAND_DEFAULT_CLASS):
 
     Jump to specific command number
     """
+
     key = "jj"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -752,6 +778,7 @@ class CmdStateJL(_COMMAND_DEFAULT_CLASS):
 
     Jump to specific command number and view its full source.
     """
+
     key = "jl"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -776,6 +803,7 @@ class CmdStateQQ(_COMMAND_DEFAULT_CLASS):
 
     Quit the batchprocessor.
     """
+
     key = "qq"
     help_category = "BatchProcess"
     locks = "cmd:perm(batchcommands)"
@@ -828,12 +856,14 @@ def func(self):
 #
 # -------------------------------------------------------------
 
+
 class BatchSafeCmdSet(CmdSet):
     """
     The base cmdset for the batch processor.
     This sets a 'safe' abort command that will
     always be available to get out of everything.
     """
+
     key = "Batch_default"
     priority = 150  # override other cmdsets.
 
@@ -846,6 +876,7 @@ class BatchInteractiveCmdSet(CmdSet):
     """
     The cmdset for the interactive batch processor mode.
     """
+
     key = "Batch_interactive"
     priority = 104
 
diff --git a/evennia/commands/default/building.py b/evennia/commands/default/building.py
index f7ef0c41521..92002dcecdb 100644
--- a/evennia/commands/default/building.py
+++ b/evennia/commands/default/building.py
@@ -1,8 +1,6 @@
 """
 Building and world design commands
 """
-from builtins import range
-
 import re
 from django.conf import settings
 from django.db.models import Q
@@ -10,7 +8,12 @@
 from evennia.locks.lockhandler import LockException
 from evennia.commands.cmdhandler import get_and_merge_cmdsets
 from evennia.utils import create, utils, search
-from evennia.utils.utils import inherits_from, class_from_module, get_all_typeclasses, variable_from_module
+from evennia.utils.utils import (
+    inherits_from,
+    class_from_module,
+    get_all_typeclasses,
+    variable_from_module,
+)
 from evennia.utils.eveditor import EvEditor
 from evennia.utils.evmore import EvMore
 from evennia.prototypes import spawner, prototypes as protlib, menus as olc_menus
@@ -19,17 +22,40 @@
 COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
 
 # limit symbol import for API
-__all__ = ("ObjManipCommand", "CmdSetObjAlias", "CmdCopy",
-           "CmdCpAttr", "CmdMvAttr", "CmdCreate",
-           "CmdDesc", "CmdDestroy", "CmdDig", "CmdTunnel", "CmdLink",
-           "CmdUnLink", "CmdSetHome", "CmdListCmdSets", "CmdName",
-           "CmdOpen", "CmdSetAttribute", "CmdTypeclass", "CmdWipe",
-           "CmdLock", "CmdExamine", "CmdFind", "CmdTeleport",
-           "CmdScript", "CmdTag", "CmdSpawn")
+__all__ = (
+    "ObjManipCommand",
+    "CmdSetObjAlias",
+    "CmdCopy",
+    "CmdCpAttr",
+    "CmdMvAttr",
+    "CmdCreate",
+    "CmdDesc",
+    "CmdDestroy",
+    "CmdDig",
+    "CmdTunnel",
+    "CmdLink",
+    "CmdUnLink",
+    "CmdSetHome",
+    "CmdListCmdSets",
+    "CmdName",
+    "CmdOpen",
+    "CmdSetAttribute",
+    "CmdTypeclass",
+    "CmdWipe",
+    "CmdLock",
+    "CmdExamine",
+    "CmdFind",
+    "CmdTeleport",
+    "CmdScript",
+    "CmdTag",
+    "CmdSpawn",
+)
 
 # used by set
 from ast import literal_eval as _LITERAL_EVAL
 
+LIST_APPEND_CHAR = "+"
+
 # used by find
 CHAR_TYPECLASS = settings.BASE_CHARACTER_TYPECLASS
 ROOM_TYPECLASS = settings.BASE_ROOM_TYPECLASS
@@ -59,6 +85,7 @@ class ObjManipCommand(COMMAND_DEFAULT_CLASS):
         objname/attr/attr/attr, objname/attr, ...
 
     """
+
     # OBS - this is just a parent - it's not intended to actually be
     # included in a commandset on its own!
 
@@ -70,24 +97,24 @@ def parse(self):
         # get all the normal parsing done (switches etc)
         super().parse()
 
-        obj_defs = ([], [])    # stores left- and right-hand side of '='
+        obj_defs = ([], [])  # stores left- and right-hand side of '='
         obj_attrs = ([], [])  # "
 
         for iside, arglist in enumerate((self.lhslist, self.rhslist)):
             # lhslist/rhslist is already split by ',' at this point
             for objdef in arglist:
                 aliases, option, attrs = [], None, []
-                if ':' in objdef:
-                    objdef, option = [part.strip() for part in objdef.rsplit(':', 1)]
-                if ';' in objdef:
-                    objdef, aliases = [part.strip() for part in objdef.split(';', 1)]
-                    aliases = [alias.strip() for alias in aliases.split(';') if alias.strip()]
-                if '/' in objdef:
-                    objdef, attrs = [part.strip() for part in objdef.split('/', 1)]
-                    attrs = [part.strip().lower() for part in attrs.split('/') if part.strip()]
+                if ":" in objdef:
+                    objdef, option = [part.strip() for part in objdef.rsplit(":", 1)]
+                if ";" in objdef:
+                    objdef, aliases = [part.strip() for part in objdef.split(";", 1)]
+                    aliases = [alias.strip() for alias in aliases.split(";") if alias.strip()]
+                if "/" in objdef:
+                    objdef, attrs = [part.strip() for part in objdef.split("/", 1)]
+                    attrs = [part.strip().lower() for part in attrs.split("/") if part.strip()]
                 # store data
-                obj_defs[iside].append({"name": objdef, 'option': option, 'aliases': aliases})
-                obj_attrs[iside].append({"name": objdef, 'attrs': attrs})
+                obj_defs[iside].append({"name": objdef, "option": option, "aliases": aliases})
+                obj_attrs[iside].append({"name": objdef, "attrs": attrs})
 
         # store for future access
         self.lhs_objs = obj_defs[0]
@@ -144,15 +171,22 @@ def func(self):
             # no =, so we just list aliases on object.
             aliases = obj.aliases.all(return_key_and_category=True)
             if aliases:
-                caller.msg("Aliases for %s: %s" % (
-                    obj.get_display_name(caller),
-                    ", ".join("'%s'%s" % (alias, "" if category is None else "[category:'%s']" % category)
-                              for (alias, category) in aliases)))
+                caller.msg(
+                    "Aliases for %s: %s"
+                    % (
+                        obj.get_display_name(caller),
+                        ", ".join(
+                            "'%s'%s"
+                            % (alias, "" if category is None else "[category:'%s']" % category)
+                            for (alias, category) in aliases
+                        ),
+                    )
+                )
             else:
                 caller.msg("No aliases exist for '%s'." % obj.get_display_name(caller))
             return
 
-        if not (obj.access(caller, "control") or obj.access(caller, 'edit')):
+        if not (obj.access(caller, "control") or obj.access(caller, "edit")):
             caller.msg("You don't have permission to do that.")
             return
 
@@ -160,7 +194,10 @@ def func(self):
             # we have given an empty =, so delete aliases
             old_aliases = obj.aliases.all()
             if old_aliases:
-                caller.msg("Cleared aliases from %s: %s" % (obj.get_display_name(caller), ", ".join(old_aliases)))
+                caller.msg(
+                    "Cleared aliases from %s: %s"
+                    % (obj.get_display_name(caller), ", ".join(old_aliases))
+                )
                 obj.aliases.clear()
             else:
                 caller.msg("No aliases to clear.")
@@ -169,17 +206,19 @@ def func(self):
         category = None
         if "category" in self.switches:
             if ":" in self.rhs:
-                rhs, category = self.rhs.rsplit(':', 1)
+                rhs, category = self.rhs.rsplit(":", 1)
                 category = category.strip()
             else:
-                caller.msg("If specifying the /category switch, the category must be given "
-                           "as :category at the end.")
+                caller.msg(
+                    "If specifying the /category switch, the category must be given "
+                    "as :category at the end."
+                )
         else:
             rhs = self.rhs
 
         # merge the old and new aliases (if any)
         old_aliases = obj.aliases.get(category=category, return_list=True)
-        new_aliases = [alias.strip().lower() for alias in rhs.split(',') if alias.strip()]
+        new_aliases = [alias.strip().lower() for alias in rhs.split(",") if alias.strip()]
 
         # make the aliases only appear once
         old_aliases.extend(new_aliases)
@@ -194,8 +233,14 @@ def func(self):
         obj.at_cmdset_get(force_init=True)
 
         # report all aliases on the object
-        caller.msg("Alias(es) for '%s' set to '%s'%s." % (obj.get_display_name(caller),
-                   str(obj.aliases), " (category: '%s')" % category if category else ""))
+        caller.msg(
+            "Alias(es) for '%s' set to '%s'%s."
+            % (
+                obj.get_display_name(caller),
+                str(obj.aliases),
+                " (category: '%s')" % category if category else "",
+            )
+        )
 
 
 class CmdCopy(ObjManipCommand):
@@ -226,8 +271,10 @@ def func(self):
         caller = self.caller
         args = self.args
         if not args:
-            caller.msg("Usage: copy <obj> [=<new_name>[;alias;alias..]]"
-                       "[:<new_location>] [, <new_name2>...]")
+            caller.msg(
+                "Usage: copy <obj> [=<new_name>[;alias;alias..]]"
+                "[:<new_location>] [, <new_name2>...]"
+            )
             return
 
         if not self.rhs:
@@ -238,39 +285,46 @@ def func(self):
                 return
             to_obj_name = "%s_copy" % from_obj_name
             to_obj_aliases = ["%s_copy" % alias for alias in from_obj.aliases.all()]
-            copiedobj = ObjectDB.objects.copy_object(from_obj, new_key=to_obj_name,
-                                                     new_aliases=to_obj_aliases)
+            copiedobj = ObjectDB.objects.copy_object(
+                from_obj, new_key=to_obj_name, new_aliases=to_obj_aliases
+            )
             if copiedobj:
-                string = "Identical copy of %s, named '%s' was created." % (from_obj_name, to_obj_name)
+                string = "Identical copy of %s, named '%s' was created." % (
+                    from_obj_name,
+                    to_obj_name,
+                )
             else:
                 string = "There was an error copying %s."
         else:
             # we have specified =. This might mean many object targets
-            from_obj_name = self.lhs_objs[0]['name']
+            from_obj_name = self.lhs_objs[0]["name"]
             from_obj = caller.search(from_obj_name)
             if not from_obj:
                 return
             for objdef in self.rhs_objs:
                 # loop through all possible copy-to targets
-                to_obj_name = objdef['name']
-                to_obj_aliases = objdef['aliases']
-                to_obj_location = objdef['option']
+                to_obj_name = objdef["name"]
+                to_obj_aliases = objdef["aliases"]
+                to_obj_location = objdef["option"]
                 if to_obj_location:
-                    to_obj_location = caller.search(to_obj_location,
-                                                    global_search=True)
+                    to_obj_location = caller.search(to_obj_location, global_search=True)
                     if not to_obj_location:
                         return
 
-                copiedobj = ObjectDB.objects.copy_object(from_obj,
-                                                         new_key=to_obj_name,
-                                                         new_location=to_obj_location,
-                                                         new_aliases=to_obj_aliases)
+                copiedobj = ObjectDB.objects.copy_object(
+                    from_obj,
+                    new_key=to_obj_name,
+                    new_location=to_obj_location,
+                    new_aliases=to_obj_aliases,
+                )
                 if copiedobj:
-                    string = "Copied %s to '%s' (aliases: %s)." % (from_obj_name, to_obj_name,
-                                                                   to_obj_aliases)
+                    string = "Copied %s to '%s' (aliases: %s)." % (
+                        from_obj_name,
+                        to_obj_name,
+                        to_obj_aliases,
+                    )
                 else:
-                    string = "There was an error copying %s to '%s'." % (from_obj_name,
-                                                                         to_obj_name)
+                    string = "There was an error copying %s to '%s'." % (from_obj_name, to_obj_name)
         # we are done, echo to user
         caller.msg(string)
 
@@ -297,6 +351,7 @@ class CmdCpAttr(ObjManipCommand):
     Copy the attribute one object to one or more attributes on another object.
     If you don't supply a source object, yourself is used.
     """
+
     key = "cpattr"
     switch_options = ("move",)
     locks = "cmd:perm(cpattr) or perm(Builder)"
@@ -328,8 +383,7 @@ def check_has_attr(self, obj, attr):
         required and verify an object has an attribute.
         """
         if not obj.attributes.has(attr):
-            self.caller.msg(
-                "%s doesn't have an attribute %s." % (obj.name, attr))
+            self.caller.msg("%s doesn't have an attribute %s." % (obj.name, attr))
             return False
         return True
 
@@ -357,8 +411,8 @@ def func(self):
 
         lhs_objattr = self.lhs_objattr
         to_objs = self.rhs_objattr
-        from_obj_name = lhs_objattr[0]['name']
-        from_obj_attrs = lhs_objattr[0]['attrs']
+        from_obj_name = lhs_objattr[0]["name"]
+        from_obj_attrs = lhs_objattr[0]["attrs"]
 
         if not from_obj_attrs:
             # this means the from_obj_name is actually an attribute
@@ -389,8 +443,8 @@ def func(self):
         result = []
 
         for to_obj in to_objs:
-            to_obj_name = to_obj['name']
-            to_obj_attrs = to_obj['attrs']
+            to_obj_name = to_obj["name"]
+            to_obj_attrs = to_obj["attrs"]
             to_obj = caller.search(to_obj_name)
             if not to_obj:
                 result.append("\nCould not find object '%s'" % to_obj_name)
@@ -406,20 +460,17 @@ def func(self):
                     continue
                 value = self.get_attr(from_obj, from_attr)
                 to_obj.attributes.add(to_attr, value)
-                if (clear and not (from_obj == to_obj and
-                                   from_attr == to_attr)):
+                if clear and not (from_obj == to_obj and from_attr == to_attr):
                     from_obj.attributes.remove(from_attr)
-                    result.append("\nMoved %s.%s -> %s.%s. (value: %s)" % (from_obj.name,
-                                                                           from_attr,
-                                                                           to_obj_name,
-                                                                           to_attr,
-                                                                           repr(value)))
+                    result.append(
+                        "\nMoved %s.%s -> %s.%s. (value: %s)"
+                        % (from_obj.name, from_attr, to_obj_name, to_attr, repr(value))
+                    )
                 else:
-                    result.append("\nCopied %s.%s -> %s.%s. (value: %s)" % (from_obj.name,
-                                                                            from_attr,
-                                                                            to_obj_name,
-                                                                            to_attr,
-                                                                            repr(value)))
+                    result.append(
+                        "\nCopied %s.%s -> %s.%s. (value: %s)"
+                        % (from_obj.name, from_attr, to_obj_name, to_attr, repr(value))
+                    )
         caller.msg("".join(result))
 
 
@@ -439,6 +490,7 @@ class CmdMvAttr(ObjManipCommand):
     Move an attribute from one object to one or more attributes on another
     object. If you don't supply a source object, yourself is used.
     """
+
     key = "mvattr"
     switch_options = ("copy",)
     locks = "cmd:perm(mvattr) or perm(Builder)"
@@ -512,16 +564,22 @@ def func(self):
         # create the objects
         for objdef in self.lhs_objs:
             string = ""
-            name = objdef['name']
-            aliases = objdef['aliases']
-            typeclass = objdef['option']
+            name = objdef["name"]
+            aliases = objdef["aliases"]
+            typeclass = objdef["option"]
 
             # create object (if not a valid typeclass, the default
             # object typeclass will automatically be used)
             lockstring = self.new_obj_lockstring.format(id=caller.id)
-            obj = create.create_object(typeclass, name, caller,
-                                       home=caller, aliases=aliases,
-                                       locks=lockstring, report_to=caller)
+            obj = create.create_object(
+                typeclass,
+                name,
+                caller,
+                home=caller,
+                aliases=aliases,
+                locks=lockstring,
+                report_to=caller,
+            )
             if not obj:
                 continue
             if aliases:
@@ -533,7 +591,7 @@ def func(self):
             # set a default desc
             if not obj.db.desc:
                 obj.db.desc = "You see nothing special."
-            if 'drop' in self.switches:
+            if "drop" in self.switches:
                 if caller.location:
                     obj.home = caller.location
                     obj.move_to(caller.location, quiet=True)
@@ -573,6 +631,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
     Sets the "desc" attribute on an object. If an object is not given,
     describe the current room.
     """
+
     key = "desc"
     aliases = "describe"
     switch_options = ("edit",)
@@ -581,8 +640,7 @@ class CmdDesc(COMMAND_DEFAULT_CLASS):
 
     def edit_handler(self):
         if self.rhs:
-            self.msg("|rYou may specify a value, or use the edit switch, "
-                     "but not both.|n")
+            self.msg("|rYou may specify a value, or use the edit switch, " "but not both.|n")
             return
         if self.args:
             obj = self.caller.search(self.args)
@@ -591,39 +649,45 @@ def edit_handler(self):
         if not obj:
             return
 
-        if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+        if not (obj.access(self.caller, "control") or obj.access(self.caller, "edit")):
             self.caller.msg("You don't have permission to edit the description of %s." % obj.key)
 
         self.caller.db.evmenu_target = obj
         # launch the editor
-        EvEditor(self.caller, loadfunc=_desc_load, savefunc=_desc_save,
-                 quitfunc=_desc_quit, key="desc", persistent=True)
+        EvEditor(
+            self.caller,
+            loadfunc=_desc_load,
+            savefunc=_desc_save,
+            quitfunc=_desc_quit,
+            key="desc",
+            persistent=True,
+        )
         return
 
     def func(self):
         """Define command"""
 
         caller = self.caller
-        if not self.args and 'edit' not in self.switches:
+        if not self.args and "edit" not in self.switches:
             caller.msg("Usage: desc [<obj> =] <description>")
             return
 
-        if 'edit' in self.switches:
+        if "edit" in self.switches:
             self.edit_handler()
             return
 
-        if '=' in self.args:
+        if "=" in self.args:
             # We have an =
             obj = caller.search(self.lhs)
             if not obj:
                 return
-            desc = self.rhs or ''
+            desc = self.rhs or ""
         else:
             obj = caller.location or self.msg("|rYou can't describe oblivion.|n")
             if not obj:
                 return
             desc = self.args
-        if (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+        if obj.access(self.caller, "control") or obj.access(self.caller, "edit"):
             obj.db.desc = desc
             caller.msg("The description was set on %s." % obj.get_display_name(caller))
         else:
@@ -659,7 +723,7 @@ class CmdDestroy(COMMAND_DEFAULT_CLASS):
     help_category = "Building"
 
     confirm = True  # set to False to always bypass confirmation
-    default_confirm = 'yes'  # what to assume if just pressing enter (yes/no)
+    default_confirm = "yes"  # what to assume if just pressing enter (yes/no)
 
     def func(self):
         """Implements the command."""
@@ -678,22 +742,33 @@ def delobj(obj):
                 string = "\nObject %s was already deleted." % obj.db_key
             else:
                 objname = obj.name
-                if not (obj.access(caller, "control") or obj.access(caller, 'delete')):
+                if not (obj.access(caller, "control") or obj.access(caller, "delete")):
                     return "\nYou don't have permission to delete %s." % objname
-                if obj.account and 'override' not in self.switches:
-                    return "\nObject %s is controlled by an active account. Use /override to delete anyway." % objname
+                if obj.account and "override" not in self.switches:
+                    return (
+                        "\nObject %s is controlled by an active account. Use /override to delete anyway."
+                        % objname
+                    )
                 if obj.dbid == int(settings.DEFAULT_HOME.lstrip("#")):
-                    return "\nYou are trying to delete |c%s|n, which is set as DEFAULT_HOME. " \
-                        "Re-point settings.DEFAULT_HOME to another " \
+                    return (
+                        "\nYou are trying to delete |c%s|n, which is set as DEFAULT_HOME. "
+                        "Re-point settings.DEFAULT_HOME to another "
                         "object before continuing." % objname
+                    )
 
                 had_exits = hasattr(obj, "exits") and obj.exits
-                had_objs = hasattr(obj, "contents") and any(obj for obj in obj.contents
-                                                            if not (hasattr(obj, "exits") and obj not in obj.exits))
+                had_objs = hasattr(obj, "contents") and any(
+                    obj
+                    for obj in obj.contents
+                    if not (hasattr(obj, "exits") and obj not in obj.exits)
+                )
                 # do the deletion
                 okay = obj.delete()
                 if not okay:
-                    string += "\nERROR: %s not deleted, probably because delete() returned False." % objname
+                    string += (
+                        "\nERROR: %s not deleted, probably because delete() returned False."
+                        % objname
+                    )
                 else:
                     string += "\n%s was destroyed." % objname
                     if had_exits:
@@ -707,10 +782,9 @@ def delobj(obj):
             if not delete:
                 continue
 
-            if '-' in objname:
+            if "-" in objname:
                 # might be a range of dbrefs
-                dmin, dmax = [utils.dbref(part, reqhash=False)
-                              for part in objname.split('-', 1)]
+                dmin, dmax = [utils.dbref(part, reqhash=False) for part in objname.split("-", 1)]
                 if dmin and dmax:
                     for dbref in range(int(dmin), int(dmax + 1)):
                         obj = caller.search("#" + str(dbref))
@@ -723,7 +797,9 @@ def delobj(obj):
                 obj = caller.search(objname)
 
             if obj is None:
-                self.caller.msg(" (Objects to destroy must either be local or specified with a unique #dbref.)")
+                self.caller.msg(
+                    " (Objects to destroy must either be local or specified with a unique #dbref.)"
+                )
             elif obj not in objs:
                 objs.append(obj)
 
@@ -735,13 +811,18 @@ def delobj(obj):
                 confirm += ", ".join([obj.get_display_name(caller) for obj in objs])
             else:
                 confirm += ", ".join(["#{}".format(obj.id) for obj in objs])
-            confirm += " [yes]/no?" if self.default_confirm == 'yes' else " yes/[no]"
+            confirm += " [yes]/no?" if self.default_confirm == "yes" else " yes/[no]"
             answer = ""
-            answer = yield(confirm)
-            answer = self.default_confirm if answer == '' else answer
+            answer = yield (confirm)
+            answer = self.default_confirm if answer == "" else answer
 
-            if answer.strip().lower() in ("n", "no"):
-                caller.msg("Canceled: no object was destroyed.")
+            if answer and answer not in ("yes", "y", "no", "n"):
+                caller.msg(
+                    "Canceled: Either accept the default by pressing return or specify yes/no."
+                )
+                delete = False
+            elif answer.strip().lower() in ("n", "no"):
+                caller.msg("Canceled: No object was destroyed.")
                 delete = False
 
         if delete:
@@ -776,6 +857,7 @@ class CmdDig(ObjManipCommand):
     like to the name of the room and the exits in question; an example
     would be 'north;no;n'.
     """
+
     key = "dig"
     switch_options = ("teleport",)
     locks = "cmd:perm(dig) or perm(Builder)"
@@ -783,9 +865,11 @@ class CmdDig(ObjManipCommand):
 
     # lockstring of newly created rooms, for easy overloading.
     # Will be formatted with the {id} of the creating object.
-    new_room_lockstring = "control:id({id}) or perm(Admin); " \
-                          "delete:id({id}) or perm(Admin); " \
-                          "edit:id({id}) or perm(Admin)"
+    new_room_lockstring = (
+        "control:id({id}) or perm(Admin); "
+        "delete:id({id}) or perm(Admin); "
+        "edit:id({id}) or perm(Admin)"
+    )
 
     def func(self):
         """Do the digging. Inherits variables from ObjManipCommand.parse()"""
@@ -793,8 +877,7 @@ def func(self):
         caller = self.caller
 
         if not self.lhs:
-            string = "Usage: dig[/teleport] <roomname>[;alias;alias...]" \
-                     "[:parent] [= <exit_there>"
+            string = "Usage: dig[/teleport] <roomname>[;alias;alias...]" "[:parent] [= <exit_there>"
             string += "[;alias;alias..][:parent]] "
             string += "[, <exit_back_here>[;alias;alias..][:parent]]"
             caller.msg(string)
@@ -808,21 +891,25 @@ def func(self):
         location = caller.location
 
         # Create the new room
-        typeclass = room['option']
+        typeclass = room["option"]
         if not typeclass:
             typeclass = settings.BASE_ROOM_TYPECLASS
 
         # create room
-        new_room = create.create_object(typeclass, room["name"],
-                                        aliases=room["aliases"],
-                                        report_to=caller)
+        new_room = create.create_object(
+            typeclass, room["name"], aliases=room["aliases"], report_to=caller
+        )
         lockstring = self.new_room_lockstring.format(id=caller.id)
         new_room.locks.add(lockstring)
         alias_string = ""
         if new_room.aliases.all():
             alias_string = " (%s)" % ", ".join(new_room.aliases.all())
         room_string = "Created room %s(%s)%s of type %s." % (
-                new_room, new_room.dbref, alias_string, typeclass)
+            new_room,
+            new_room.dbref,
+            alias_string,
+            typeclass,
+        )
 
         # create exit to room
 
@@ -841,21 +928,26 @@ def func(self):
                 if not typeclass:
                     typeclass = settings.BASE_EXIT_TYPECLASS
 
-                new_to_exit = create.create_object(typeclass, to_exit["name"],
-                                                   location,
-                                                   aliases=to_exit["aliases"],
-                                                   locks=lockstring,
-                                                   destination=new_room,
-                                                   report_to=caller)
+                new_to_exit = create.create_object(
+                    typeclass,
+                    to_exit["name"],
+                    location,
+                    aliases=to_exit["aliases"],
+                    locks=lockstring,
+                    destination=new_room,
+                    report_to=caller,
+                )
                 alias_string = ""
                 if new_to_exit.aliases.all():
                     alias_string = " (%s)" % ", ".join(new_to_exit.aliases.all())
                 exit_to_string = "\nCreated Exit from %s to %s: %s(%s)%s."
-                exit_to_string = exit_to_string % (location.name,
-                                                   new_room.name,
-                                                   new_to_exit,
-                                                   new_to_exit.dbref,
-                                                   alias_string)
+                exit_to_string = exit_to_string % (
+                    location.name,
+                    new_room.name,
+                    new_to_exit,
+                    new_to_exit.dbref,
+                    alias_string,
+                )
 
         # Create exit back from new room
 
@@ -870,24 +962,28 @@ def func(self):
                 typeclass = back_exit["option"]
                 if not typeclass:
                     typeclass = settings.BASE_EXIT_TYPECLASS
-                new_back_exit = create.create_object(typeclass,
-                                                     back_exit["name"],
-                                                     new_room,
-                                                     aliases=back_exit["aliases"],
-                                                     locks=lockstring,
-                                                     destination=location,
-                                                     report_to=caller)
+                new_back_exit = create.create_object(
+                    typeclass,
+                    back_exit["name"],
+                    new_room,
+                    aliases=back_exit["aliases"],
+                    locks=lockstring,
+                    destination=location,
+                    report_to=caller,
+                )
                 alias_string = ""
                 if new_back_exit.aliases.all():
                     alias_string = " (%s)" % ", ".join(new_back_exit.aliases.all())
                 exit_back_string = "\nCreated Exit back from %s to %s: %s(%s)%s."
-                exit_back_string = exit_back_string % (new_room.name,
-                                                       location.name,
-                                                       new_back_exit,
-                                                       new_back_exit.dbref,
-                                                       alias_string)
+                exit_back_string = exit_back_string % (
+                    new_room.name,
+                    location.name,
+                    new_back_exit,
+                    new_back_exit.dbref,
+                    alias_string,
+                )
         caller.msg("%s%s%s" % (room_string, exit_to_string, exit_back_string))
-        if new_room and 'teleport' in self.switches:
+        if new_room and "teleport" in self.switches:
             caller.move_to(new_room)
 
 
@@ -925,25 +1021,29 @@ class CmdTunnel(COMMAND_DEFAULT_CLASS):
     help_category = "Building"
 
     # store the direction, full name and its opposite
-    directions = {"n": ("north", "s"),
-                  "ne": ("northeast", "sw"),
-                  "e": ("east", "w"),
-                  "se": ("southeast", "nw"),
-                  "s": ("south", "n"),
-                  "sw": ("southwest", "ne"),
-                  "w": ("west", "e"),
-                  "nw": ("northwest", "se"),
-                  "u": ("up", "d"),
-                  "d": ("down", "u"),
-                  "i": ("in", "o"),
-                  "o": ("out", "i")}
+    directions = {
+        "n": ("north", "s"),
+        "ne": ("northeast", "sw"),
+        "e": ("east", "w"),
+        "se": ("southeast", "nw"),
+        "s": ("south", "n"),
+        "sw": ("southwest", "ne"),
+        "w": ("west", "e"),
+        "nw": ("northwest", "se"),
+        "u": ("up", "d"),
+        "d": ("down", "u"),
+        "i": ("in", "o"),
+        "o": ("out", "i"),
+    }
 
     def func(self):
         """Implements the tunnel command"""
 
         if not self.args or not self.lhs:
-            string = "Usage: tunnel[/switch] <direction>[:typeclass] [= <roomname>" \
-                     "[;alias;alias;...][:typeclass]]"
+            string = (
+                "Usage: tunnel[/switch] <direction>[:typeclass] [= <roomname>"
+                "[;alias;alias;...][:typeclass]]"
+            )
             self.caller.msg(string)
             return
 
@@ -952,7 +1052,8 @@ def func(self):
 
         if exitshort not in self.directions:
             string = "tunnel can only understand the following directions: %s." % ",".join(
-                    sorted(self.directions.keys()))
+                sorted(self.directions.keys())
+            )
             string += "\n(use dig for more freedom)"
             self.caller.msg(string)
             return
@@ -982,8 +1083,7 @@ def func(self):
             backstring = ", %s;%s" % (backname, backshort)
 
         # build the string we will use to call dig
-        digstring = "dig%s %s = %s;%s%s" % (telswitch, roomname,
-                                             exitname, exitshort, backstring)
+        digstring = "dig%s %s = %s;%s%s" % (telswitch, roomname, exitname, exitshort, backstring)
         self.execute_cmd(digstring)
 
 
@@ -1025,7 +1125,7 @@ def func(self):
         # try to search locally first
         results = caller.search(object_name, quiet=True)
         if len(results) > 1:  # local results was a multimatch. Inform them to be more specific
-            _AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+            _AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
             return _AT_SEARCH_RESULT(results, caller, query=object_name)
         elif len(results) == 1:  # A unique local match
             obj = results[0]
@@ -1044,14 +1144,16 @@ def func(self):
                 self.caller.msg("Cannot link an object to itself.")
                 return
 
-
             string = ""
             note = "Note: %s(%s) did not have a destination set before. Make sure you linked the right thing."
             if not obj.destination:
                 string = note % (obj.name, obj.dbref)
             if "twoway" in self.switches:
                 if not (target.location and obj.location):
-                    string = "To create a two-way link, %s and %s must both have a location" % (obj, target)
+                    string = "To create a two-way link, %s and %s must both have a location" % (
+                        obj,
+                        target,
+                    )
                     string += " (i.e. they cannot be rooms, but should be exits)."
                     self.caller.msg(string)
                     return
@@ -1060,7 +1162,11 @@ def func(self):
                 obj.destination = target.location
                 target.destination = obj.location
                 string += "\nLink created %s (in %s) <-> %s (in %s) (two-way)." % (
-                        obj.name, obj.location, target.name, target.location)
+                    obj.name,
+                    obj.location,
+                    target.name,
+                    target.location,
+                )
             else:
                 obj.destination = target
                 string += "\nLink created %s -> %s (one way)." % (obj.name, target)
@@ -1097,6 +1203,7 @@ class CmdUnLink(CmdLink):
     Unlinks an object, for example an exit, disconnecting
     it from whatever it was connected to.
     """
+
     # this is just a child of CmdLink
 
     key = "unlink"
@@ -1158,8 +1265,7 @@ def func(self):
             if not home:
                 string = "This object has no home location set!"
             else:
-                string = "%s's current home is %s(%s)." % (obj, home,
-                                                           home.dbref)
+                string = "%s's current home is %s(%s)." % (obj, home, home.dbref)
         else:
             # set a home location
             new_home = self.caller.search(self.rhs, global_search=True)
@@ -1169,7 +1275,12 @@ def func(self):
             obj.home = new_home
             if old_home:
                 string = "Home location of %s was changed from %s(%s) to %s(%s)." % (
-                        obj, old_home, old_home.dbref, new_home, new_home.dbref)
+                    obj,
+                    old_home,
+                    old_home.dbref,
+                    new_home,
+                    new_home.dbref,
+                )
             else:
                 string = "Home location of %s was set to %s(%s)." % (obj, new_home, new_home.dbref)
         self.caller.msg(string)
@@ -1185,6 +1296,7 @@ class CmdListCmdSets(COMMAND_DEFAULT_CLASS):
     This displays all cmdsets assigned
     to a user. Defaults to yourself.
     """
+
     key = "cmdsets"
     aliases = "listcmsets"
     locks = "cmd:perm(listcmdsets) or perm(Builder)"
@@ -1231,12 +1343,12 @@ def func(self):
 
         obj = None
         if self.lhs_objs:
-            objname = self.lhs_objs[0]['name']
+            objname = self.lhs_objs[0]["name"]
             if objname.startswith("*"):
                 # account mode
                 obj = caller.account.search(objname.lstrip("*"))
                 if obj:
-                    if self.rhs_objs[0]['aliases']:
+                    if self.rhs_objs[0]["aliases"]:
                         caller.msg("Accounts can't have aliases.")
                         return
                     newname = self.rhs
@@ -1255,8 +1367,8 @@ def func(self):
             if not obj:
                 return
         if self.rhs_objs:
-            newname = self.rhs_objs[0]['name']
-            aliases = self.rhs_objs[0]['aliases']
+            newname = self.rhs_objs[0]["name"]
+            aliases = self.rhs_objs[0]["aliases"]
         else:
             newname = self.rhs
             aliases = None
@@ -1293,13 +1405,13 @@ class CmdOpen(ObjManipCommand):
     unique.
 
     """
+
     key = "open"
     locks = "cmd:perm(open) or perm(Builder)"
     help_category = "Building"
 
     # a custom member method to chug out exits and do checks
-    def create_exit(self, exit_name, location, destination,
-                    exit_aliases=None, typeclass=None):
+    def create_exit(self, exit_name, location, destination, exit_aliases=None, typeclass=None):
         """
         Helper function to avoid code duplication.
         At this point we know destination is a valid location
@@ -1320,7 +1432,9 @@ def create_exit(self, exit_name, location, destination,
             if not exit_obj.destination:
                 # we are trying to link a non-exit
                 string = "'%s' already exists and is not an exit!\nIf you want to convert it "
-                string += "to an exit, you must assign an object to the 'destination' property first."
+                string += (
+                    "to an exit, you must assign an object to the 'destination' property first."
+                )
                 caller.msg(string % exit_name)
                 return None
             # we are re-linking an old exit.
@@ -1333,7 +1447,9 @@ def create_exit(self, exit_name, location, destination,
                     if exit_aliases:
                         [exit_obj.aliases.add(alias) for alias in exit_aliases]
                     string += " Rerouted its old destination '%s' to '%s' and changed aliases." % (
-                            old_destination.name, destination.name)
+                        old_destination.name,
+                        destination.name,
+                    )
                 else:
                     string += " It already points to the correct place."
 
@@ -1341,18 +1457,23 @@ def create_exit(self, exit_name, location, destination,
             # exit does not exist before. Create a new one.
             if not typeclass:
                 typeclass = settings.BASE_EXIT_TYPECLASS
-            exit_obj = create.create_object(typeclass,
-                                            key=exit_name,
-                                            location=location,
-                                            aliases=exit_aliases,
-                                            report_to=caller)
+            exit_obj = create.create_object(
+                typeclass, key=exit_name, location=location, aliases=exit_aliases, report_to=caller
+            )
             if exit_obj:
                 # storing a destination is what makes it an exit!
                 exit_obj.destination = destination
-                string = "" if not exit_aliases else " (aliases: %s)" % (
-                    ", ".join([str(e) for e in exit_aliases]))
+                string = (
+                    ""
+                    if not exit_aliases
+                    else " (aliases: %s)" % (", ".join([str(e) for e in exit_aliases]))
+                )
                 string = "Created new Exit '%s' from %s to %s%s." % (
-                    exit_name, location.name, destination.name, string)
+                    exit_name,
+                    location.name,
+                    destination.name,
+                    string,
+                )
             else:
                 string = "Error: Exit '%s' not created." % exit_name
         # emit results
@@ -1381,9 +1502,9 @@ def func(self):
 
         # obtain needed info from cmdline
 
-        exit_name = self.lhs_objs[0]['name']
-        exit_aliases = self.lhs_objs[0]['aliases']
-        exit_typeclass = self.lhs_objs[0]['option']
+        exit_name = self.lhs_objs[0]["name"]
+        exit_aliases = self.lhs_objs[0]["aliases"]
+        exit_typeclass = self.lhs_objs[0]["option"]
         dest_name = self.rhs
 
         # first, check so the destination exists.
@@ -1392,24 +1513,18 @@ def func(self):
             return
 
         # Create exit
-        ok = self.create_exit(exit_name,
-                              location,
-                              destination,
-                              exit_aliases,
-                              exit_typeclass)
+        ok = self.create_exit(exit_name, location, destination, exit_aliases, exit_typeclass)
         if not ok:
             # an error; the exit was not created, so we quit.
             return
         # Create back exit, if any
         if len(self.lhs_objs) > 1:
-            back_exit_name = self.lhs_objs[1]['name']
-            back_exit_aliases = self.lhs_objs[1]['aliases']
-            back_exit_typeclass = self.lhs_objs[1]['option']
-            self.create_exit(back_exit_name,
-                             destination,
-                             location,
-                             back_exit_aliases,
-                             back_exit_typeclass)
+            back_exit_name = self.lhs_objs[1]["name"]
+            back_exit_aliases = self.lhs_objs[1]["aliases"]
+            back_exit_typeclass = self.lhs_objs[1]["option"]
+            self.create_exit(
+                back_exit_name, destination, location, back_exit_aliases, back_exit_typeclass
+            )
 
 
 def _convert_from_string(cmd, strobj):
@@ -1442,8 +1557,10 @@ def _convert_from_string(cmd, strobj):
     except (SyntaxError, ValueError):
         # treat as string
         strobj = utils.to_str(strobj)
-        string = "|RNote: name \"|r%s|R\" was converted to a string. " \
-                 "Make sure this is acceptable." % strobj
+        string = (
+            '|RNote: name "|r%s|R" was converted to a string. '
+            "Make sure this is acceptable." % strobj
+        )
         cmd.caller.msg(string)
         return strobj
     except Exception as err:
@@ -1459,7 +1576,7 @@ class CmdSetAttribute(ObjManipCommand):
       set <obj>/<attr> = <value>
       set <obj>/<attr> =
       set <obj>/<attr>
-      set *<account>/attr = <value>
+      set *<account>/<attr> = <value>
 
     Switch:
         edit: Open the line editor (string values only)
@@ -1471,10 +1588,10 @@ class CmdSetAttribute(ObjManipCommand):
         char: Setting an attribute on a character (global search)
         character: Alias for char, as above.
 
-    Sets attributes on objects. The second form clears
-    a previously set attribute while the last form
-    inspects the current value of the attribute
-    (if any).
+    Sets attributes on objects. The second example form above clears a
+    previously set attribute while the third form inspects the current value of
+    the attribute (if any). The last one (with the star) is a shortcut for
+    operating on a player Account rather than an Object.
 
     The most common data to save with this command are strings and
     numbers. You can however also set Python primitives such as lists,
@@ -1482,8 +1599,10 @@ class CmdSetAttribute(ObjManipCommand):
     the functionality of certain custom objects).  This is indicated
     by you starting your value with one of |c'|n, |c"|n, |c(|n, |c[|n
     or |c{ |n.
-    Note that you should leave a space after starting a dictionary ('{ ')
-    so as to not confuse the dictionary start with a colour code like \{g.
+
+    Once you have stored a Python primitive as noted above, you can include
+    |c[<key>]|n in <attr> to reference nested values in e.g. a list or dict.
+
     Remember that if you use Python primitives like this, you must
     write proper Python syntax too - notably you must include quotes
     around your strings or you will get an error.
@@ -1493,6 +1612,8 @@ class CmdSetAttribute(ObjManipCommand):
     key = "set"
     locks = "cmd:perm(set) or perm(Builder)"
     help_category = "Building"
+    nested_re = re.compile(r"\[.*?\]")
+    not_found = object()
 
     def check_obj(self, obj):
         """
@@ -1517,49 +1638,162 @@ def check_attr(self, obj, attr_name):
         """
         return attr_name
 
+    def split_nested_attr(self, attr):
+        """
+        Yields tuples of (possible attr name, nested keys on that attr).
+        For performance, this is biased to the deepest match, but allows compatability
+        with older attrs that might have been named with `[]`'s.
+
+        > list(split_nested_attr("nested['asdf'][0]"))
+        [
+            ('nested', ['asdf', 0]),
+            ("nested['asdf']", [0]),
+            ("nested['asdf'][0]", []),
+        ]
+        """
+        quotes = "\"'"
+
+        def clean_key(val):
+            val = val.strip("[]")
+            if val[0] in quotes:
+                return val.strip(quotes)
+            if val[0] == LIST_APPEND_CHAR:
+                # List insert/append syntax
+                return val
+            try:
+                return int(val)
+            except ValueError:
+                return val
+
+        parts = self.nested_re.findall(attr)
+
+        base_attr = ""
+        if parts:
+            base_attr = attr[: attr.find(parts[0])]
+        for index, part in enumerate(parts):
+            yield (base_attr, [clean_key(p) for p in parts[index:]])
+            base_attr += part
+        yield (attr, [])
+
+    def do_nested_lookup(self, value, *keys):
+        result = value
+        for key in keys:
+            try:
+                result = result.__getitem__(key)
+            except (IndexError, KeyError, TypeError):
+                return self.not_found
+        return result
+
     def view_attr(self, obj, attr):
         """
         Look up the value of an attribute and return a string displaying it.
         """
-        if obj.attributes.has(attr):
-            return "\nAttribute %s/%s = %s" % (obj.name, attr,
-                                               obj.attributes.get(attr))
-        else:
-            return "\n%s has no attribute '%s'." % (obj.name, attr)
+        nested = False
+        for key, nested_keys in self.split_nested_attr(attr):
+            nested = True
+            if obj.attributes.has(key):
+                val = obj.attributes.get(key)
+                val = self.do_nested_lookup(val, *nested_keys)
+                if val is not self.not_found:
+                    return "\nAttribute %s/%s = %s" % (obj.name, attr, val)
+        error = "\n%s has no attribute '%s'." % (obj.name, attr)
+        if nested:
+            error += " (Nested lookups attempted)"
+        return error
 
     def rm_attr(self, obj, attr):
         """
-        Remove an attribute from the object, and report back.
+        Remove an attribute from the object, or a nested data structure, and report back.
         """
-        if obj.attributes.has(attr):
-            val = obj.attributes.has(attr)
-            obj.attributes.remove(attr)
-            return "\nDeleted attribute '%s' (= %s) from %s." % (attr, val, obj.name)
-        else:
-            return "\n%s has no attribute '%s'." % (obj.name, attr)
+        nested = False
+        for key, nested_keys in self.split_nested_attr(attr):
+            nested = True
+            if obj.attributes.has(key):
+                if nested_keys:
+                    del_key = nested_keys[-1]
+                    val = obj.attributes.get(key)
+                    deep = self.do_nested_lookup(val, *nested_keys[:-1])
+                    if deep is not self.not_found:
+                        try:
+                            del deep[del_key]
+                        except (IndexError, KeyError, TypeError):
+                            continue
+                    return "\nDeleted attribute '%s' (= nested) from %s." % (attr, obj.name)
+                else:
+                    exists = obj.attributes.has(key)
+                    obj.attributes.remove(attr)
+                    return "\nDeleted attribute '%s' (= %s) from %s." % (attr, exists, obj.name)
+        error = "\n%s has no attribute '%s'." % (obj.name, attr)
+        if nested:
+            error += " (Nested lookups attempted)"
+        return error
 
     def set_attr(self, obj, attr, value):
+        done = False
+        for key, nested_keys in self.split_nested_attr(attr):
+            if obj.attributes.has(key) and nested_keys:
+                acc_key = nested_keys[-1]
+                lookup_value = obj.attributes.get(key)
+                deep = self.do_nested_lookup(lookup_value, *nested_keys[:-1])
+                if deep is not self.not_found:
+                    # To support appending and inserting to lists
+                    # a key that starts with LIST_APPEND_CHAR will insert a new item at that
+                    # location, and move the other elements down.
+                    # Using LIST_APPEND_CHAR alone will append to the list
+                    if isinstance(acc_key, str) and acc_key[0] == LIST_APPEND_CHAR:
+                        try:
+                            if len(acc_key) > 1:
+                                where = int(acc_key[1:])
+                                deep.insert(where, value)
+                            else:
+                                deep.append(value)
+                        except (ValueError, AttributeError):
+                            pass
+                        else:
+                            value = lookup_value
+                            attr = key
+                            done = True
+                            break
+
+                    # List magic failed, just use like a key/index
+                    try:
+                        deep[acc_key] = value
+                    except TypeError as err:
+                        # Tuples can't be modified
+                        return "\n%s - %s" % (err, deep)
+
+                    value = lookup_value
+                    attr = key
+                    done = True
+                    break
+
+        verb = "Modified" if obj.attributes.has(attr) else "Created"
         try:
-            verb = "Modified" if obj.attributes.has(attr) else "Created"
-            obj.attributes.add(attr, value)
+            if not done:
+                obj.attributes.add(attr, value)
             return "\n%s attribute %s/%s = %s" % (verb, obj.name, attr, repr(value))
         except SyntaxError:
             # this means literal_eval tried to parse a faulty string
-            return ("\n|RCritical Python syntax error in your value. Only "
-                    "primitive Python structures are allowed.\nYou also "
-                    "need to use correct Python syntax. Remember especially "
-                    "to put quotes around all strings inside lists and "
-                    "dicts.|n")
+            return (
+                "\n|RCritical Python syntax error in your value. Only "
+                "primitive Python structures are allowed.\nYou also "
+                "need to use correct Python syntax. Remember especially "
+                "to put quotes around all strings inside lists and "
+                "dicts.|n"
+            )
 
     def edit_handler(self, obj, attr):
         """Activate the line editor"""
+
         def load(caller):
             """Called for the editor to load the buffer"""
             old_value = obj.attributes.get(attr)
             if old_value is not None and not isinstance(old_value, str):
                 typ = type(old_value).__name__
-                self.caller.msg("|RWARNING! Saving this buffer will overwrite the "
-                                "current attribute (of type %s) with a string!|n" % typ)
+                self.caller.msg(
+                    "|RWARNING! Saving this buffer will overwrite the "
+                    "current attribute (of type %s) with a string!|n" % typ
+                )
                 return str(old_value)
             return old_value
 
@@ -1567,6 +1801,7 @@ def save(caller, buf):
             """Called when editor saves its buffer."""
             obj.attributes.add(attr, buf)
             caller.msg("Saved Attribute %s." % attr)
+
         # start the editor
         EvEditor(self.caller, load, save, key="%s/%s" % (obj, attr))
 
@@ -1580,10 +1815,11 @@ def search_for_obj(self, objname):
             A typeclassed object, or None if nothing is found.
         """
         from evennia.utils.utils import variable_from_module
-        _AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+
+        _AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
         caller = self.caller
-        if objname.startswith('*') or "account" in self.switches:
-            found_obj = caller.search_account(objname.lstrip('*'))
+        if objname.startswith("*") or "account" in self.switches:
+            found_obj = caller.search_account(objname.lstrip("*"))
         elif "script" in self.switches:
             found_obj = _AT_SEARCH_RESULT(search.search_script(objname), caller)
         elif "channel" in self.switches:
@@ -1612,8 +1848,8 @@ def func(self):
 
         # get values prepared by the parser
         value = self.rhs
-        objname = self.lhs_objattr[0]['name']
-        attrs = self.lhs_objattr[0]['attrs']
+        objname = self.lhs_objattr[0]["name"]
+        attrs = self.lhs_objattr[0]["attrs"]
 
         obj = self.search_for_obj(objname)
         if not obj:
@@ -1625,13 +1861,12 @@ def func(self):
         result = []
         if "edit" in self.switches:
             # edit in the line editor
-            if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+            if not (obj.access(self.caller, "control") or obj.access(self.caller, "edit")):
                 caller.msg("You don't have permission to edit %s." % obj.key)
                 return
 
             if len(attrs) > 1:
-                caller.msg("The Line editor can only be applied "
-                           "to one attribute at a time.")
+                caller.msg("The Line editor can only be applied " "to one attribute at a time.")
                 return
             self.edit_handler(obj, attrs[0])
             return
@@ -1649,7 +1884,7 @@ def func(self):
                 return
             else:
                 # deleting the attribute(s)
-                if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+                if not (obj.access(self.caller, "control") or obj.access(self.caller, "edit")):
                     caller.msg("You don't have permission to edit %s." % obj.key)
                     return
                 for attr in attrs:
@@ -1658,7 +1893,7 @@ def func(self):
                     result.append(self.rm_attr(obj, attr))
         else:
             # setting attribute(s). Make sure to convert to real Python type before saving.
-            if not (obj.access(self.caller, 'control') or obj.access(self.caller, 'edit')):
+            if not (obj.access(self.caller, "control") or obj.access(self.caller, "edit")):
                 caller.msg("You don't have permission to edit %s." % obj.key)
                 return
             for attr in attrs:
@@ -1667,7 +1902,7 @@ def func(self):
                 value = _convert_from_string(self, value)
                 result.append(self.set_attr(obj, attr, value))
         # send feedback
-        caller.msg("".join(result).strip('\n'))
+        caller.msg("".join(result).strip("\n"))
 
 
 class CmdTypeclass(COMMAND_DEFAULT_CLASS):
@@ -1727,22 +1962,27 @@ def func(self):
 
         caller = self.caller
 
-        if 'list' in self.switches:
+        if "list" in self.switches:
             tclasses = get_all_typeclasses()
-            contribs = [key for key in sorted(tclasses)
-                        if key.startswith("evennia.contrib")] or ["<None loaded>"]
-            core = [key for key in sorted(tclasses)
-                    if key.startswith("evennia") and key not in contribs] or ["<None loaded>"]
-            game = [key for key in sorted(tclasses)
-                    if not key.startswith("evennia")] or ["<None loaded>"]
-            string = ("|wCore typeclasses|n\n"
-                      "    {core}\n"
-                      "|wLoaded Contrib typeclasses|n\n"
-                      "    {contrib}\n"
-                      "|wGame-dir typeclasses|n\n"
-                      "    {game}").format(core="\n    ".join(core),
-                                           contrib="\n    ".join(contribs),
-                                           game="\n    ".join(game))
+            contribs = [key for key in sorted(tclasses) if key.startswith("evennia.contrib")] or [
+                "<None loaded>"
+            ]
+            core = [
+                key for key in sorted(tclasses) if key.startswith("evennia") and key not in contribs
+            ] or ["<None loaded>"]
+            game = [key for key in sorted(tclasses) if not key.startswith("evennia")] or [
+                "<None loaded>"
+            ]
+            string = (
+                "|wCore typeclasses|n\n"
+                "    {core}\n"
+                "|wLoaded Contrib typeclasses|n\n"
+                "    {contrib}\n"
+                "|wGame-dir typeclasses|n\n"
+                "    {game}"
+            ).format(
+                core="\n    ".join(core), contrib="\n    ".join(contribs), game="\n    ".join(game)
+            )
             EvMore(caller, string, exit_on_lastpage=True)
             return
 
@@ -1756,25 +1996,33 @@ def func(self):
             if not obj:
                 # no object found to examine, see if it's a typeclass-path instead
                 tclasses = get_all_typeclasses()
-                matches = [(key, tclass)
-                           for key, tclass in tclasses.items() if key.endswith(oquery)]
+                matches = [
+                    (key, tclass) for key, tclass in tclasses.items() if key.endswith(oquery)
+                ]
                 nmatches = len(matches)
                 if nmatches > 1:
-                    caller.msg("Multiple typeclasses found matching {}:\n  {}".format(
-                        oquery, "\n  ".join(tup[0] for tup in matches)))
+                    caller.msg(
+                        "Multiple typeclasses found matching {}:\n  {}".format(
+                            oquery, "\n  ".join(tup[0] for tup in matches)
+                        )
+                    )
                 elif not matches:
                     caller.msg("No object or typeclass path found to match '{}'".format(oquery))
                 else:
                     # one match found
-                    caller.msg("Docstring for typeclass '{}':\n{}".format(
-                        oquery, matches[0][1].__doc__))
+                    caller.msg(
+                        "Docstring for typeclass '{}':\n{}".format(oquery, matches[0][1].__doc__)
+                    )
             else:
                 # do the search again to get the error handling in case of multi-match
                 obj = caller.search(oquery)
                 if not obj:
                     return
-                caller.msg("{}'s current typeclass is '{}.{}'".format(
-                    obj.name, obj.__class__.__module__, obj.__class__.__name__))
+                caller.msg(
+                    "{}'s current typeclass is '{}.{}'".format(
+                        obj.name, obj.__class__.__module__, obj.__class__.__name__
+                    )
+                )
             return
 
         # get object to swap on
@@ -1801,17 +2049,20 @@ def func(self):
             self.switches.append("force")
             self.switches.append("update")
 
-        if not (obj.access(caller, "control") or obj.access(caller, 'edit')):
+        if not (obj.access(caller, "control") or obj.access(caller, "edit")):
             caller.msg("You are not allowed to do that.")
             return
 
-        if not hasattr(obj, 'swap_typeclass'):
+        if not hasattr(obj, "swap_typeclass"):
             caller.msg("This object cannot have a type at all!")
             return
 
         is_same = obj.is_typeclass(new_typeclass, exact=True)
-        if is_same and 'force' not in self.switches:
-            string = "%s already has the typeclass '%s'. Use /force to override." % (obj.name, new_typeclass)
+        if is_same and "force" not in self.switches:
+            string = "%s already has the typeclass '%s'. Use /force to override." % (
+                obj.name,
+                new_typeclass,
+            )
         else:
             update = "update" in self.switches
             reset = "reset" in self.switches
@@ -1819,15 +2070,18 @@ def func(self):
             old_typeclass_path = obj.typeclass_path
 
             # we let this raise exception if needed
-            obj.swap_typeclass(new_typeclass, clean_attributes=reset,
-                               clean_cmdsets=reset, run_start_hooks=hooks)
+            obj.swap_typeclass(
+                new_typeclass, clean_attributes=reset, clean_cmdsets=reset, run_start_hooks=hooks
+            )
 
             if is_same:
                 string = "%s updated its existing typeclass (%s).\n" % (obj.name, obj.path)
             else:
-                string = "%s changed typeclass from %s to %s.\n" % (obj.name,
-                                                                    old_typeclass_path,
-                                                                    obj.typeclass_path)
+                string = "%s changed typeclass from %s to %s.\n" % (
+                    obj.name,
+                    old_typeclass_path,
+                    obj.typeclass_path,
+                )
             if update:
                 string += "Only the at_object_creation hook was run (update mode)."
             else:
@@ -1854,6 +2108,7 @@ class CmdWipe(ObjManipCommand):
     Wipes all of an object's attributes, or optionally only those
     matching the given attribute-wildcard search string.
     """
+
     key = "wipe"
     locks = "cmd:perm(wipe) or perm(Builder)"
     help_category = "Building"
@@ -1870,13 +2125,13 @@ def func(self):
             return
 
         # get the attributes set by our custom parser
-        objname = self.lhs_objattr[0]['name']
-        attrs = self.lhs_objattr[0]['attrs']
+        objname = self.lhs_objattr[0]["name"]
+        attrs = self.lhs_objattr[0]["attrs"]
 
         obj = caller.search(objname)
         if not obj:
             return
-        if not (obj.access(caller, "control") or obj.access(caller, 'edit')):
+        if not (obj.access(caller, "control") or obj.access(caller, "edit")):
             caller.msg("You are not allowed to do that.")
             return
         if not attrs:
@@ -1922,6 +2177,7 @@ class CmdLock(ObjManipCommand):
     them by ';', i.e:
        'get:id(25); delete:perm(Builder)'
     """
+
     key = "lock"
     aliases = ["locks"]
     locks = "cmd: perm(locks) or perm(Builder)"
@@ -1932,23 +2188,24 @@ def func(self):
 
         caller = self.caller
         if not self.args:
-            string = "Usage: lock <object>[ = <lockstring>] or lock[/switch] " \
-                     "<object>/<access_type>"
+            string = (
+                "Usage: lock <object>[ = <lockstring>] or lock[/switch] " "<object>/<access_type>"
+            )
             caller.msg(string)
             return
 
-        if '/' in self.lhs:
+        if "/" in self.lhs:
             # call of the form lock obj/access_type
-            objname, access_type = [p.strip() for p in self.lhs.split('/', 1)]
+            objname, access_type = [p.strip() for p in self.lhs.split("/", 1)]
             obj = None
             if objname.startswith("*"):
-                obj = caller.search_account(objname.lstrip('*'))
+                obj = caller.search_account(objname.lstrip("*"))
             if not obj:
                 obj = caller.search(objname)
                 if not obj:
                     return
-            has_control_access = obj.access(caller, 'control')
-            if access_type == 'control' and not has_control_access:
+            has_control_access = obj.access(caller, "control")
+            if access_type == "control" and not has_control_access:
                 # only allow to change 'control' access if you have 'control' access already
                 caller.msg("You need 'control' access to change this type of lock.")
                 return
@@ -1960,7 +2217,7 @@ def func(self):
             lockdef = obj.locks.get(access_type)
 
             if lockdef:
-                if 'del' in self.switches:
+                if "del" in self.switches:
                     obj.locks.delete(access_type)
                     string = "deleted lock %s" % lockdef
                 else:
@@ -1974,20 +2231,22 @@ def func(self):
             # we have a = separator, so we are assigning a new lock
             if self.switches:
                 swi = ", ".join(self.switches)
-                caller.msg("Switch(es) |w%s|n can not be used with a "
-                           "lock assignment. Use e.g. "
-                           "|wlock/del objname/locktype|n instead." % swi)
+                caller.msg(
+                    "Switch(es) |w%s|n can not be used with a "
+                    "lock assignment. Use e.g. "
+                    "|wlock/del objname/locktype|n instead." % swi
+                )
                 return
 
             objname, lockdef = self.lhs, self.rhs
             obj = None
             if objname.startswith("*"):
-                obj = caller.search_account(objname.lstrip('*'))
+                obj = caller.search_account(objname.lstrip("*"))
             if not obj:
                 obj = caller.search(objname)
                 if not obj:
                     return
-            if not (obj.access(caller, 'control') or obj.access(caller, "edit")):
+            if not (obj.access(caller, "control") or obj.access(caller, "edit")):
                 caller.msg("You are not allowed to do that.")
                 return
             ok = False
@@ -1996,8 +2255,9 @@ def func(self):
                 ok = obj.locks.add(lockdef)
             except LockException as e:
                 caller.msg(str(e))
-            if "cmd" in lockdef.lower() and \
-                    inherits_from(obj, "evennia.objects.objects.DefaultExit"):
+            if "cmd" in lockdef.lower() and inherits_from(
+                obj, "evennia.objects.objects.DefaultExit"
+            ):
                 # special fix to update Exits since "cmd"-type locks won't
                 # update on them unless their cmdsets are rebuilt.
                 obj.at_init()
@@ -2013,7 +2273,7 @@ def func(self):
             obj = caller.search(self.lhs)
         if not obj:
             return
-        if not (obj.access(caller, 'control') or obj.access(caller, "edit")):
+        if not (obj.access(caller, "control") or obj.access(caller, "edit")):
             caller.msg("You are not allowed to do that.")
             return
         caller.msg("\n".join(obj.locks.all()))
@@ -2038,6 +2298,7 @@ class CmdExamine(ObjManipCommand):
     Append a * before the search string to examine an account.
 
     """
+
     key = "examine"
     aliases = ["ex", "exam"]
     locks = "cmd:perm(examine) or perm(Builder)"
@@ -2055,7 +2316,7 @@ def list_attribute(self, crop, attr, category, value):
                 value = utils.to_str(value)
             value = utils.crop(value)
         if category:
-            string = '\n %s[%s] = %s' % (attr, category, value)
+            string = "\n %s[%s] = %s" % (attr, category, value)
         else:
             string = "\n %s = %s" % (attr, value)
         string = raw(string)
@@ -2096,13 +2357,13 @@ def format_output(self, obj, avail_cmdset):
 
         returns a string.
         """
-
         string = "\n|wName/key|n: |c%s|n (%s)" % (obj.name, obj.dbref)
         if hasattr(obj, "aliases") and obj.aliases.all():
             string += "\n|wAliases|n: %s" % (", ".join(utils.make_iter(str(obj.aliases))))
         if hasattr(obj, "sessions") and obj.sessions.all():
-            string += "\n|wSession id(s)|n: %s" % (", ".join("#%i" % sess.sessid
-                                                             for sess in obj.sessions.all()))
+            string += "\n|wSession id(s)|n: %s" % (
+                ", ".join("#%i" % sess.sessid for sess in obj.sessions.all())
+            )
         if hasattr(obj, "email") and obj.email:
             string += "\n|wEmail|n: |c%s|n" % obj.email
         if hasattr(obj, "has_account") and obj.has_account:
@@ -2115,8 +2376,7 @@ def format_output(self, obj, avail_cmdset):
             string += "\n|wAccount Perms|n: %s" % (", ".join(perms))
             if obj.account.attributes.has("_quell"):
                 string += " |r(quelled)|n"
-        string += "\n|wTypeclass|n: %s (%s)" % (obj.typename,
-                                                obj.typeclass_path)
+        string += "\n|wTypeclass|n: %s (%s)" % (obj.typename, obj.typeclass_path)
         if hasattr(obj, "location"):
             string += "\n|wLocation|n: %s" % obj.location
             if obj.location:
@@ -2131,7 +2391,7 @@ def format_output(self, obj, avail_cmdset):
                 string += " (#%s)" % obj.destination.id
         perms = obj.permissions.all()
         if perms:
-            perms_string = (", ".join(perms))
+            perms_string = ", ".join(perms)
         else:
             perms_string = "<None>"
         if obj.is_superuser:
@@ -2141,7 +2401,7 @@ def format_output(self, obj, avail_cmdset):
 
         locks = str(obj.locks)
         if locks:
-            locks_string = utils.fill("; ".join([lock for lock in locks.split(';')]), indent=6)
+            locks_string = utils.fill("; ".join([lock for lock in locks.split(";")]), indent=6)
         else:
             locks_string = " Default"
         string += "\n|wLocks|n:%s" % locks_string
@@ -2149,9 +2409,14 @@ def format_output(self, obj, avail_cmdset):
         if not (len(obj.cmdset.all()) == 1 and obj.cmdset.current.key == "_EMPTY_CMDSET"):
             # all() returns a 'stack', so make a copy to sort.
             stored_cmdsets = sorted(obj.cmdset.all(), key=lambda x: x.priority, reverse=True)
-            string += "\n|wStored Cmdset(s)|n:\n %s" % ("\n ".join("%s [%s] (%s, prio %s)" % (
-                cmdset.path, cmdset.key, cmdset.mergetype, cmdset.priority) for cmdset in stored_cmdsets
-                                                                   if cmdset.key != "_EMPTY_CMDSET"))
+            string += "\n|wStored Cmdset(s)|n:\n %s" % (
+                "\n ".join(
+                    "%s [%s] (%s, prio %s)"
+                    % (cmdset.path, cmdset.key, cmdset.mergetype, cmdset.priority)
+                    for cmdset in stored_cmdsets
+                    if cmdset.key != "_EMPTY_CMDSET"
+                )
+            )
 
             # this gets all components of the currently merged set
             all_cmdsets = [(cmdset.key, cmdset) for cmdset in avail_cmdset.merged_from]
@@ -2164,26 +2429,42 @@ def format_output(self, obj, avail_cmdset):
                     # we only show the first session's cmdset here (it is -in principle- possible that
                     # different sessions have different cmdsets but for admins who want such madness
                     # it is better that they overload with their own CmdExamine to handle it).
-                    all_cmdsets.extend([(cmdset.key, cmdset) for cmdset in obj.account.sessions.all()[0].cmdset.all()])
+                    all_cmdsets.extend(
+                        [
+                            (cmdset.key, cmdset)
+                            for cmdset in obj.account.sessions.all()[0].cmdset.all()
+                        ]
+                    )
             else:
                 try:
                     # we have to protect this since many objects don't have sessions.
-                    all_cmdsets.extend([(cmdset.key, cmdset)
-                                        for cmdset in obj.get_session(obj.sessions.get()).cmdset.all()])
+                    all_cmdsets.extend(
+                        [
+                            (cmdset.key, cmdset)
+                            for cmdset in obj.get_session(obj.sessions.get()).cmdset.all()
+                        ]
+                    )
                 except (TypeError, AttributeError):
                     # an error means we are merging an object without a session
                     pass
             all_cmdsets = [cmdset for cmdset in dict(all_cmdsets).values()]
             all_cmdsets.sort(key=lambda x: x.priority, reverse=True)
-            string += "\n|wMerged Cmdset(s)|n:\n %s" % ("\n ".join("%s [%s] (%s, prio %s)" % (
-                cmdset.path, cmdset.key, cmdset.mergetype, cmdset.priority) for cmdset in all_cmdsets))
+            string += "\n|wMerged Cmdset(s)|n:\n %s" % (
+                "\n ".join(
+                    "%s [%s] (%s, prio %s)"
+                    % (cmdset.path, cmdset.key, cmdset.mergetype, cmdset.priority)
+                    for cmdset in all_cmdsets
+                )
+            )
 
             # list the commands available to this object
-            avail_cmdset = sorted([cmd.key for cmd in avail_cmdset
-                                   if cmd.access(obj, "cmd")])
+            avail_cmdset = sorted([cmd.key for cmd in avail_cmdset if cmd.access(obj, "cmd")])
 
             cmdsetstr = utils.fill(", ".join(avail_cmdset), indent=2)
-            string += "\n|wCommands available to %s (result of Merged CmdSets)|n:\n %s" % (obj.key, cmdsetstr)
+            string += "\n|wCommands available to %s (result of Merged CmdSets)|n:\n %s" % (
+                obj.key,
+                cmdsetstr,
+            )
 
         if hasattr(obj, "scripts") and hasattr(obj.scripts, "all") and obj.scripts.all():
             string += "\n|wScripts|n:\n %s" % obj.scripts
@@ -2191,8 +2472,13 @@ def format_output(self, obj, avail_cmdset):
         string += self.format_attributes(obj)
 
         # display Tags
-        tags_string = utils.fill(", ".join("%s[%s]" % (tag, category)
-                                           for tag, category in obj.tags.all(return_key_and_category=True)), indent=5)
+        tags_string = utils.fill(
+            ", ".join(
+                "%s[%s]" % (tag, category)
+                for tag, category in obj.tags.all(return_key_and_category=True)
+            ),
+            indent=5,
+        )
         if tags_string:
             string += "\n|wTags[category]|n: %s" % tags_string.strip()
 
@@ -2210,17 +2496,23 @@ def format_output(self, obj, avail_cmdset):
                     things.append(content)
             if exits:
                 string += "\n|wExits|n: %s" % ", ".join(
-                    ["%s(%s)" % (exit.name, exit.dbref) for exit in exits])
+                    ["%s(%s)" % (exit.name, exit.dbref) for exit in exits]
+                )
             if pobjs:
                 string += "\n|wCharacters|n: %s" % ", ".join(
-                    ["|c%s|n(%s)" % (pobj.name, pobj.dbref) for pobj in pobjs])
+                    ["|c%s|n(%s)" % (pobj.name, pobj.dbref) for pobj in pobjs]
+                )
             if things:
                 string += "\n|wContents|n: %s" % ", ".join(
-                    ["%s(%s)" % (cont.name, cont.dbref) for cont in obj.contents
-                     if cont not in exits and cont not in pobjs])
+                    [
+                        "%s(%s)" % (cont.name, cont.dbref)
+                        for cont in obj.contents
+                        if cont not in exits and cont not in pobjs
+                    ]
+                )
         separator = "-" * _DEFAULT_WIDTH
         # output info
-        return '%s\n%s\n%s' % (separator, string.strip(), separator)
+        return "%s\n%s\n%s" % (separator, string.strip(), separator)
 
     def func(self):
         """Process command"""
@@ -2242,13 +2534,16 @@ def get_cmdset_callback(cmdset):
             # If no arguments are provided, examine the invoker's location.
             if hasattr(caller, "location"):
                 obj = caller.location
-                if not obj.access(caller, 'examine'):
+                if not obj.access(caller, "examine"):
                     # If we don't have special info access, just look at the object instead.
                     self.msg(caller.at_look(obj))
                     return
+                obj_session = obj.sessions.get()[0] if obj.sessions.count() else None
+
                 # using callback for printing result whenever function returns.
-                get_and_merge_cmdsets(obj, self.session, self.account, obj, "object",
-                                      self.raw_string).addCallback(get_cmdset_callback)
+                get_and_merge_cmdsets(
+                    obj, obj_session, self.account, obj, "object", self.raw_string
+                ).addCallback(get_cmdset_callback)
             else:
                 self.msg("You need to supply a target to examine.")
             return
@@ -2257,23 +2552,28 @@ def get_cmdset_callback(cmdset):
         for objdef in self.lhs_objattr:
 
             obj = None
-            obj_name = objdef['name']
-            obj_attrs = objdef['attrs']
-
-            self.account_mode = utils.inherits_from(caller, "evennia.accounts.accounts.DefaultAccount") or \
-                "account" in self.switches or obj_name.startswith('*')
+            obj_name = objdef["name"]
+            obj_attrs = objdef["attrs"]
+
+            self.account_mode = (
+                utils.inherits_from(caller, "evennia.accounts.accounts.DefaultAccount")
+                or "account" in self.switches
+                or obj_name.startswith("*")
+            )
             if self.account_mode:
                 try:
-                    obj = caller.search_account(obj_name.lstrip('*'))
+                    obj = caller.search_account(obj_name.lstrip("*"))
                 except AttributeError:
                     # this means we are calling examine from an account object
-                    obj = caller.search(obj_name.lstrip('*'), search_object='object' in self.switches)
+                    obj = caller.search(
+                        obj_name.lstrip("*"), search_object="object" in self.switches
+                    )
             else:
                 obj = caller.search(obj_name)
             if not obj:
                 continue
 
-            if not obj.access(caller, 'examine'):
+            if not obj.access(caller, "examine"):
                 # If we don't have special info access, just look
                 # at the object instead.
                 self.msg(caller.at_look(obj))
@@ -2284,14 +2584,27 @@ def get_cmdset_callback(cmdset):
                     # we are only interested in specific attributes
                     caller.msg(self.format_attributes(obj, attrname, crop=False))
             else:
+                session = None
                 if obj.sessions.count():
                     mergemode = "session"
+                    session = obj.sessions.get()[0]
                 elif self.account_mode:
                     mergemode = "account"
                 else:
                     mergemode = "object"
+
+                account = None
+                objct = None
+                if self.account_mode:
+                    account = obj
+                else:
+                    account = obj.account
+                    objct = obj
+
                 # using callback to print results whenever function returns.
-                get_and_merge_cmdsets(obj, self.session, self.account, obj, mergemode, self.raw_string).addCallback(get_cmdset_callback)
+                get_and_merge_cmdsets(
+                    obj, session, account, objct, mergemode, self.raw_string
+                ).addCallback(get_cmdset_callback)
 
 
 class CmdFind(COMMAND_DEFAULT_CLASS):
@@ -2333,7 +2646,7 @@ def func(self):
             return
 
         if "locate" in self.cmdstring:  # Use option /loc as a default for locate command alias
-            switches.append('loc')
+            switches.append("loc")
 
         searchstring = self.lhs
         low, high = 1, ObjectDB.objects.all().order_by("-id")[0].id
@@ -2385,22 +2698,36 @@ def func(self):
                 result = result[0]
                 string += "\n|g   %s - %s|n" % (result.get_display_name(caller), result.path)
                 if "loc" in self.switches and not is_account and result.location:
-                    string += " (|wlocation|n: |g{}|n)".format(result.location.get_display_name(caller))
+                    string += " (|wlocation|n: |g{}|n)".format(
+                        result.location.get_display_name(caller)
+                    )
         else:
             # Not an account/dbref search but a wider search; build a queryset.
             # Searchs for key and aliases
             if "exact" in switches:
                 keyquery = Q(db_key__iexact=searchstring, id__gte=low, id__lte=high)
-                aliasquery = Q(db_tags__db_key__iexact=searchstring,
-                               db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
+                aliasquery = Q(
+                    db_tags__db_key__iexact=searchstring,
+                    db_tags__db_tagtype__iexact="alias",
+                    id__gte=low,
+                    id__lte=high,
+                )
             elif "startswith" in switches:
                 keyquery = Q(db_key__istartswith=searchstring, id__gte=low, id__lte=high)
-                aliasquery = Q(db_tags__db_key__istartswith=searchstring,
-                               db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
+                aliasquery = Q(
+                    db_tags__db_key__istartswith=searchstring,
+                    db_tags__db_tagtype__iexact="alias",
+                    id__gte=low,
+                    id__lte=high,
+                )
             else:
                 keyquery = Q(db_key__icontains=searchstring, id__gte=low, id__lte=high)
-                aliasquery = Q(db_tags__db_key__icontains=searchstring,
-                               db_tags__db_tagtype__iexact="alias", id__gte=low, id__lte=high)
+                aliasquery = Q(
+                    db_tags__db_key__icontains=searchstring,
+                    db_tags__db_tagtype__iexact="alias",
+                    id__gte=low,
+                    id__lte=high,
+                )
 
             results = ObjectDB.objects.filter(keyquery | aliasquery).distinct()
             nresults = results.count()
@@ -2424,9 +2751,14 @@ def func(self):
                         string += "\n   |g%s - %s|n" % (res.get_display_name(caller), res.path)
                 else:
                     string = "|wOne Match|n(#%i-#%i%s):" % (low, high, restrictions)
-                    string += "\n   |g%s - %s|n" % (results[0].get_display_name(caller), results[0].path)
+                    string += "\n   |g%s - %s|n" % (
+                        results[0].get_display_name(caller),
+                        results[0].path,
+                    )
                     if "loc" in self.switches and nresults == 1 and results[0].location:
-                        string += " (|wlocation|n: |g{}|n)".format(results[0].location.get_display_name(caller))
+                        string += " (|wlocation|n: |g{}|n)".format(
+                            results[0].location.get_display_name(caller)
+                        )
             else:
                 string = "|wMatch|n(#%i-#%i%s):" % (low, high, restrictions)
                 string += "\n   |RNo matches found for '%s'|n" % searchstring
@@ -2462,6 +2794,7 @@ class CmdTeleport(COMMAND_DEFAULT_CLASS):
     Teleports an object somewhere. If no object is given, you yourself
     is teleported to the target location.
     """
+
     key = "tel"
     aliases = "teleport"
     switch_options = ("quiet", "intoexit", "tonone", "loc")
@@ -2492,15 +2825,17 @@ def func(self):
                     caller.msg("Did not find object to teleport.")
                     return
             if obj_to_teleport.has_account:
-                caller.msg("Cannot teleport a puppeted object "
-                           "(%s, puppeted by %s) to a None-location." % (
-                               obj_to_teleport.key, obj_to_teleport.account))
+                caller.msg(
+                    "Cannot teleport a puppeted object "
+                    "(%s, puppeted by %s) to a None-location."
+                    % (obj_to_teleport.key, obj_to_teleport.account)
+                )
                 return
             caller.msg("Teleported %s -> None-location." % obj_to_teleport)
             if obj_to_teleport.location and not tel_quietly:
-                obj_to_teleport.location.msg_contents("%s teleported %s into nothingness."
-                                                      % (caller, obj_to_teleport),
-                                                      exclude=caller)
+                obj_to_teleport.location.msg_contents(
+                    "%s teleported %s into nothingness." % (caller, obj_to_teleport), exclude=caller
+                )
             obj_to_teleport.location = None
             return
 
@@ -2541,14 +2876,13 @@ def func(self):
             use_destination = False
 
         # try the teleport
-        if obj_to_teleport.move_to(destination, quiet=tel_quietly,
-                                   emit_to_obj=caller,
-                                   use_destination=use_destination):
+        if obj_to_teleport.move_to(
+            destination, quiet=tel_quietly, emit_to_obj=caller, use_destination=use_destination
+        ):
             if obj_to_teleport == caller:
                 caller.msg("Teleported to %s." % destination)
             else:
-                caller.msg("Teleported %s -> %s." % (obj_to_teleport,
-                                                     destination))
+                caller.msg("Teleported %s -> %s." % (obj_to_teleport, destination))
 
 
 class CmdScript(COMMAND_DEFAULT_CLASS):
@@ -2604,14 +2938,17 @@ def func(self):
             elif not self.switches:
                 # view all scripts
                 from evennia.commands.default.system import format_script_list
+
                 result.append(format_script_list(scripts))
             elif "start" in self.switches:
                 num = sum([obj.scripts.start(script.key) for script in scripts])
                 result.append("%s scripts started on %s." % (num, obj.get_display_name(caller)))
             elif "stop" in self.switches:
                 for script in scripts:
-                    result.append("Stopping script %s on %s." % (script.get_display_name(caller),
-                                                                 obj.get_display_name(caller)))
+                    result.append(
+                        "Stopping script %s on %s."
+                        % (script.get_display_name(caller), obj.get_display_name(caller))
+                    )
                     script.stop()
             obj.scripts.validate()
         else:  # rhs exists
@@ -2619,15 +2956,20 @@ def func(self):
                 # adding a new script, and starting it
                 ok = obj.scripts.add(self.rhs, autostart=True)
                 if not ok:
-                    result.append("\nScript %s could not be added and/or started on %s." % (
-                        self.rhs, obj.get_display_name(caller)))
+                    result.append(
+                        "\nScript %s could not be added and/or started on %s."
+                        % (self.rhs, obj.get_display_name(caller))
+                    )
                 else:
-                    result.append("Script |w%s|n successfully added and started on %s." % (
-                        self.rhs, obj.get_display_name(caller)))
+                    result.append(
+                        "Script |w%s|n successfully added and started on %s."
+                        % (self.rhs, obj.get_display_name(caller))
+                    )
 
             else:
-                paths = [self.rhs] + ["%s.%s" % (prefix, self.rhs)
-                                      for prefix in settings.TYPECLASS_PATHS]
+                paths = [self.rhs] + [
+                    "%s.%s" % (prefix, self.rhs) for prefix in settings.TYPECLASS_PATHS
+                ]
                 if "stop" in self.switches:
                     # we are stopping an already existing script
                     for path in paths:
@@ -2693,17 +3035,25 @@ def func(self):
             objs = search.search_tag(tag, category=category)
             nobjs = len(objs)
             if nobjs > 0:
-                catstr = " (category: '|w%s|n')" % category if category else \
-                    ("" if nobjs == 1 else " (may have different tag categories)")
+                catstr = (
+                    " (category: '|w%s|n')" % category
+                    if category
+                    else ("" if nobjs == 1 else " (may have different tag categories)")
+                )
                 matchstr = ", ".join(o.get_display_name(self.caller) for o in objs)
 
-                string = "Found |w%i|n object%s with tag '|w%s|n'%s:\n %s" % (nobjs,
-                                                                              "s" if nobjs > 1 else "",
-                                                                              tag,
-                                                                              catstr, matchstr)
+                string = "Found |w%i|n object%s with tag '|w%s|n'%s:\n %s" % (
+                    nobjs,
+                    "s" if nobjs > 1 else "",
+                    tag,
+                    catstr,
+                    matchstr,
+                )
             else:
-                string = "No objects found with tag '%s%s'." % (tag,
-                                                                " (category: %s)" % category if category else "")
+                string = "No objects found with tag '%s%s'." % (
+                    tag,
+                    " (category: %s)" % category if category else "",
+                )
             self.caller.msg(string)
             return
         if "del" in self.switches:
@@ -2722,16 +3072,20 @@ def func(self):
                     string = "Removed tag '%s'%s from %s." % (
                         tag,
                         " (category: %s)" % category if category else "",
-                        obj)
+                        obj,
+                    )
                 else:
                     string = "No tag '%s'%s to delete on %s." % (
                         tag,
                         " (category: %s)" % category if category else "",
-                        obj)
+                        obj,
+                    )
             else:
                 # no tag specified, clear all tags
-                old_tags = ["%s%s" % (tag, " (category: %s)" % category if category else "")
-                            for tag, category in obj.tags.all(return_key_and_category=True)]
+                old_tags = [
+                    "%s%s" % (tag, " (category: %s)" % category if category else "")
+                    for tag, category in obj.tags.all(return_key_and_category=True)
+                ]
                 if old_tags:
                     obj.tags.clear()
                     string = "Cleared all tags from %s: %s" % (obj, ", ".join(sorted(old_tags)))
@@ -2751,9 +3105,11 @@ def func(self):
                 tag, category = [part.strip() for part in tag.split(":", 1)]
             # create the tag
             obj.tags.add(tag, category=category)
-            string = "Added tag '%s'%s to %s." % (tag,
-                                                  " (category: %s)" % category if category else "",
-                                                  obj)
+            string = "Added tag '%s'%s to %s." % (
+                tag,
+                " (category: %s)" % category if category else "",
+                obj,
+            )
             self.caller.msg(string)
         else:
             # no = found - list tags on object
@@ -2766,8 +3122,10 @@ def func(self):
             categories = [" (category: %s)" % tup[1] if tup[1] else "" for tup in tagtuples]
             if ntags:
                 string = "Tag%s on %s: %s" % (
-                    "s" if ntags > 1 else "", obj,
-                    ", ".join(sorted("'%s'%s" % (tags[i], categories[i]) for i in range(ntags))))
+                    "s" if ntags > 1 else "",
+                    obj,
+                    ", ".join(sorted("'%s'%s" % (tags[i], categories[i]) for i in range(ntags))),
+                )
             else:
                 string = "No tags attached to %s." % obj
             self.caller.msg(string)
@@ -2839,7 +3197,19 @@ class CmdSpawn(COMMAND_DEFAULT_CLASS):
 
     key = "spawn"
     aliases = ["olc"]
-    switch_options = ("noloc", "search", "list", "show", "examine", "save", "delete", "menu", "olc", "update", "edit")
+    switch_options = (
+        "noloc",
+        "search",
+        "list",
+        "show",
+        "examine",
+        "save",
+        "delete",
+        "menu",
+        "olc",
+        "update",
+        "edit",
+    )
     locks = "cmd:perm(spawn) or perm(Builder)"
     help_category = "Building"
 
@@ -2856,11 +3226,13 @@ def _parse_prototype(inp, expect=dict):
             finally:
                 if not isinstance(prototype, expect):
                     if err:
-                        string = ("{}\n|RCritical Python syntax error in argument. Only primitive "
-                                  "Python structures are allowed. \nYou also need to use correct "
-                                  "Python syntax. Remember especially to put quotes around all "
-                                  "strings inside lists and dicts.|n For more advanced uses, embed "
-                                  "inline functions in the strings.".format(err))
+                        string = (
+                            "{}\n|RCritical Python syntax error in argument. Only primitive "
+                            "Python structures are allowed. \nYou also need to use correct "
+                            "Python syntax. Remember especially to put quotes around all "
+                            "strings inside lists and dicts.|n For more advanced uses, embed "
+                            "inline functions in the strings.".format(err)
+                        )
                     else:
                         string = "Expected {}, got {}.".format(expect, type(prototype))
                     self.caller.msg(string)
@@ -2868,8 +3240,9 @@ def _parse_prototype(inp, expect=dict):
             if expect == dict:
                 # an actual prototype. We need to make sure it's safe. Don't allow exec
                 if "exec" in prototype and not self.caller.check_permstring("Developer"):
-                    self.caller.msg("Spawn aborted: You are not allowed to "
-                                    "use the 'exec' prototype key.")
+                    self.caller.msg(
+                        "Spawn aborted: You are not allowed to " "use the 'exec' prototype key."
+                    )
                     return None
                 try:
                     # we homogenize first, to be more lenient
@@ -2890,16 +3263,23 @@ def _search_show_prototype(query, prototypes=None):
 
         caller = self.caller
 
-        if self.cmdstring == "olc" or 'menu' in self.switches \
-                or 'olc' in self.switches or 'edit' in self.switches:
+        if (
+            self.cmdstring == "olc"
+            or "menu" in self.switches
+            or "olc" in self.switches
+            or "edit" in self.switches
+        ):
             # OLC menu mode
             prototype = None
             if self.lhs:
                 key = self.lhs
                 prototype = protlib.search_prototype(key=key)
                 if len(prototype) > 1:
-                    caller.msg("More than one match for {}:\n{}".format(
-                        key, "\n".join(proto.get('prototype_key', '') for proto in prototype)))
+                    caller.msg(
+                        "More than one match for {}:\n{}".format(
+                            key, "\n".join(proto.get("prototype_key", "") for proto in prototype)
+                        )
+                    )
                     return
                 elif prototype:
                     # one match
@@ -2911,23 +3291,26 @@ def _search_show_prototype(query, prototypes=None):
             olc_menus.start_olc(caller, session=self.session, prototype=prototype)
             return
 
-        if 'search' in self.switches:
+        if "search" in self.switches:
             # query for a key match
             if not self.args:
                 self.switches.append("list")
             else:
                 key, tags = self.args.strip(), None
-                if ';' in self.args:
+                if ";" in self.args:
                     key, tags = (part.strip().lower() for part in self.args.split(";", 1))
                     tags = [tag.strip() for tag in tags.split(",")] if tags else None
-                EvMore(caller, str(protlib.list_prototypes(caller, key=key, tags=tags)),
-                       exit_on_lastpage=True)
+                EvMore(
+                    caller,
+                    str(protlib.list_prototypes(caller, key=key, tags=tags)),
+                    exit_on_lastpage=True,
+                )
                 return
 
-        if 'show' in self.switches or 'examine' in self.switches:
+        if "show" in self.switches or "examine" in self.switches:
             # the argument is a key in this case (may be a partial key)
             if not self.args:
-                self.switches.append('list')
+                self.switches.append("list")
             else:
                 matchstring = _search_show_prototype(self.args)
                 if matchstring:
@@ -2936,19 +3319,24 @@ def _search_show_prototype(query, prototypes=None):
                     caller.msg("No prototype '{}' was found.".format(self.args))
                 return
 
-        if 'list' in self.switches:
+        if "list" in self.switches:
             # for list, all optional arguments are tags
             # import pudb; pudb.set_trace()
 
-            EvMore(caller, str(protlib.list_prototypes(caller,
-                   tags=self.lhslist)), exit_on_lastpage=True)
+            EvMore(
+                caller,
+                str(protlib.list_prototypes(caller, tags=self.lhslist)),
+                exit_on_lastpage=True,
+                justify_kwargs=False,
+            )
             return
 
-        if 'save' in self.switches:
+        if "save" in self.switches:
             # store a prototype to the database store
             if not self.args:
                 caller.msg(
-                  "Usage: spawn/save <key>[;desc[;tag,tag[,...][;lockstring]]] = <prototype_dict>")
+                    "Usage: spawn/save <key>[;desc[;tag,tag[,...][;lockstring]]] = <prototype_dict>"
+                )
                 return
 
             # handle rhs:
@@ -2973,7 +3361,7 @@ def _search_show_prototype(query, prototypes=None):
                 string += "\n|yExisting saved prototype found:|n\n{}".format(old_matchstring)
                 question = "\n|yDo you want to replace the existing prototype?|n [Y]/N"
 
-            answer = yield(string + question)
+            answer = yield (string + question)
             if answer.lower() in ["n", "no"]:
                 caller.msg("|rSave cancelled.|n")
                 return
@@ -2992,16 +3380,21 @@ def _search_show_prototype(query, prototypes=None):
             # check if we want to update existing objects
             existing_objects = protlib.search_objects_with_prototype(prototype_key)
             if existing_objects:
-                if 'update' not in self.switches:
+                if "update" not in self.switches:
                     n_existing = len(existing_objects)
                     slow = " (note that this may be slow)" if n_existing > 10 else ""
-                    string = ("There are {} objects already created with an older version "
-                              "of prototype {}. Should it be re-applied to them{}? [Y]/N".format(
-                                  n_existing, prototype_key, slow))
-                    answer = yield(string)
+                    string = (
+                        "There are {} objects already created with an older version "
+                        "of prototype {}. Should it be re-applied to them{}? [Y]/N".format(
+                            n_existing, prototype_key, slow
+                        )
+                    )
+                    answer = yield (string)
                     if answer.lower() in ["n", "no"]:
-                        caller.msg("|rNo update was done of existing objects. "
-                                   "Use spawn/update <key> to apply later as needed.|n")
+                        caller.msg(
+                            "|rNo update was done of existing objects. "
+                            "Use spawn/update <key> to apply later as needed.|n"
+                        )
                         return
                 n_updated = spawner.batch_update_objects_with_prototype(existing_objects, key)
                 caller.msg("{} objects were updated.".format(n_updated))
@@ -3009,17 +3402,19 @@ def _search_show_prototype(query, prototypes=None):
 
         if not self.args:
             ncount = len(protlib.search_prototype())
-            caller.msg("Usage: spawn <prototype-key> or {{key: value, ...}}"
-                       "\n ({} existing prototypes. Use /list to inspect)".format(ncount))
+            caller.msg(
+                "Usage: spawn <prototype-key> or {{key: value, ...}}"
+                "\n ({} existing prototypes. Use /list to inspect)".format(ncount)
+            )
             return
 
-        if 'delete' in self.switches:
+        if "delete" in self.switches:
             # remove db-based prototype
             matchstring = _search_show_prototype(self.args)
             if matchstring:
                 string = "|rDeleting prototype:|n\n{}".format(matchstring)
                 question = "\nDo you want to continue deleting? [Y]/N"
-                answer = yield(string + question)
+                answer = yield (string + question)
                 if answer.lower() in ["n", "no"]:
                     caller.msg("|rDeletion cancelled.|n")
                     return
@@ -3027,23 +3422,29 @@ def _search_show_prototype(query, prototypes=None):
                     success = protlib.delete_prototype(self.args)
                 except protlib.PermissionError as err:
                     caller.msg("|rError deleting:|R {}|n".format(err))
-                caller.msg("Deletion {}.".format(
-                    'successful' if success else 'failed (does the prototype exist?)'))
+                caller.msg(
+                    "Deletion {}.".format(
+                        "successful" if success else "failed (does the prototype exist?)"
+                    )
+                )
                 return
             else:
                 caller.msg("Could not find prototype '{}'".format(key))
 
-        if 'update' in self.switches:
+        if "update" in self.switches:
             # update existing prototypes
             key = self.args.strip().lower()
             existing_objects = protlib.search_objects_with_prototype(key)
             if existing_objects:
                 n_existing = len(existing_objects)
                 slow = " (note that this may be slow)" if n_existing > 10 else ""
-                string = ("There are {} objects already created with an older version "
-                          "of prototype {}. Should it be re-applied to them{}? [Y]/N".format(
-                              n_existing, key, slow))
-                answer = yield(string)
+                string = (
+                    "There are {} objects already created with an older version "
+                    "of prototype {}. Should it be re-applied to them{}? [Y]/N".format(
+                        n_existing, key, slow
+                    )
+                )
+                answer = yield (string)
                 if answer.lower() in ["n", "no"]:
                     caller.msg("|rUpdate cancelled.")
                     return
@@ -3053,12 +3454,13 @@ def _search_show_prototype(query, prototypes=None):
         # A direct creation of an object from a given prototype
 
         prototype = _parse_prototype(
-                self.args, expect=dict if self.args.strip().startswith("{") else str)
+            self.args, expect=dict if self.args.strip().startswith("{") else str
+        )
         if not prototype:
             # this will only let through dicts or strings
             return
 
-        key = '<unnamed>'
+        key = "<unnamed>"
         if isinstance(prototype, str):
             # A prototype key we are looking to apply
             key = prototype
@@ -3068,14 +3470,19 @@ def _search_show_prototype(query, prototypes=None):
                 caller.msg("No prototype named '%s'." % prototype)
                 return
             elif nprots > 1:
-                caller.msg("Found {} prototypes matching '{}':\n  {}".format(
-                    nprots, prototype, ", ".join(proto.get('prototype_key', '')
-                                                 for proto in prototypes)))
+                caller.msg(
+                    "Found {} prototypes matching '{}':\n  {}".format(
+                        nprots,
+                        prototype,
+                        ", ".join(proto.get("prototype_key", "") for proto in prototypes),
+                    )
+                )
                 return
             # we have a prototype, check access
             prototype = prototypes[0]
             if not caller.locks.check_lockstring(
-                    caller, prototype.get('prototype_locks', ''), access_type='spawn', default=True):
+                caller, prototype.get("prototype_locks", ""), access_type="spawn", default=True
+            ):
                 caller.msg("You don't have access to use this prototype.")
                 return
 
diff --git a/evennia/commands/default/cmdset_character.py b/evennia/commands/default/cmdset_character.py
index 438996f5366..28c8fdd641e 100644
--- a/evennia/commands/default/cmdset_character.py
+++ b/evennia/commands/default/cmdset_character.py
@@ -14,6 +14,7 @@ class CharacterCmdSet(CmdSet):
     """
     Implements the default command set.
     """
+
     key = "DefaultCharacter"
     priority = 0
 
diff --git a/evennia/commands/default/cmdset_session.py b/evennia/commands/default/cmdset_session.py
index c5a7821241a..f81e8b9636b 100644
--- a/evennia/commands/default/cmdset_session.py
+++ b/evennia/commands/default/cmdset_session.py
@@ -9,6 +9,7 @@ class SessionCmdSet(CmdSet):
     """
     Sets up the unlogged cmdset.
     """
+
     key = "DefaultSession"
     priority = -20
 
diff --git a/evennia/commands/default/cmdset_unloggedin.py b/evennia/commands/default/cmdset_unloggedin.py
index 1c45d908aa7..b668325bd80 100644
--- a/evennia/commands/default/cmdset_unloggedin.py
+++ b/evennia/commands/default/cmdset_unloggedin.py
@@ -11,6 +11,7 @@ class UnloggedinCmdSet(CmdSet):
     """
     Sets up the unlogged cmdset.
     """
+
     key = "DefaultUnloggedin"
     priority = 0
 
diff --git a/evennia/commands/default/comms.py b/evennia/commands/default/comms.py
index 8beaf9956f4..ed732ed2270 100644
--- a/evennia/commands/default/comms.py
+++ b/evennia/commands/default/comms.py
@@ -19,12 +19,26 @@
 from evennia.utils.utils import make_iter, class_from_module
 
 COMMAND_DEFAULT_CLASS = class_from_module(settings.COMMAND_DEFAULT_CLASS)
+CHANNEL_DEFAULT_TYPECLASS = class_from_module(settings.BASE_CHANNEL_TYPECLASS)
+
 
 # limit symbol import for API
-__all__ = ("CmdAddCom", "CmdDelCom", "CmdAllCom",
-           "CmdChannels", "CmdCdestroy", "CmdCBoot", "CmdCemit",
-           "CmdCWho", "CmdChannelCreate", "CmdClock", "CmdCdesc",
-           "CmdPage", "CmdIRC2Chan", "CmdRSS2Chan")
+__all__ = (
+    "CmdAddCom",
+    "CmdDelCom",
+    "CmdAllCom",
+    "CmdChannels",
+    "CmdCdestroy",
+    "CmdCBoot",
+    "CmdCemit",
+    "CmdCWho",
+    "CmdChannelCreate",
+    "CmdClock",
+    "CmdCdesc",
+    "CmdPage",
+    "CmdIRC2Chan",
+    "CmdRSS2Chan",
+)
 _DEFAULT_WIDTH = settings.CLIENT_DEFAULT_WIDTH
 
 
@@ -33,11 +47,14 @@ def find_channel(caller, channelname, silent=False, noaliases=False):
     Helper function for searching for a single channel with
     some error handling.
     """
-    channels = ChannelDB.objects.channel_search(channelname)
+    channels = CHANNEL_DEFAULT_TYPECLASS.objects.channel_search(channelname)
     if not channels:
         if not noaliases:
-            channels = [chan for chan in ChannelDB.objects.get_all_channels()
-                        if channelname in chan.aliases.all()]
+            channels = [
+                chan
+                for chan in CHANNEL_DEFAULT_TYPECLASS.objects.get_all_channels()
+                if channelname in chan.aliases.all()
+            ]
         if channels:
             return channels[0]
         if not silent:
@@ -97,7 +114,7 @@ def func(self):
             return
 
         # check permissions
-        if not channel.access(account, 'listen'):
+        if not channel.access(account, "listen"):
             self.msg("%s: You are not allowed to listen to this channel." % channel.key)
             return
 
@@ -169,8 +186,11 @@ def func(self):
             delnicks = "all" in self.switches
             # find all nicks linked to this channel and delete them
             if delnicks:
-                for nick in [nick for nick in make_iter(caller.nicks.get(category="channel", return_obj=True))
-                             if nick and nick.pk and nick.value[3].lower() == chkey]:
+                for nick in [
+                    nick
+                    for nick in make_iter(caller.nicks.get(category="channel", return_obj=True))
+                    if nick and nick.pk and nick.value[3].lower() == chkey
+                ]:
                     nick.delete()
             disconnect = channel.disconnect(account)
             if disconnect:
@@ -198,9 +218,9 @@ class CmdAllCom(COMMAND_DEFAULT_CLASS):
     Usage:
       allcom [on | off | who | destroy]
 
-    Allows the user to universally turn off or on all channels they are on,
-    as well as perform a 'who' for all channels they are on. Destroy deletes
-    all channels that you control.
+    Allows the user to universally turn off or on all channels they are on, as
+    well as perform a 'who' for all channels they are on. Destroy deletes all
+    channels that you control.
 
     Without argument, works like comlist.
     """
@@ -225,26 +245,35 @@ def func(self):
         if args == "on":
             # get names of all channels available to listen to
             # and activate them all
-            channels = [chan for chan in ChannelDB.objects.get_all_channels()
-                        if chan.access(caller, 'listen')]
+            channels = [
+                chan
+                for chan in CHANNEL_DEFAULT_TYPECLASS.objects.get_all_channels()
+                if chan.access(caller, "listen")
+            ]
             for channel in channels:
                 self.execute_cmd("addcom %s" % channel.key)
         elif args == "off":
             # get names all subscribed channels and disconnect from them all
-            channels = ChannelDB.objects.get_subscriptions(caller)
+            channels = CHANNEL_DEFAULT_TYPECLASS.objects.get_subscriptions(caller)
             for channel in channels:
                 self.execute_cmd("delcom %s" % channel.key)
         elif args == "destroy":
             # destroy all channels you control
-            channels = [chan for chan in ChannelDB.objects.get_all_channels()
-                        if chan.access(caller, 'control')]
+            channels = [
+                chan
+                for chan in CHANNEL_DEFAULT_TYPECLASS.objects.get_all_channels()
+                if chan.access(caller, "control")
+            ]
             for channel in channels:
                 self.execute_cmd("cdestroy %s" % channel.key)
         elif args == "who":
             # run a who, listing the subscribers on visible channels.
             string = "\n|CChannel subscriptions|n"
-            channels = [chan for chan in ChannelDB.objects.get_all_channels()
-                        if chan.access(caller, 'listen')]
+            channels = [
+                chan
+                for chan in CHANNEL_DEFAULT_TYPECLASS.objects.get_all_channels()
+                if chan.access(caller, "listen")
+            ]
             if not channels:
                 string += "No channels."
             for channel in channels:
@@ -268,6 +297,7 @@ class CmdChannels(COMMAND_DEFAULT_CLASS):
     Use 'comlist' to only view your current channel subscriptions.
     Use addcom/delcom to join and leave channels
     """
+
     key = "channels"
     aliases = ["clist", "comlist", "chanlist", "channellist", "all channels"]
     help_category = "Comms"
@@ -282,32 +312,59 @@ def func(self):
         caller = self.caller
 
         # all channels we have available to listen to
-        channels = [chan for chan in ChannelDB.objects.get_all_channels()
-                    if chan.access(caller, 'listen')]
+        channels = [
+            chan
+            for chan in CHANNEL_DEFAULT_TYPECLASS.objects.get_all_channels()
+            if chan.access(caller, "listen")
+        ]
         if not channels:
             self.msg("No channels available.")
             return
         # all channel we are already subscribed to
-        subs = ChannelDB.objects.get_subscriptions(caller)
+        subs = CHANNEL_DEFAULT_TYPECLASS.objects.get_subscriptions(caller)
 
         if self.cmdstring == "comlist":
             # just display the subscribed channels with no extra info
-            comtable = self.styled_table("|wchannel|n", "|wmy aliases|n",
-                                         "|wdescription|n", align="l", maxwidth=_DEFAULT_WIDTH)
+            comtable = self.styled_table(
+                "|wchannel|n",
+                "|wmy aliases|n",
+                "|wdescription|n",
+                align="l",
+                maxwidth=_DEFAULT_WIDTH,
+            )
             for chan in subs:
                 clower = chan.key.lower()
                 nicks = caller.nicks.get(category="channel", return_obj=True)
-                comtable.add_row(*["%s%s" % (chan.key, chan.aliases.all() and
-                                             "(%s)" % ",".join(chan.aliases.all()) or ""),
-                                   "%s" % ",".join(nick.db_key for nick in make_iter(nicks)
-                                                   if nick and nick.value[3].lower() == clower),
-                                   chan.db.desc])
-            self.msg("\n|wChannel subscriptions|n (use |wchannels|n to list all,"
-                     " |waddcom|n/|wdelcom|n to sub/unsub):|n\n%s" % comtable)
+                comtable.add_row(
+                    *[
+                        "%s%s"
+                        % (
+                            chan.key,
+                            chan.aliases.all() and "(%s)" % ",".join(chan.aliases.all()) or "",
+                        ),
+                        "%s"
+                        % ",".join(
+                            nick.db_key
+                            for nick in make_iter(nicks)
+                            if nick and nick.value[3].lower() == clower
+                        ),
+                        chan.db.desc,
+                    ]
+                )
+            self.msg(
+                "\n|wChannel subscriptions|n (use |wchannels|n to list all,"
+                " |waddcom|n/|wdelcom|n to sub/unsub):|n\n%s" % comtable
+            )
         else:
             # full listing (of channels caller is able to listen to)
-            comtable = self.styled_table("|wsub|n", "|wchannel|n", "|wmy aliases|n",
-                                         "|wlocks|n", "|wdescription|n", maxwidth=_DEFAULT_WIDTH)
+            comtable = self.styled_table(
+                "|wsub|n",
+                "|wchannel|n",
+                "|wmy aliases|n",
+                "|wlocks|n",
+                "|wdescription|n",
+                maxwidth=_DEFAULT_WIDTH,
+            )
             for chan in channels:
                 clower = chan.key.lower()
                 nicks = caller.nicks.get(category="channel", return_obj=True)
@@ -318,17 +375,30 @@ def func(self):
                     substatus = "|rMuted|n"
                 else:
                     substatus = "|gYes|n"
-                comtable.add_row(*[substatus,
-                                   "%s%s" % (chan.key, chan.aliases.all() and
-                                             "(%s)" % ",".join(chan.aliases.all()) or ""),
-                                   "%s" % ",".join(nick.db_key for nick in make_iter(nicks)
-                                                   if nick.value[3].lower() == clower),
-                                   str(chan.locks),
-                                   chan.db.desc])
+                comtable.add_row(
+                    *[
+                        substatus,
+                        "%s%s"
+                        % (
+                            chan.key,
+                            chan.aliases.all() and "(%s)" % ",".join(chan.aliases.all()) or "",
+                        ),
+                        "%s"
+                        % ",".join(
+                            nick.db_key
+                            for nick in make_iter(nicks)
+                            if nick.value[3].lower() == clower
+                        ),
+                        str(chan.locks),
+                        chan.db.desc,
+                    ]
+                )
             comtable.reformat_column(0, width=9)
             comtable.reformat_column(3, width=14)
-            self.msg("\n|wAvailable channels|n (use |wcomlist|n,|waddcom|n and |wdelcom|n"
-                     " to manage subscriptions):\n%s" % comtable)
+            self.msg(
+                "\n|wAvailable channels|n (use |wcomlist|n,|waddcom|n and |wdelcom|n"
+                " to manage subscriptions):\n%s" % comtable
+            )
 
 
 class CmdCdestroy(COMMAND_DEFAULT_CLASS):
@@ -359,7 +429,7 @@ def func(self):
         if not channel:
             self.msg("Could not find channel %s." % self.args)
             return
-        if not channel.access(caller, 'control'):
+        if not channel.access(caller, "control"):
             self.msg("You are not allowed to do that.")
             return
         channel_key = channel.key
@@ -369,7 +439,10 @@ def func(self):
         channel.delete()
         CHANNELHANDLER.update()
         self.msg("Channel '%s' was destroyed." % channel_key)
-        logger.log_sec('Channel Deleted: %s (Caller: %s, IP: %s).' % (channel_key, caller, self.session.address))
+        logger.log_sec(
+            "Channel Deleted: %s (Caller: %s, IP: %s)."
+            % (channel_key, caller, self.session.address)
+        )
 
 
 class CmdCBoot(COMMAND_DEFAULT_CLASS):
@@ -408,9 +481,9 @@ def func(self):
         reason = ""
         if ":" in self.rhs:
             accountname, reason = self.rhs.rsplit(":", 1)
-            searchstring = accountname.lstrip('*')
+            searchstring = accountname.lstrip("*")
         else:
-            searchstring = self.rhs.lstrip('*')
+            searchstring = self.rhs.lstrip("*")
         account = self.caller.search(searchstring, account=True)
         if not account:
             return
@@ -428,15 +501,19 @@ def func(self):
             string = "%s boots %s from channel.%s" % (self.caller, account.key, reason)
             channel.msg(string)
         # find all account's nicks linked to this channel and delete them
-        for nick in [nick for nick in
-                     account.character.nicks.get(category="channel") or []
-                     if nick.value[3].lower() == channel.key]:
+        for nick in [
+            nick
+            for nick in account.character.nicks.get(category="channel") or []
+            if nick.value[3].lower() == channel.key
+        ]:
             nick.delete()
         # disconnect account
         channel.disconnect(account)
         CHANNELHANDLER.update()
-        logger.log_sec('Channel Boot: %s (Channel: %s, Reason: %s, Caller: %s, IP: %s).' % (
-            account, channel, reason, self.caller, self.session.address))
+        logger.log_sec(
+            "Channel Boot: %s (Channel: %s, Reason: %s, Caller: %s, IP: %s)."
+            % (account, channel, reason, self.caller, self.session.address)
+        )
 
 
 class CmdCemit(COMMAND_DEFAULT_CLASS):
@@ -497,6 +574,7 @@ class CmdCWho(COMMAND_DEFAULT_CLASS):
 
     List who is connected to a given channel you have access to.
     """
+
     key = "cwho"
     locks = "cmd: not pperm(channel_banned)"
     help_category = "Comms"
@@ -558,19 +636,16 @@ def func(self):
         lhs = self.lhs
         channame = lhs
         aliases = None
-        if ';' in lhs:
-            channame, aliases = lhs.split(';', 1)
-            aliases = [alias.strip().lower() for alias in aliases.split(';')]
-        channel = ChannelDB.objects.channel_search(channame)
+        if ";" in lhs:
+            channame, aliases = lhs.split(";", 1)
+            aliases = [alias.strip().lower() for alias in aliases.split(";")]
+        channel = CHANNEL_DEFAULT_TYPECLASS.objects.channel_search(channame)
         if channel:
             self.msg("A channel with that name already exists.")
             return
         # Create and set the channel up
         lockstring = "send:all();listen:all();control:id(%s)" % caller.id
-        new_chan = create.create_channel(channame.strip(),
-                                         aliases,
-                                         description,
-                                         locks=lockstring)
+        new_chan = create.create_channel(channame.strip(), aliases, description, locks=lockstring)
         new_chan.connect(caller)
         CHANNELHANDLER.update()
         self.msg("Created channel %s and connected to it." % new_chan.key)
@@ -660,14 +735,13 @@ def func(self):
             self.msg("Channel '%s' not found." % self.lhs)
             return
         # check permissions
-        if not channel.access(caller, 'control'):
+        if not channel.access(caller, "control"):
             self.msg("You cannot admin this channel.")
             return
         # set the description
         channel.db.desc = self.rhs
         channel.save()
-        self.msg("Description of channel '%s' set to '%s'." % (channel.key,
-                                                               self.rhs))
+        self.msg("Description of channel '%s' set to '%s'." % (channel.key, self.rhs))
 
 
 class CmdPage(COMMAND_DEFAULT_CLASS):
@@ -688,7 +762,7 @@ class CmdPage(COMMAND_DEFAULT_CLASS):
     """
 
     key = "page"
-    aliases = ['tell']
+    aliases = ["tell"]
     switch_options = ("last", "list")
     locks = "cmd:not pperm(page_banned)"
     help_category = "Comms"
@@ -707,7 +781,7 @@ def func(self):
         # get last messages we've got
         pages_we_got = Msg.objects.get_messages_by_receiver(caller)
 
-        if 'last' in self.switches:
+        if "last" in self.switches:
             if pages_we_sent:
                 recv = ",".join(obj.key for obj in pages_we_sent[-1].receivers)
                 self.msg("You last paged |c%s|n:%s" % (recv, pages_we_sent[-1].message))
@@ -733,11 +807,16 @@ def func(self):
             else:
                 lastpages = pages
             template = "|w%s|n |c%s|n to |c%s|n: %s"
-            lastpages = "\n ".join(template %
-                                   (utils.datetime_format(page.date_created),
-                                    ",".join(obj.key for obj in page.senders),
-                                    "|n,|c ".join([obj.name for obj in page.receivers]),
-                                    page.message) for page in lastpages)
+            lastpages = "\n ".join(
+                template
+                % (
+                    utils.datetime_format(page.date_created),
+                    ",".join(obj.key for obj in page.senders),
+                    "|n,|c ".join([obj.name for obj in page.receivers]),
+                    page.message,
+                )
+                for page in lastpages
+            )
 
             if lastpages:
                 string = "Your latest pages:\n %s" % lastpages
@@ -763,7 +842,7 @@ def func(self):
         for receiver in set(receivers):
             if isinstance(receiver, str):
                 pobj = caller.search(receiver)
-            elif hasattr(receiver, 'character'):
+            elif hasattr(receiver, "character"):
                 pobj = receiver
             else:
                 self.msg("Who do you want to page?")
@@ -779,24 +858,25 @@ def func(self):
 
         # if message begins with a :, we assume it is a 'page-pose'
         if message.startswith(":"):
-            message = "%s %s" % (caller.key, message.strip(':').strip())
+            message = "%s %s" % (caller.key, message.strip(":").strip())
 
         # create the persistent message object
-        create.create_message(caller, message,
-                              receivers=recobjs)
+        create.create_message(caller, message, receivers=recobjs)
 
         # tell the accounts they got a message.
         received = []
         rstrings = []
         for pobj in recobjs:
-            if not pobj.access(caller, 'msg'):
+            if not pobj.access(caller, "msg"):
                 rstrings.append("You are not allowed to page %s." % pobj)
                 continue
             pobj.msg("%s %s" % (header, message))
-            if hasattr(pobj, 'sessions') and not pobj.sessions.count():
+            if hasattr(pobj, "sessions") and not pobj.sessions.count():
                 received.append("|C%s|n" % pobj.name)
-                rstrings.append("%s is offline. They will see your message if they list their pages later."
-                                % received[-1])
+                rstrings.append(
+                    "%s is offline. They will see your message if they list their pages later."
+                    % received[-1]
+                )
             else:
                 received.append("|c%s|n" % pobj.name)
         if rstrings:
@@ -814,13 +894,31 @@ def _list_bots(cmd):
         bots (str): A table of bots or an error message.
 
     """
-    ircbots = [bot for bot in AccountDB.objects.filter(db_is_bot=True, username__startswith="ircbot-")]
+    ircbots = [
+        bot for bot in AccountDB.objects.filter(db_is_bot=True, username__startswith="ircbot-")
+    ]
     if ircbots:
-        table = cmd.styled_table("|w#dbref|n", "|wbotname|n", "|wev-channel|n",
-                                 "|wirc-channel|n", "|wSSL|n", maxwidth=_DEFAULT_WIDTH)
+        table = cmd.styled_table(
+            "|w#dbref|n",
+            "|wbotname|n",
+            "|wev-channel|n",
+            "|wirc-channel|n",
+            "|wSSL|n",
+            maxwidth=_DEFAULT_WIDTH,
+        )
         for ircbot in ircbots:
-            ircinfo = "%s (%s:%s)" % (ircbot.db.irc_channel, ircbot.db.irc_network, ircbot.db.irc_port)
-            table.add_row("#%i" % ircbot.id, ircbot.db.irc_botname, ircbot.db.ev_channel, ircinfo, ircbot.db.irc_ssl)
+            ircinfo = "%s (%s:%s)" % (
+                ircbot.db.irc_channel,
+                ircbot.db.irc_network,
+                ircbot.db.irc_port,
+            )
+            table.add_row(
+                "#%i" % ircbot.id,
+                ircbot.db.irc_botname,
+                ircbot.db.ev_channel,
+                ircinfo,
+                ircbot.db.irc_ssl,
+            )
         return table
     else:
         return "No irc bots found."
@@ -870,12 +968,12 @@ def func(self):
             self.msg(string)
             return
 
-        if 'list' in self.switches:
+        if "list" in self.switches:
             # show all connections
             self.msg(_list_bots(self))
             return
 
-        if 'disconnect' in self.switches or 'remove' in self.switches or 'delete' in self.switches:
+        if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches:
             botname = "ircbot-%s" % self.lhs
             matches = AccountDB.objects.filter(db_is_bot=True, username=botname)
             dbref = utils.dbref(self.lhs)
@@ -890,16 +988,19 @@ def func(self):
             return
 
         if not self.args or not self.rhs:
-            string = "Usage: irc2chan[/switches] <evennia_channel> =" \
-                     " <ircnetwork> <port> <#irchannel> <botname>[:typeclass]"
+            string = (
+                "Usage: irc2chan[/switches] <evennia_channel> ="
+                " <ircnetwork> <port> <#irchannel> <botname>[:typeclass]"
+            )
             self.msg(string)
             return
 
         channel = self.lhs
-        self.rhs = self.rhs.replace('#', ' ')  # to avoid Python comment issues
+        self.rhs = self.rhs.replace("#", " ")  # to avoid Python comment issues
         try:
-            irc_network, irc_port, irc_channel, irc_botname = \
-                [part.strip() for part in self.rhs.split(None, 4)]
+            irc_network, irc_port, irc_channel, irc_botname = [
+                part.strip() for part in self.rhs.split(None, 4)
+            ]
             irc_channel = "#%s" % irc_channel
         except Exception:
             string = "IRC bot definition '%s' is not valid." % self.rhs
@@ -928,8 +1029,14 @@ def func(self):
             except Exception as err:
                 self.msg("|rError, could not create the bot:|n '%s'." % err)
                 return
-        bot.start(ev_channel=channel, irc_botname=irc_botname, irc_channel=irc_channel,
-                  irc_network=irc_network, irc_port=irc_port, irc_ssl=irc_ssl)
+        bot.start(
+            ev_channel=channel,
+            irc_botname=irc_botname,
+            irc_channel=irc_channel,
+            irc_network=irc_network,
+            irc_port=irc_port,
+            irc_ssl=irc_ssl,
+        )
         self.msg("Connection created. Starting IRC bot.")
 
 
@@ -951,6 +1058,7 @@ class CmdIRCStatus(COMMAND_DEFAULT_CLASS):
     messages sent to either channel will be lost.
 
     """
+
     key = "ircstatus"
     locks = "cmd:serversetting(IRC_ENABLED) and perm(ircstatus) or perm(Builder))"
     help_category = "Comms"
@@ -974,13 +1082,20 @@ def func(self):
         if utils.dbref(botname):
             matches = AccountDB.objects.filter(db_is_bot=True, id=utils.dbref(botname))
         if not matches:
-            self.msg("No matching IRC-bot found. Use ircstatus without arguments to list active bots.")
+            self.msg(
+                "No matching IRC-bot found. Use ircstatus without arguments to list active bots."
+            )
             return
         ircbot = matches[0]
         channel = ircbot.db.irc_channel
         network = ircbot.db.irc_network
         port = ircbot.db.irc_port
-        chtext = "IRC bot '%s' on channel %s (%s:%s)" % (ircbot.db.irc_botname, channel, network, port)
+        chtext = "IRC bot '%s' on channel %s (%s:%s)" % (
+            ircbot.db.irc_botname,
+            channel,
+            network,
+            port,
+        )
         if option == "ping":
             # check connection by sending outself a ping through the server.
             self.caller.msg("Pinging through %s." % chtext)
@@ -990,7 +1105,9 @@ def func(self):
             # an asynchronous call.
             self.caller.msg("Requesting nicklist from %s (%s:%s)." % (channel, network, port))
             ircbot.get_nicklist(self.caller)
-        elif self.caller.locks.check_lockstring(self.caller, "dummy:perm(ircstatus) or perm(Developer)"):
+        elif self.caller.locks.check_lockstring(
+            self.caller, "dummy:perm(ircstatus) or perm(Developer)"
+        ):
             # reboot the client
             self.caller.msg("Forcing a disconnect + reconnect of %s." % chtext)
             ircbot.reconnect()
@@ -1039,27 +1156,41 @@ def func(self):
             return
         try:
             import feedparser
+
             assert feedparser  # to avoid checker error of not being used
         except ImportError:
-            string = "RSS requires python-feedparser (https://pypi.python.org/pypi/feedparser)." \
-                     " Install before continuing."
+            string = (
+                "RSS requires python-feedparser (https://pypi.python.org/pypi/feedparser)."
+                " Install before continuing."
+            )
             self.msg(string)
             return
 
-        if 'list' in self.switches:
+        if "list" in self.switches:
             # show all connections
-            rssbots = [bot for bot in AccountDB.objects.filter(db_is_bot=True, username__startswith="rssbot-")]
+            rssbots = [
+                bot
+                for bot in AccountDB.objects.filter(db_is_bot=True, username__startswith="rssbot-")
+            ]
             if rssbots:
-                table = self.styled_table("|wdbid|n", "|wupdate rate|n", "|wev-channel",
-                                         "|wRSS feed URL|n", border="cells", maxwidth=_DEFAULT_WIDTH)
+                table = self.styled_table(
+                    "|wdbid|n",
+                    "|wupdate rate|n",
+                    "|wev-channel",
+                    "|wRSS feed URL|n",
+                    border="cells",
+                    maxwidth=_DEFAULT_WIDTH,
+                )
                 for rssbot in rssbots:
-                    table.add_row(rssbot.id, rssbot.db.rss_rate, rssbot.db.ev_channel, rssbot.db.rss_url)
+                    table.add_row(
+                        rssbot.id, rssbot.db.rss_rate, rssbot.db.ev_channel, rssbot.db.rss_url
+                    )
                 self.msg(table)
             else:
                 self.msg("No rss bots found.")
             return
 
-        if 'disconnect' in self.switches or 'remove' in self.switches or 'delete' in self.switches:
+        if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches:
             botname = "rssbot-%s" % self.lhs
             matches = AccountDB.objects.filter(db_is_bot=True, db_key=botname)
             if not matches:
@@ -1131,12 +1262,20 @@ def func(self):
 
         if "list" in self.switches:
             # show all connections
-            gwbots = [bot for bot in
-                      AccountDB.objects.filter(db_is_bot=True,
-                                               username__startswith="grapevinebot-")]
+            gwbots = [
+                bot
+                for bot in AccountDB.objects.filter(
+                    db_is_bot=True, username__startswith="grapevinebot-"
+                )
+            ]
             if gwbots:
-                table = self.styled_table("|wdbid|n", "|wev-channel",
-                                          "|wgw-channel|n", border="cells", maxwidth=_DEFAULT_WIDTH)
+                table = self.styled_table(
+                    "|wdbid|n",
+                    "|wev-channel",
+                    "|wgw-channel|n",
+                    border="cells",
+                    maxwidth=_DEFAULT_WIDTH,
+                )
                 for gwbot in gwbots:
                     table.add_row(gwbot.id, gwbot.db.ev_channel, gwbot.db.grapevine_channel)
                 self.msg(table)
@@ -1144,7 +1283,7 @@ def func(self):
                 self.msg("No grapevine bots found.")
             return
 
-        if 'disconnect' in self.switches or 'remove' in self.switches or 'delete' in self.switches:
+        if "disconnect" in self.switches or "remove" in self.switches or "delete" in self.switches:
             botname = "grapevinebot-%s" % self.lhs
             matches = AccountDB.objects.filter(db_is_bot=True, db_key=botname)
 
diff --git a/evennia/commands/default/general.py b/evennia/commands/default/general.py
index a6200549ff4..56dbf942315 100644
--- a/evennia/commands/default/general.py
+++ b/evennia/commands/default/general.py
@@ -9,9 +9,20 @@
 COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS)
 
 # limit symbol import for API
-__all__ = ("CmdHome", "CmdLook", "CmdNick",
-           "CmdInventory", "CmdSetDesc", "CmdGet", "CmdDrop", "CmdGive",
-           "CmdSay", "CmdWhisper", "CmdPose", "CmdAccess")
+__all__ = (
+    "CmdHome",
+    "CmdLook",
+    "CmdNick",
+    "CmdInventory",
+    "CmdSetDesc",
+    "CmdGet",
+    "CmdDrop",
+    "CmdGive",
+    "CmdSay",
+    "CmdWhisper",
+    "CmdPose",
+    "CmdAccess",
+)
 
 
 class CmdHome(COMMAND_DEFAULT_CLASS):
@@ -52,6 +63,7 @@ class CmdLook(COMMAND_DEFAULT_CLASS):
 
     Observes your location or objects in your vicinity.
     """
+
     key = "look"
     aliases = ["l", "ls"]
     locks = "cmd:all()"
@@ -71,7 +83,7 @@ def func(self):
             target = caller.search(self.args)
             if not target:
                 return
-        self.msg((caller.at_look(target), {'type': 'look'}), options=None)
+        self.msg((caller.at_look(target), {"type": "look"}), options=None)
 
 
 class CmdNick(COMMAND_DEFAULT_CLASS):
@@ -116,6 +128,7 @@ class CmdNick(COMMAND_DEFAULT_CLASS):
     for everyone to use, you need build privileges and the alias command.
 
     """
+
     key = "nick"
     switch_options = ("inputline", "object", "account", "list", "delete", "clearall")
     aliases = ["nickname", "nicks"]
@@ -148,11 +161,13 @@ def _cy(string):
         specified_nicktype = bool(nicktypes)
         nicktypes = nicktypes if specified_nicktype else ["inputline"]
 
-        nicklist = (utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or []) +
-                    utils.make_iter(caller.nicks.get(category="object", return_obj=True) or []) +
-                    utils.make_iter(caller.nicks.get(category="account", return_obj=True) or []))
+        nicklist = (
+            utils.make_iter(caller.nicks.get(category="inputline", return_obj=True) or [])
+            + utils.make_iter(caller.nicks.get(category="object", return_obj=True) or [])
+            + utils.make_iter(caller.nicks.get(category="account", return_obj=True) or [])
+        )
 
-        if 'list' in switches or self.cmdstring in ("nicks",):
+        if "list" in switches or self.cmdstring in ("nicks",):
 
             if not nicklist:
                 string = "|wNo nicks defined.|n"
@@ -160,18 +175,20 @@ def _cy(string):
                 table = self.styled_table("#", "Type", "Nick match", "Replacement")
                 for inum, nickobj in enumerate(nicklist):
                     _, _, nickvalue, replacement = nickobj.value
-                    table.add_row(str(inum + 1), nickobj.db_category, _cy(nickvalue), _cy(replacement))
+                    table.add_row(
+                        str(inum + 1), nickobj.db_category, _cy(nickvalue), _cy(replacement)
+                    )
                 string = "|wDefined Nicks:|n\n%s" % table
             caller.msg(string)
             return
 
-        if 'clearall' in switches:
+        if "clearall" in switches:
             caller.nicks.clear()
             caller.account.nicks.clear()
             caller.msg("Cleared all nicks.")
             return
 
-        if 'delete' in switches or 'del' in switches:
+        if "delete" in switches or "del" in switches:
             if not self.args or not self.lhs:
                 caller.msg("usage nick/delete <nick> or <#num> ('nicks' for list)")
                 return
@@ -199,8 +216,10 @@ def _cy(string):
                     nicktypestr = "%s-nick" % nicktype.capitalize()
                     _, _, old_nickstring, old_replstring = oldnick.value
                     caller.nicks.remove(old_nickstring, category=nicktype)
-                    caller.msg("%s removed: '|w%s|n' -> |w%s|n." % (
-                               nicktypestr, old_nickstring, old_replstring))
+                    caller.msg(
+                        "%s removed: '|w%s|n' -> |w%s|n."
+                        % (nicktypestr, old_nickstring, old_replstring)
+                    )
             else:
                 caller.msg("No matching nicks to remove.")
             return
@@ -211,14 +230,19 @@ def _cy(string):
             if not specified_nicktype:
                 nicktypes = ("object", "account", "inputline")
             for nicktype in nicktypes:
-                nicks = [nick for nick in
-                         utils.make_iter(caller.nicks.get(category=nicktype, return_obj=True))
-                         if nick]
+                nicks = [
+                    nick
+                    for nick in utils.make_iter(
+                        caller.nicks.get(category=nicktype, return_obj=True)
+                    )
+                    if nick
+                ]
                 for nick in nicks:
                     _, _, nick, repl = nick.value
                     if nick.startswith(self.lhs):
-                        strings.append("{}-nick: '{}' -> '{}'".format(
-                            nicktype.capitalize(), nick, repl))
+                        strings.append(
+                            "{}-nick: '{}' -> '{}'".format(nicktype.capitalize(), nick, repl)
+                        )
             if strings:
                 caller.msg("\n".join(strings))
             else:
@@ -239,8 +263,9 @@ def _cy(string):
                 for nick in nicks:
                     _, _, nick, repl = nick.value
                     if nick.startswith(self.lhs):
-                        strings.append("{}-nick: '{}' -> '{}'".format(
-                            nicktype.capitalize(), nick, repl))
+                        strings.append(
+                            "{}-nick: '{}' -> '{}'".format(nicktype.capitalize(), nick, repl)
+                        )
             if strings:
                 caller.msg("\n".join(strings))
             else:
@@ -261,8 +286,9 @@ def _cy(string):
                 for nick in nicks:
                     _, _, nick, repl = nick.value
                     if nick.startswith(self.lhs):
-                        strings.append("{}-nick: '{}' -> '{}'".format(
-                            nicktype.capitalize(), nick, repl))
+                        strings.append(
+                            "{}-nick: '{}' -> '{}'".format(nicktype.capitalize(), nick, repl)
+                        )
             if strings:
                 caller.msg("\n".join(strings))
             else:
@@ -301,17 +327,30 @@ def _cy(string):
                         string += "\nIdentical %s already set." % nicktypestr.lower()
                     else:
                         string += "\n%s '|w%s|n' updated to map to '|w%s|n'." % (
-                                nicktypestr, old_nickstring, replstring)
+                            nicktypestr,
+                            old_nickstring,
+                            replstring,
+                        )
                 else:
-                    string += "\n%s '|w%s|n' mapped to '|w%s|n'." % (nicktypestr, nickstring, replstring)
+                    string += "\n%s '|w%s|n' mapped to '|w%s|n'." % (
+                        nicktypestr,
+                        nickstring,
+                        replstring,
+                    )
                 try:
                     caller.nicks.add(nickstring, replstring, category=nicktype)
                 except NickTemplateInvalid:
-                    caller.msg("You must use the same $-markers both in the nick and in the replacement.")
+                    caller.msg(
+                        "You must use the same $-markers both in the nick and in the replacement."
+                    )
                     return
             elif old_nickstring and old_replstring:
                 # just looking at the nick
-                string += "\n%s '|w%s|n' maps to '|w%s|n'." % (nicktypestr, old_nickstring, old_replstring)
+                string += "\n%s '|w%s|n' maps to '|w%s|n'." % (
+                    nicktypestr,
+                    old_nickstring,
+                    old_replstring,
+                )
                 errstring = ""
         string = errstring if errstring else string
         caller.msg(_cy(string))
@@ -327,6 +366,7 @@ class CmdInventory(COMMAND_DEFAULT_CLASS):
 
     Shows your inventory.
     """
+
     key = "inventory"
     aliases = ["inv", "i"]
     locks = "cmd:all()"
@@ -355,6 +395,7 @@ class CmdGet(COMMAND_DEFAULT_CLASS):
     Picks up an object from your location and puts it in
     your inventory.
     """
+
     key = "get"
     aliases = "grab"
     locks = "cmd:all()"
@@ -374,7 +415,7 @@ def func(self):
         if caller == obj:
             caller.msg("You can't get yourself.")
             return
-        if not obj.access(caller, 'get'):
+        if not obj.access(caller, "get"):
             if obj.db.get_err_msg:
                 caller.msg(obj.db.get_err_msg)
             else:
@@ -387,10 +428,7 @@ def func(self):
 
         obj.move_to(caller, quiet=True)
         caller.msg("You pick up %s." % obj.name)
-        caller.location.msg_contents("%s picks up %s." %
-                                     (caller.name,
-                                      obj.name),
-                                     exclude=caller)
+        caller.location.msg_contents("%s picks up %s." % (caller.name, obj.name), exclude=caller)
         # calling at_get hook method
         obj.at_get(caller)
 
@@ -420,9 +458,12 @@ def func(self):
 
         # Because the DROP command by definition looks for items
         # in inventory, call the search function using location = caller
-        obj = caller.search(self.args, location=caller,
-                            nofound_string="You aren't carrying %s." % self.args,
-                            multimatch_string="You carry more than one %s:" % self.args)
+        obj = caller.search(
+            self.args,
+            location=caller,
+            nofound_string="You aren't carrying %s." % self.args,
+            multimatch_string="You carry more than one %s:" % self.args,
+        )
         if not obj:
             return
 
@@ -432,9 +473,7 @@ def func(self):
 
         obj.move_to(caller.location, quiet=True)
         caller.msg("You drop %s." % (obj.name,))
-        caller.location.msg_contents("%s drops %s." %
-                                     (caller.name, obj.name),
-                                     exclude=caller)
+        caller.location.msg_contents("%s drops %s." % (caller.name, obj.name), exclude=caller)
         # Call the object script's at_drop() method.
         obj.at_drop(caller)
 
@@ -449,6 +488,7 @@ class CmdGive(COMMAND_DEFAULT_CLASS):
     Gives an items from your inventory to another character,
     placing it in their inventory.
     """
+
     key = "give"
     rhs_split = ("=", " to ")  # Prefer = delimiter, but allow " to " usage.
     locks = "cmd:all()"
@@ -461,9 +501,12 @@ def func(self):
         if not self.args or not self.rhs:
             caller.msg("Usage: give <inventory object> = <target>")
             return
-        to_give = caller.search(self.lhs, location=caller,
-                                nofound_string="You aren't carrying %s." % self.lhs,
-                                multimatch_string="You carry more than one %s:" % self.lhs)
+        to_give = caller.search(
+            self.lhs,
+            location=caller,
+            nofound_string="You aren't carrying %s." % self.lhs,
+            multimatch_string="You carry more than one %s:" % self.lhs,
+        )
         target = caller.search(self.rhs)
         if not (to_give and target):
             return
@@ -497,6 +540,7 @@ class CmdSetDesc(COMMAND_DEFAULT_CLASS):
     will be visible to people when they
     look at you.
     """
+
     key = "setdesc"
     locks = "cmd:all()"
     arg_regex = r"\s|$"
@@ -574,7 +618,7 @@ def func(self):
 
         receivers = [recv.strip() for recv in self.lhs.split(",")]
 
-        receivers = [caller.search(receiver) for receiver in receivers]
+        receivers = [caller.search(receiver) for receiver in set(receivers)]
         receivers = [recv for recv in receivers if recv]
 
         speech = self.rhs
@@ -606,6 +650,7 @@ class CmdPose(COMMAND_DEFAULT_CLASS):
     Describe an action being taken. The pose text will
     automatically begin with your name.
     """
+
     key = "pose"
     aliases = [":", "emote"]
     locks = "cmd:all()"
@@ -630,8 +675,7 @@ def func(self):
             self.caller.msg(msg)
         else:
             msg = "%s%s" % (self.caller.name, self.args)
-            self.caller.location.msg_contents(text=(msg, {"type": "pose"}),
-                                              from_obj=self.caller)
+            self.caller.location.msg_contents(text=(msg, {"type": "pose"}), from_obj=self.caller)
 
 
 class CmdAccess(COMMAND_DEFAULT_CLASS):
@@ -644,6 +688,7 @@ class CmdAccess(COMMAND_DEFAULT_CLASS):
     This command shows you the permission hierarchy and
     which permission groups you are a member of.
     """
+
     key = "access"
     aliases = ["groups", "hierarchy"]
     locks = "cmd:all()"
@@ -665,6 +710,6 @@ def func(self):
 
         string += "\n|wYour access|n:"
         string += "\nCharacter |c%s|n: %s" % (caller.key, cperms)
-        if hasattr(caller, 'account'):
+        if hasattr(caller, "account"):
             string += "\nAccount |c%s|n: %s" % (caller.account.key, pperms)
         caller.msg(string)
diff --git a/evennia/commands/default/help.py b/evennia/commands/default/help.py
index f8d212f0e5d..afcfb4f9649 100644
--- a/evennia/commands/default/help.py
+++ b/evennia/commands/default/help.py
@@ -37,8 +37,9 @@ class CmdHelp(Command):
     This will search for help on commands and other
     topics related to the game.
     """
+
     key = "help"
-    aliases = ['?']
+    aliases = ["?"]
     locks = "cmd:all()"
     arg_regex = r"\s|$"
 
@@ -128,7 +129,11 @@ def format_help_list(hdict_cmds, hdict_db):
             string += "\n\n" + _SEP + "\n\r  |COther help entries|n\n" + _SEP
             for category in sorted(hdict_db.keys()):
                 string += "\n\r  |w%s|n:\n" % (str(category).title())
-                string += "|G" + fill(", ".join(sorted([str(topic) for topic in hdict_db[category]]))) + "|n"
+                string += (
+                    "|G"
+                    + fill(", ".join(sorted([str(topic) for topic in hdict_db[category]])))
+                    + "|n"
+                )
         return string
 
     def check_show_help(self, cmd, caller):
@@ -198,9 +203,15 @@ def func(self):
 
         # retrieve all available commands and database topics
         all_cmds = [cmd for cmd in cmdset if self.check_show_help(cmd, caller)]
-        all_topics = [topic for topic in HelpEntry.objects.all() if topic.access(caller, 'view', default=True)]
-        all_categories = list(set([cmd.help_category.lower() for cmd in all_cmds] + [topic.help_category.lower()
-                                                                                     for topic in all_topics]))
+        all_topics = [
+            topic for topic in HelpEntry.objects.all() if topic.access(caller, "view", default=True)
+        ]
+        all_categories = list(
+            set(
+                [cmd.help_category.lower() for cmd in all_cmds]
+                + [topic.help_category.lower() for topic in all_topics]
+            )
+        )
 
         if query in ("list", "all"):
             # we want to list all available help entries, grouped by category
@@ -222,13 +233,23 @@ def func(self):
         # build vocabulary of suggestions and rate them by string similarity.
         suggestions = None
         if suggestion_maxnum > 0:
-            vocabulary = [cmd.key for cmd in all_cmds if cmd] + [topic.key for topic in all_topics] + all_categories
+            vocabulary = (
+                [cmd.key for cmd in all_cmds if cmd]
+                + [topic.key for topic in all_topics]
+                + all_categories
+            )
             [vocabulary.extend(cmd.aliases) for cmd in all_cmds]
-            suggestions = [sugg for sugg in string_suggestions(query, set(vocabulary), cutoff=suggestion_cutoff,
-                                                               maxnum=suggestion_maxnum)
-                           if sugg != query]
+            suggestions = [
+                sugg
+                for sugg in string_suggestions(
+                    query, set(vocabulary), cutoff=suggestion_cutoff, maxnum=suggestion_maxnum
+                )
+                if sugg != query
+            ]
             if not suggestions:
-                suggestions = [sugg for sugg in vocabulary if sugg != query and sugg.startswith(query)]
+                suggestions = [
+                    sugg for sugg in vocabulary if sugg != query and sugg.startswith(query)
+                ]
 
         # try an exact command auto-help match
         match = [cmd for cmd in all_cmds if cmd == query]
@@ -237,37 +258,52 @@ def func(self):
             # try an inexact match with prefixes stripped from query and cmds
             _query = query[1:] if query[0] in CMD_IGNORE_PREFIXES else query
 
-            match = [cmd for cmd in all_cmds
-                    for m in cmd._matchset if m == _query or
-                    m[0] in CMD_IGNORE_PREFIXES and m[1:] == _query]
+            match = [
+                cmd
+                for cmd in all_cmds
+                for m in cmd._matchset
+                if m == _query or m[0] in CMD_IGNORE_PREFIXES and m[1:] == _query
+            ]
 
         if len(match) == 1:
-            formatted = self.format_help_entry(match[0].key,
-                                               match[0].get_help(caller, cmdset),
-                                               aliases=match[0].aliases,
-                                               suggested=suggestions)
+            formatted = self.format_help_entry(
+                match[0].key,
+                match[0].get_help(caller, cmdset),
+                aliases=match[0].aliases,
+                suggested=suggestions,
+            )
             self.msg_help(formatted)
             return
 
         # try an exact database help entry match
         match = list(HelpEntry.objects.find_topicmatch(query, exact=True))
         if len(match) == 1:
-            formatted = self.format_help_entry(match[0].key,
-                                               match[0].entrytext,
-                                               aliases=match[0].aliases.all(),
-                                               suggested=suggestions)
+            formatted = self.format_help_entry(
+                match[0].key,
+                match[0].entrytext,
+                aliases=match[0].aliases.all(),
+                suggested=suggestions,
+            )
             self.msg_help(formatted)
             return
 
         # try to see if a category name was entered
         if query in all_categories:
-            self.msg_help(self.format_help_list({query: [cmd.key for cmd in all_cmds if cmd.help_category == query]},
-                                                {query: [topic.key for topic in all_topics
-                                                         if topic.help_category == query]}))
+            self.msg_help(
+                self.format_help_list(
+                    {query: [cmd.key for cmd in all_cmds if cmd.help_category == query]},
+                    {query: [topic.key for topic in all_topics if topic.help_category == query]},
+                )
+            )
             return
 
         # no exact matches found. Just give suggestions.
-        self.msg((self.format_help_entry("", "No help entry found for '%s'" % query, None, suggested=suggestions), {"type": "help"}))
+        self.msg(
+            self.format_help_entry(
+                "", f"No help entry found for '{query}'", None, suggested=suggestions
+            ),
+            options={"type": "help"},
+        )
 
 
 def _loadhelp(caller):
@@ -316,6 +352,7 @@ class CmdSetHelp(COMMAND_DEFAULT_CLASS):
     is to let everyone read the help file.
 
     """
+
     key = "sethelp"
     switch_options = ("edit", "replace", "append", "extend", "delete")
     locks = "cmd:perm(Helper)"
@@ -328,7 +365,9 @@ def func(self):
         lhslist = self.lhslist
 
         if not self.args:
-            self.msg("Usage: sethelp[/switches] <topic>[;alias;alias][,category[,locks,..] = <text>")
+            self.msg(
+                "Usage: sethelp[/switches] <topic>[;alias;alias][,category[,locks,..] = <text>"
+            )
             return
 
         nlist = len(lhslist)
@@ -356,7 +395,7 @@ def func(self):
             lockstring = ",".join(lhslist[2:]) if nlist > 2 else "view:all()"
         category = category.lower()
 
-        if 'edit' in switches:
+        if "edit" in switches:
             # open the line editor to edit the helptext. No = is needed.
             if old_entry:
                 topicstr = old_entry.key
@@ -365,17 +404,22 @@ def func(self):
                     old_entry.entrytext += "\n%s" % self.rhs
                 helpentry = old_entry
             else:
-                helpentry = create.create_help_entry(topicstr,
-                                                     self.rhs, category=category,
-                                                     locks=lockstring, aliases=aliases)
+                helpentry = create.create_help_entry(
+                    topicstr, self.rhs, category=category, locks=lockstring, aliases=aliases
+                )
             self.caller.db._editing_help = helpentry
 
-            EvEditor(self.caller, loadfunc=_loadhelp, savefunc=_savehelp,
-                     quitfunc=_quithelp, key="topic {}".format(topicstr),
-                     persistent=True)
+            EvEditor(
+                self.caller,
+                loadfunc=_loadhelp,
+                savefunc=_savehelp,
+                quitfunc=_quithelp,
+                key="topic {}".format(topicstr),
+                persistent=True,
+            )
             return
 
-        if 'append' in switches or "merge" in switches or "extend" in switches:
+        if "append" in switches or "merge" in switches or "extend" in switches:
             # merge/append operations
             if not old_entry:
                 self.msg("Could not find topic '%s'. You must give an exact name." % topicstr)
@@ -383,14 +427,14 @@ def func(self):
             if not self.rhs:
                 self.msg("You must supply text to append/merge.")
                 return
-            if 'merge' in switches:
+            if "merge" in switches:
                 old_entry.entrytext += " " + self.rhs
             else:
                 old_entry.entrytext += "\n%s" % self.rhs
             old_entry.aliases.add(aliases)
             self.msg("Entry updated:\n%s%s" % (old_entry.entrytext, aliastxt))
             return
-        if 'delete' in switches or 'del' in switches:
+        if "delete" in switches or "del" in switches:
             # delete the help entry
             if not old_entry:
                 self.msg("Could not find topic '%s'%s." % (topicstr, aliastxt))
@@ -404,7 +448,7 @@ def func(self):
             self.msg("You must supply a help text to add.")
             return
         if old_entry:
-            if 'replace' in switches:
+            if "replace" in switches:
                 # overwrite old entry
                 old_entry.key = topicstr
                 old_entry.entrytext = self.rhs
@@ -415,22 +459,30 @@ def func(self):
                 old_entry.save()
                 self.msg("Overwrote the old topic '%s'%s." % (topicstr, aliastxt))
             else:
-                self.msg("Topic '%s'%s already exists. Use /replace to overwrite "
-                         "or /append or /merge to add text to it." % (topicstr, aliastxt))
+                self.msg(
+                    "Topic '%s'%s already exists. Use /replace to overwrite "
+                    "or /append or /merge to add text to it." % (topicstr, aliastxt)
+                )
         else:
             # no old entry. Create a new one.
-            new_entry = create.create_help_entry(topicstr,
-                                                 self.rhs, category=category,
-                                                 locks=lockstring, aliases=aliases)
+            new_entry = create.create_help_entry(
+                topicstr, self.rhs, category=category, locks=lockstring, aliases=aliases
+            )
             if new_entry:
                 self.msg("Topic '%s'%s was successfully created." % (topicstr, aliastxt))
-                if 'edit' in switches:
+                if "edit" in switches:
                     # open the line editor to edit the helptext
                     self.caller.db._editing_help = new_entry
-                    EvEditor(self.caller, loadfunc=_loadhelp,
-                             savefunc=_savehelp, quitfunc=_quithelp,
-                             key="topic {}".format(new_entry.key),
-                             persistent=True)
+                    EvEditor(
+                        self.caller,
+                        loadfunc=_loadhelp,
+                        savefunc=_savehelp,
+                        quitfunc=_quithelp,
+                        key="topic {}".format(new_entry.key),
+                        persistent=True,
+                    )
                     return
             else:
-                self.msg("Error when creating topic '%s'%s! Contact an admin." % (topicstr, aliastxt))
+                self.msg(
+                    "Error when creating topic '%s'%s! Contact an admin." % (topicstr, aliastxt)
+                )
diff --git a/evennia/commands/default/muxcommand.py b/evennia/commands/default/muxcommand.py
index 23eac2a5266..d288f5f9806 100644
--- a/evennia/commands/default/muxcommand.py
+++ b/evennia/commands/default/muxcommand.py
@@ -121,38 +121,46 @@ def parse(self):
             switches = args[1:].split(None, 1)
             if len(switches) > 1:
                 switches, args = switches
-                switches = switches.split('/')
+                switches = switches.split("/")
             else:
                 args = ""
-                switches = switches[0].split('/')
+                switches = switches[0].split("/")
             # If user-provides switches, parse them with parser switch options.
             if switches and self.switch_options:
                 valid_switches, unused_switches, extra_switches = [], [], []
                 for element in switches:
                     option_check = [opt for opt in self.switch_options if opt == element]
                     if not option_check:
-                        option_check = [opt for opt in self.switch_options if opt.startswith(element)]
+                        option_check = [
+                            opt for opt in self.switch_options if opt.startswith(element)
+                        ]
                     match_count = len(option_check)
                     if match_count > 1:
-                        extra_switches.extend(option_check)  # Either the option provided is ambiguous,
+                        extra_switches.extend(
+                            option_check
+                        )  # Either the option provided is ambiguous,
                     elif match_count == 1:
                         valid_switches.extend(option_check)  # or it is a valid option abbreviation,
                     elif match_count == 0:
                         unused_switches.append(element)  # or an extraneous option to be ignored.
                 if extra_switches:  # User provided switches
-                    self.msg('|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?' %
-                             (self.cmdstring, ' |nor /|C'.join(extra_switches)))
+                    self.msg(
+                        "|g%s|n: |wAmbiguous switch supplied: Did you mean /|C%s|w?"
+                        % (self.cmdstring, " |nor /|C".join(extra_switches))
+                    )
                 if unused_switches:
-                    plural = '' if len(unused_switches) == 1 else 'es'
-                    self.msg('|g%s|n: |wExtra switch%s "/|C%s|w" ignored.' %
-                             (self.cmdstring, plural, '|n, /|C'.join(unused_switches)))
+                    plural = "" if len(unused_switches) == 1 else "es"
+                    self.msg(
+                        '|g%s|n: |wExtra switch%s "/|C%s|w" ignored.'
+                        % (self.cmdstring, plural, "|n, /|C".join(unused_switches))
+                    )
                 switches = valid_switches  # Only include valid_switches in command function call
         arglist = [arg.strip() for arg in args.split()]
 
         # check for arg1, arg2, ... = argA, argB, ... constructs
         lhs, rhs = args.strip(), None
         if lhs:
-            if delimiters and hasattr(delimiters, '__iter__'):  # If delimiter is iterable,
+            if delimiters and hasattr(delimiters, "__iter__"):  # If delimiter is iterable,
                 best_split = delimiters[0]  # (default to first delimiter)
                 for this_split in delimiters:  # try each delimiter
                     if this_split in lhs:  # to find first successful split
@@ -167,8 +175,8 @@ def parse(self):
         rhs = rhs.strip() if rhs is not None else None
         lhs = lhs.strip()
         # Further split left/right sides by comma delimiter
-        lhslist = [arg.strip() for arg in lhs.split(',')] if lhs is not None else ""
-        rhslist = [arg.strip() for arg in rhs.split(',')] if rhs is not None else ""
+        lhslist = [arg.strip() for arg in lhs.split(",")] if lhs is not None else ""
+        rhslist = [arg.strip() for arg in rhs.split(",")] if rhs is not None else ""
         # save to object properties:
         self.raw = raw
         self.switches = switches
@@ -200,7 +208,9 @@ def func(self):
          by the cmdhandler right after self.parser() finishes, and so has access
          to all the variables defined therein.
         """
-        variables = '\n'.join(" |w{}|n ({}): {}".format(key, type(val), val) for key, val in self.__dict__.items())
+        variables = "\n".join(
+            " |w{}|n ({}): {}".format(key, type(val), val) for key, val in self.__dict__.items()
+        )
         string = f"""
 Command {self} has no defined `func()` - showing on-command variables: No child func() defined for {self} - available variables:
 {variables}
diff --git a/evennia/commands/default/syscommands.py b/evennia/commands/default/syscommands.py
index 5a1fbf1ce03..b6291d94d02 100644
--- a/evennia/commands/default/syscommands.py
+++ b/evennia/commands/default/syscommands.py
@@ -31,6 +31,7 @@
 from evennia.utils import utils
 
 from django.conf import settings
+
 COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS)
 
 # Command called when there is no input at line
@@ -41,6 +42,7 @@ class SystemNoInput(COMMAND_DEFAULT_CLASS):
     """
     This is called when there is no input given
     """
+
     key = CMD_NOINPUT
     locks = "cmd:all()"
 
@@ -57,6 +59,7 @@ class SystemNoMatch(COMMAND_DEFAULT_CLASS):
     """
     No command was found matching the given input.
     """
+
     key = CMD_NOMATCH
     locks = "cmd:all()"
 
@@ -86,6 +89,7 @@ class SystemMultimatch(COMMAND_DEFAULT_CLASS):
     the `raw_cmdname` is the cmdname unmodified by eventual prefix-stripping.
 
     """
+
     key = CMD_MULTIMATCH
     locks = "cmd:all()"
 
@@ -99,8 +103,7 @@ def func(self):
         # evennia.commands.cmdparse.create_match for more details.
         matches = self.matches
         # at_search_result will itself msg the multimatch options to the caller.
-        at_search_result(
-                    [match[2] for match in matches], self.caller, query=matches[0][0])
+        at_search_result([match[2] for match in matches], self.caller, query=matches[0][0])
 
 
 # Command called when the command given at the command line
@@ -108,6 +111,7 @@ def func(self):
 # channel named 'ooc' and the user wrote
 #  > ooc Hello!
 
+
 class SystemSendToChannel(COMMAND_DEFAULT_CLASS):
     """
     This is a special command that the cmdhandler calls
@@ -119,7 +123,7 @@ class SystemSendToChannel(COMMAND_DEFAULT_CLASS):
     locks = "cmd:all()"
 
     def parse(self):
-        channelname, msg = self.args.split(':', 1)
+        channelname, msg = self.args.split(":", 1)
         self.args = channelname.strip(), msg.strip()
 
     def func(self):
@@ -140,7 +144,7 @@ def func(self):
             string = "You are not connected to channel '%s'."
             caller.msg(string % channelkey)
             return
-        if not channel.access(caller, 'send'):
+        if not channel.access(caller, "send"):
             string = "You are not permitted to send to channel '%s'."
             caller.msg(string % channelkey)
             return
diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py
index 268fa66d096..f89018dce0d 100644
--- a/evennia/commands/default/system.py
+++ b/evennia/commands/default/system.py
@@ -32,9 +32,18 @@
 _IDMAPPER = None
 
 # limit symbol import for API
-__all__ = ("CmdReload", "CmdReset", "CmdShutdown", "CmdPy",
-           "CmdScripts", "CmdObjects", "CmdService", "CmdAbout",
-           "CmdTime", "CmdServerLoad")
+__all__ = (
+    "CmdReload",
+    "CmdReset",
+    "CmdShutdown",
+    "CmdPy",
+    "CmdScripts",
+    "CmdObjects",
+    "CmdService",
+    "CmdAbout",
+    "CmdTime",
+    "CmdServerLoad",
+)
 
 
 class CmdReload(COMMAND_DEFAULT_CLASS):
@@ -48,8 +57,9 @@ class CmdReload(COMMAND_DEFAULT_CLASS):
     affected. Non-persistent scripts will survive a reload (use
     reset to purge) and at_reload() hooks will be called.
     """
+
     key = "reload"
-    aliases = ['restart']
+    aliases = ["restart"]
     locks = "cmd:perm(reload) or perm(Developer)"
     help_category = "System"
 
@@ -84,8 +94,9 @@ class CmdReset(COMMAND_DEFAULT_CLASS):
     cmdsets etc will be wiped.
 
     """
+
     key = "reset"
-    aliases = ['reboot']
+    aliases = ["reboot"]
     locks = "cmd:perm(reload) or perm(Developer)"
     help_category = "System"
 
@@ -107,6 +118,7 @@ class CmdShutdown(COMMAND_DEFAULT_CLASS):
 
     Gracefully shut down both Server and Portal.
     """
+
     key = "shutdown"
     locks = "cmd:perm(shutdown) or perm(Developer)"
     help_category = "System"
@@ -116,11 +128,11 @@ def func(self):
         # Only allow shutdown if caller has session
         if not self.caller.sessions.get():
             return
-        self.msg('Shutting down server ...')
+        self.msg("Shutting down server ...")
         announcement = "\nServer is being SHUT DOWN!\n"
         if self.args:
             announcement += "%s\n" % self.args
-        logger.log_info('Server shutdown by %s.' % self.caller.name)
+        logger.log_info("Server shutdown by %s." % self.caller.name)
         SESSIONS.announce_all(announcement)
         SESSIONS.portal_shutdown()
 
@@ -135,13 +147,11 @@ def _py_code(caller, buf):
     """
     measure_time = caller.db._py_measure_time
     client_raw = caller.db._py_clientraw
-    string = "Executing code%s ..." % (
-        " (measure timing)" if measure_time else "")
+    string = "Executing code%s ..." % (" (measure timing)" if measure_time else "")
     caller.msg(string)
-    _run_code_snippet(caller, buf, mode="exec",
-                      measure_time=measure_time,
-                      client_raw=client_raw,
-                      show_input=False)
+    _run_code_snippet(
+        caller, buf, mode="exec", measure_time=measure_time, client_raw=client_raw, show_input=False
+    )
     return True
 
 
@@ -150,8 +160,9 @@ def _py_quit(caller):
     caller.msg("Exited the code editor.")
 
 
-def _run_code_snippet(caller, pycode, mode="eval", measure_time=False,
-                      client_raw=False, show_input=True):
+def _run_code_snippet(
+    caller, pycode, mode="eval", measure_time=False, client_raw=False, show_input=True
+):
     """
     Run code and try to display information to the caller.
 
@@ -173,14 +184,10 @@ def _run_code_snippet(caller, pycode, mode="eval", measure_time=False,
     if show_input:
         for session in sessions:
             try:
-                caller.msg(">>> %s" % pycode, session=session,
-                           options={"raw": True})
+                caller.msg(">>> %s" % pycode, session=session, options={"raw": True})
             except TypeError:
                 caller.msg(">>> %s" % pycode, options={"raw": True})
 
-
-
-
     try:
         # reroute standard output to game client console
         old_stdout = sys.stdout
@@ -214,7 +221,7 @@ def write(self, string):
             ret = eval(pycode_compiled, {}, available_vars)
 
     except Exception:
-        errlist = traceback.format_exc().split('\n')
+        errlist = traceback.format_exc().split("\n")
         if len(errlist) > 4:
             errlist = errlist[4:]
         ret = "\n".join("%s" % line for line in errlist if line)
@@ -223,31 +230,30 @@ def write(self, string):
         sys.stdout = old_stdout
         sys.stderr = old_stderr
 
-    if not ret:
+    if ret is None:
         return
 
     for session in sessions:
         try:
-            caller.msg(ret, session=session, options={"raw": True,
-                                                      "client_raw": client_raw})
+            caller.msg(ret, session=session, options={"raw": True, "client_raw": client_raw})
         except TypeError:
-            caller.msg(ret, options={"raw": True,
-                                     "client_raw": client_raw})
+            caller.msg(ret, options={"raw": True, "client_raw": client_raw})
+
+
 def evennia_local_vars(caller):
     """Return Evennia local variables usable in the py command as a dictionary."""
     import evennia
+
     return {
-        'self': caller,
-        'me': caller,
-        'here': getattr(caller, "location", None),
-        'evennia': evennia,
-        'ev': evennia,
-        'inherits_from': utils.inherits_from,
+        "self": caller,
+        "me": caller,
+        "here": getattr(caller, "location", None),
+        "evennia": evennia,
+        "ev": evennia,
+        "inherits_from": utils.inherits_from,
     }
 
 
-
-
 class EvenniaPythonConsole(code.InteractiveConsole):
 
     """Evennia wrapper around a Python interactive console."""
@@ -264,6 +270,7 @@ def push(self, line):
         """Push some code, whether complete or not."""
         old_stdout = sys.stdout
         old_stderr = sys.stderr
+
         class FakeStd:
             def __init__(self, caller):
                 self.caller = caller
@@ -274,9 +281,14 @@ def write(self, string):
         fake_std = FakeStd(self.caller)
         sys.stdout = fake_std
         sys.stderr = fake_std
-        result = super().push(line)
-        sys.stdout = old_stdout
-        sys.stderr = old_stderr
+        result = None
+        try:
+            result = super().push(line)
+        except SystemExit:
+            pass
+        finally:
+            sys.stdout = old_stdout
+            sys.stderr = old_stderr
         return result
 
 
@@ -298,8 +310,8 @@ class CmdPy(COMMAND_DEFAULT_CLASS):
         being parsed as HTML in the webclient but not in telnet clients)
 
     Without argument, open a Python console in-game. This is a full console,
-    accepting multi-line Python code for testing and debugging. Type `exit` to
-    return to the game. If Evennia is reloaded, thek console will be closed.
+    accepting multi-line Python code for testing and debugging. Type `exit()` to
+    return to the game. If Evennia is reloaded, the console will be closed.
 
     Enter a line of instruction after the 'py' command to execute it
     immediately.  Separate multiple commands by ';' or open the code editor
@@ -324,6 +336,7 @@ class CmdPy(COMMAND_DEFAULT_CLASS):
     should only be accessible by trusted server admins/superusers.|n
 
     """
+
     key = "py"
     aliases = ["!"]
     switch_options = ("time", "edit", "clientraw")
@@ -339,27 +352,40 @@ def func(self):
         if "edit" in self.switches:
             caller.db._py_measure_time = "time" in self.switches
             caller.db._py_clientraw = "clientraw" in self.switches
-            EvEditor(self.caller, loadfunc=_py_load, savefunc=_py_code,
-                     quitfunc=_py_quit, key="Python exec: :w  or :!", persistent=True,
-                     codefunc=_py_code)
+            EvEditor(
+                self.caller,
+                loadfunc=_py_load,
+                savefunc=_py_code,
+                quitfunc=_py_quit,
+                key="Python exec: :w  or :!",
+                persistent=True,
+                codefunc=_py_code,
+            )
             return
 
         if not pycode:
             # Run in interactive mode
             console = EvenniaPythonConsole(self.caller)
-            banner = (f"|gPython {sys.version} on {sys.platform}\n"
-                      "Evennia interactive console mode - type 'exit()' to leave.|n")
+            banner = (
+                f"|gPython {sys.version} on {sys.platform}\n"
+                "Evennia interactive console mode - type 'exit()' to leave.|n"
+            )
             self.msg(banner)
             line = ""
             prompt = ">>>"
             while line.lower() not in ("exit", "exit()"):
-                line = yield(prompt)
+                line = yield (prompt)
                 prompt = "..." if console.push(line) else ">>>"
             self.msg("|gClosing the Python console.|n")
             return
 
-        _run_code_snippet(caller, self.args, measure_time="time" in self.switches,
-                          client_raw="clientraw" in self.switches)
+        _run_code_snippet(
+            caller,
+            self.args,
+            measure_time="time" in self.switches,
+            client_raw="clientraw" in self.switches,
+        )
+
 
 # helper function. Kept outside so it can be imported and run
 # by other commands.
@@ -370,9 +396,19 @@ def format_script_list(scripts):
     if not scripts:
         return "<No scripts>"
 
-    table = EvTable("|wdbref|n", "|wobj|n", "|wkey|n", "|wintval|n", "|wnext|n",
-                    "|wrept|n", "|wdb", "|wtypeclass|n", "|wdesc|n",
-                    align='r', border="tablecols")
+    table = EvTable(
+        "|wdbref|n",
+        "|wobj|n",
+        "|wkey|n",
+        "|wintval|n",
+        "|wnext|n",
+        "|wrept|n",
+        "|wdb",
+        "|wtypeclass|n",
+        "|wdesc|n",
+        align="r",
+        border="tablecols",
+    )
     for script in scripts:
         nextrep = script.time_until_next_repeat()
         if nextrep is None:
@@ -386,15 +422,17 @@ def format_script_list(scripts):
         else:
             rept = "-/-"
 
-        table.add_row(script.id,
-                      script.obj.key if (hasattr(script, 'obj') and script.obj) else "<Global>",
-                      script.key,
-                      script.interval if script.interval > 0 else "--",
-                      nextrep,
-                      rept,
-                      "*" if script.persistent else "-",
-                      script.typeclass_path.rsplit('.', 1)[-1],
-                      crop(script.desc, width=20))
+        table.add_row(
+            script.id,
+            script.obj.key if (hasattr(script, "obj") and script.obj) else "<Global>",
+            script.key,
+            script.interval if script.interval > 0 else "--",
+            nextrep,
+            rept,
+            "*" if script.persistent else "-",
+            script.typeclass_path.rsplit(".", 1)[-1],
+            crop(script.desc, width=20),
+        )
     return "%s" % table
 
 
@@ -419,6 +457,7 @@ class CmdScripts(COMMAND_DEFAULT_CLASS):
 
     Use script for managing commands on objects.
     """
+
     key = "scripts"
     aliases = ["globalscript", "listscripts"]
     switch_options = ("start", "stop", "kill", "validate")
@@ -463,11 +502,11 @@ def func(self):
             caller.msg(string)
             return
 
-        if self.switches and self.switches[0] in ('stop', 'del', 'delete', 'kill'):
+        if self.switches and self.switches[0] in ("stop", "del", "delete", "kill"):
             # we want to delete something
             if len(scripts) == 1:
                 # we have a unique match!
-                if 'kill' in self.switches:
+                if "kill" in self.switches:
                     string = "Killing script '%s'" % scripts[0].key
                     scripts[0].stop(kill=True)
                 else:
@@ -502,8 +541,9 @@ class CmdObjects(COMMAND_DEFAULT_CLASS):
     a list of <nr> latest objects in database. If not
     given, <nr> defaults to 10.
     """
+
     key = "objects"
-    aliases = ["listobjects", "listobjs", 'stats', 'db']
+    aliases = ["listobjects", "listobjs", "stats", "db"]
     locks = "cmd:perm(listobjects) or perm(Builder)"
     help_category = "System"
 
@@ -523,33 +563,49 @@ def func(self):
         nobjs = nobjs or 1  # fix zero-div error with empty database
 
         # total object sum table
-        totaltable = self.styled_table("|wtype|n", "|wcomment|n", "|wcount|n", "|w%|n",
-                                      border="table", align="l")
-        totaltable.align = 'l'
-        totaltable.add_row("Characters", "(BASE_CHARACTER_TYPECLASS + children)",
-                           nchars, "%.2f" % ((float(nchars) / nobjs) * 100))
-        totaltable.add_row("Rooms", "(BASE_ROOM_TYPECKLASS + children)",
-                           nrooms, "%.2f" % ((float(nrooms) / nobjs) * 100))
-        totaltable.add_row("Exits", "(BASE_EXIT_TYPECLASS + children)",
-                           nexits, "%.2f" % ((float(nexits) / nobjs) * 100))
+        totaltable = self.styled_table(
+            "|wtype|n", "|wcomment|n", "|wcount|n", "|w%|n", border="table", align="l"
+        )
+        totaltable.align = "l"
+        totaltable.add_row(
+            "Characters",
+            "(BASE_CHARACTER_TYPECLASS + children)",
+            nchars,
+            "%.2f" % ((float(nchars) / nobjs) * 100),
+        )
+        totaltable.add_row(
+            "Rooms",
+            "(BASE_ROOM_TYPECLASS + children)",
+            nrooms,
+            "%.2f" % ((float(nrooms) / nobjs) * 100),
+        )
+        totaltable.add_row(
+            "Exits",
+            "(BASE_EXIT_TYPECLASS + children)",
+            nexits,
+            "%.2f" % ((float(nexits) / nobjs) * 100),
+        )
         totaltable.add_row("Other", "", nother, "%.2f" % ((float(nother) / nobjs) * 100))
 
         # typeclass table
-        typetable = self.styled_table("|wtypeclass|n", "|wcount|n", "|w%|n",
-                                     border="table", align="l")
-        typetable.align = 'l'
+        typetable = self.styled_table(
+            "|wtypeclass|n", "|wcount|n", "|w%|n", border="table", align="l"
+        )
+        typetable.align = "l"
         dbtotals = ObjectDB.objects.object_totals()
         for path, count in dbtotals.items():
             typetable.add_row(path, count, "%.2f" % ((float(count) / nobjs) * 100))
 
         # last N table
-        objs = ObjectDB.objects.all().order_by("db_date_created")[max(0, nobjs - nlim):]
-        latesttable = self.styled_table("|wcreated|n", "|wdbref|n", "|wname|n",
-                                       "|wtypeclass|n", align="l", border="table")
-        latesttable.align = 'l'
+        objs = ObjectDB.objects.all().order_by("db_date_created")[max(0, nobjs - nlim) :]
+        latesttable = self.styled_table(
+            "|wcreated|n", "|wdbref|n", "|wname|n", "|wtypeclass|n", align="l", border="table"
+        )
+        latesttable.align = "l"
         for obj in objs:
-            latesttable.add_row(utils.datetime_format(obj.date_created),
-                                obj.dbref, obj.key, obj.path)
+            latesttable.add_row(
+                utils.datetime_format(obj.date_created), obj.dbref, obj.key, obj.path
+            )
 
         string = "\n|wObject subtype totals (out of %i Objects):|n\n%s" % (nobjs, totaltable)
         string += "\n|wObject typeclass distribution:|n\n%s" % typetable
@@ -572,9 +628,10 @@ class CmdAccounts(COMMAND_DEFAULT_CLASS):
     It will list the <nr> amount of latest registered accounts
     If not given, <nr> defaults to 10.
     """
+
     key = "accounts"
     aliases = ["account", "listaccounts"]
-    switch_options = ("delete", )
+    switch_options = ("delete",)
     locks = "cmd:perm(listaccounts) or perm(Admin)"
     help_category = "System"
 
@@ -612,11 +669,13 @@ def func(self):
                 return
             username = account.username
             # ask for confirmation
-            confirm = ("It is often better to block access to an account rather than to delete it. "
-                       "|yAre you sure you want to permanently delete "
-                       "account '|n{}|y'|n yes/[no]?".format(username))
-            answer = yield(confirm)
-            if answer.lower() not in ('y', 'yes'):
+            confirm = (
+                "It is often better to block access to an account rather than to delete it. "
+                "|yAre you sure you want to permanently delete "
+                "account '|n{}|y'|n yes/[no]?".format(username)
+            )
+            answer = yield (confirm)
+            if answer.lower() not in ("y", "yes"):
                 caller.msg("Canceled deletion.")
                 return
 
@@ -626,7 +685,10 @@ def func(self):
             if reason:
                 string += " Reason given:\n  '%s'" % reason
             account.msg(string)
-            logger.log_sec("Account Deleted: %s (Reason: %s, Caller: %s, IP: %s)." % (account, reason, caller, self.session.address))
+            logger.log_sec(
+                "Account Deleted: %s (Reason: %s, Caller: %s, IP: %s)."
+                % (account, reason, caller, self.session.address)
+            )
             account.delete()
             self.msg("Account %s was successfully deleted." % username)
             return
@@ -641,14 +703,20 @@ def func(self):
 
         # typeclass table
         dbtotals = AccountDB.objects.object_totals()
-        typetable = self.styled_table("|wtypeclass|n", "|wcount|n", "|w%%|n", border="cells", align="l")
+        typetable = self.styled_table(
+            "|wtypeclass|n", "|wcount|n", "|w%%|n", border="cells", align="l"
+        )
         for path, count in dbtotals.items():
             typetable.add_row(path, count, "%.2f" % ((float(count) / naccounts) * 100))
         # last N table
-        plyrs = AccountDB.objects.all().order_by("db_date_created")[max(0, naccounts - nlim):]
-        latesttable = self.styled_table("|wcreated|n", "|wdbref|n", "|wname|n", "|wtypeclass|n", border="cells", align="l")
+        plyrs = AccountDB.objects.all().order_by("db_date_created")[max(0, naccounts - nlim) :]
+        latesttable = self.styled_table(
+            "|wcreated|n", "|wdbref|n", "|wname|n", "|wtypeclass|n", border="cells", align="l"
+        )
         for ply in plyrs:
-            latesttable.add_row(utils.datetime_format(ply.date_created), ply.dbref, ply.key, ply.path)
+            latesttable.add_row(
+                utils.datetime_format(ply.date_created), ply.dbref, ply.key, ply.path
+            )
 
         string = "\n|wAccount typeclass distribution:|n\n%s" % typetable
         string += "\n|wLast %s Accounts created:|n\n%s" % (min(naccounts, nlim), latesttable)
@@ -697,7 +765,9 @@ def func(self):
         if not switches or switches[0] == "list":
             # Just display the list of installed services and their
             # status, then exit.
-            table = self.styled_table("|wService|n (use services/start|stop|delete)", "|wstatus", align="l")
+            table = self.styled_table(
+                "|wService|n (use services/start|stop|delete)", "|wstatus", align="l"
+            )
             for service in service_collection.services:
                 table.add_row(service.name, service.running and "|gRunning" or "|rNot Running")
             caller.msg(str(table))
@@ -708,8 +778,8 @@ def func(self):
         try:
             service = service_collection.getServiceNamed(self.args)
         except Exception:
-            string = 'Invalid service name. This command is case-sensitive. '
-            string += 'See service/list for valid service name (enter the full name exactly).'
+            string = "Invalid service name. This command is case-sensitive. "
+            string += "See service/list for valid service name (enter the full name exactly)."
             caller.msg(string)
             return
 
@@ -719,9 +789,9 @@ def func(self):
 
             delmode = switches[0] == "delete"
             if not service.running:
-                caller.msg('That service is not currently running.')
+                caller.msg("That service is not currently running.")
                 return
-            if service.name[:7] == 'Evennia':
+            if service.name[:7] == "Evennia":
                 if delmode:
                     caller.msg("You cannot remove a core Evennia service (named 'Evennia***').")
                     return
@@ -743,7 +813,7 @@ def func(self):
         if switches[0] == "start":
             # Attempt to start a service.
             if service.running:
-                caller.msg('That service is already running.')
+                caller.msg("That service is already running.")
                 return
             caller.msg("Starting service '%s'." % self.args)
             service.startService()
@@ -768,8 +838,13 @@ def func(self):
         """Display information about server or target"""
 
         string = """
-         |cEvennia|n {version}|n
-         MU* development system
+         |cEvennia|n MU* development system
+
+         |wEvennia version|n: {version}
+         |wOS|n: {os}
+         |wPython|n: {python}
+         |wTwisted|n: {twisted}
+         |wDjango|n: {django}
 
          |wLicence|n https://opensource.org/licenses/BSD-3-Clause
          |wWeb|n http://www.evennia.com
@@ -778,15 +853,13 @@ def func(self):
          |wMaintainer|n (2010-)   Griatch (griatch AT gmail DOT com)
          |wMaintainer|n (2006-10) Greg Taylor
 
-         |wOS|n {os}
-         |wPython|n {python}
-         |wTwisted|n {twisted}
-         |wDjango|n {django}
-        """.format(version=utils.get_evennia_version(),
-                   os=os.name,
-                   python=sys.version.split()[0],
-                   twisted=twisted.version.short(),
-                   django=django.get_version())
+        """.format(
+            version=utils.get_evennia_version(),
+            os=os.name,
+            python=sys.version.split()[0],
+            twisted=twisted.version.short(),
+            django=django.get_version(),
+        )
         self.caller.msg(string)
 
 
@@ -800,6 +873,7 @@ class CmdTime(COMMAND_DEFAULT_CLASS):
     List Server time statistics such as uptime
     and the current time stamp.
     """
+
     key = "time"
     aliases = "uptime"
     locks = "cmd:perm(time) or perm(Player)"
@@ -814,11 +888,19 @@ def func(self):
         table1.add_row("First start", datetime.datetime.fromtimestamp(gametime.server_epoch()))
         table1.add_row("Current time", datetime.datetime.now())
         table1.reformat_column(0, width=30)
-        table2 = self.styled_table("|wIn-Game time", "|wReal time x %g" % gametime.TIMEFACTOR, align="l", width=77, border_top=0)
+        table2 = self.styled_table(
+            "|wIn-Game time",
+            "|wReal time x %g" % gametime.TIMEFACTOR,
+            align="l",
+            width=77,
+            border_top=0,
+        )
         epochtxt = "Epoch (%s)" % ("from settings" if settings.TIME_GAME_EPOCH else "server start")
         table2.add_row(epochtxt, datetime.datetime.fromtimestamp(gametime.game_epoch()))
         table2.add_row("Total time passed:", utils.time_format(gametime.gametime(), 2))
-        table2.add_row("Current time ", datetime.datetime.fromtimestamp(gametime.gametime(absolute=True)))
+        table2.add_row(
+            "Current time ", datetime.datetime.fromtimestamp(gametime.gametime(absolute=True))
+        )
         table2.reformat_column(0, width=30)
         self.caller.msg(str(table1) + "\n" + str(table2))
 
@@ -859,6 +941,7 @@ class CmdServerLoad(COMMAND_DEFAULT_CLASS):
     the released memory will instead be re-used by the program.
 
     """
+
     key = "server"
     aliases = ["serverload", "serverprocess"]
     switch_options = ("mem", "flushmem")
@@ -877,8 +960,10 @@ def func(self):
             prev, _ = _IDMAPPER.cache_size()
             nflushed = _IDMAPPER.flush_cache()
             now, _ = _IDMAPPER.cache_size()
-            string = "The Idmapper cache freed |w{idmapper}|n database objects.\n" \
-                     "The Python garbage collector freed |w{gc}|n Python instances total."
+            string = (
+                "The Idmapper cache freed |w{idmapper}|n database objects.\n"
+                "The Python garbage collector freed |w{gc}|n Python instances total."
+            )
             self.caller.msg(string.format(idmapper=(prev - now), gc=nflushed))
             return
 
@@ -893,6 +978,7 @@ def func(self):
             # unfortunately, since it's not specific to the process) /rant
             try:
                 import psutil
+
                 has_psutil = True
             except ImportError:
                 has_psutil = False
@@ -913,8 +999,10 @@ def func(self):
                 loadtable.add_row("Total computer memory usage", "%g MB (%g%%)" % (rmem, pmem))
                 loadtable.add_row("Process ID", "%g" % pid),
             else:
-                loadtable = "Not available on Windows without 'psutil' library " \
-                            "(install with |wpip install psutil|n)."
+                loadtable = (
+                    "Not available on Windows without 'psutil' library "
+                    "(install with |wpip install psutil|n)."
+                )
 
         else:
             # Linux / BSD (OSX) - proper pid-based statistics
@@ -924,9 +1012,15 @@ def func(self):
                 import resource as _RESOURCE
 
             loadavg = os.getloadavg()[0]
-            rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rss")).read()) / 1000.0  # resident memory
-            vmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "vsz")).read()) / 1000.0  # virtual memory
-            pmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "%mem")).read())  # % of resident memory to total
+            rmem = (
+                float(os.popen("ps -p %d -o %s | tail -1" % (pid, "rss")).read()) / 1000.0
+            )  # resident memory
+            vmem = (
+                float(os.popen("ps -p %d -o %s | tail -1" % (pid, "vsz")).read()) / 1000.0
+            )  # virtual memory
+            pmem = float(
+                os.popen("ps -p %d -o %s | tail -1" % (pid, "%mem")).read()
+            )  # % of resident memory to total
             rusage = _RESOURCE.getrusage(_RESOURCE.RUSAGE_SELF)
 
             if "mem" in self.switches:
@@ -940,16 +1034,28 @@ def func(self):
             loadtable.add_row("Memory usage", "%g MB (%g%%)" % (rmem, pmem))
             loadtable.add_row("Virtual address space", "")
             loadtable.add_row("|x(resident+swap+caching)|n", "%g MB" % vmem)
-            loadtable.add_row("CPU time used (total)", "%s (%gs)"
-                              % (utils.time_format(rusage.ru_utime), rusage.ru_utime))
-            loadtable.add_row("CPU time used (user)", "%s (%gs)"
-                              % (utils.time_format(rusage.ru_stime), rusage.ru_stime))
-            loadtable.add_row("Page faults", "%g hard,  %g soft, %g swapouts"
-                              % (rusage.ru_majflt, rusage.ru_minflt, rusage.ru_nswap))
-            loadtable.add_row("Disk I/O", "%g reads, %g writes" % (rusage.ru_inblock, rusage.ru_oublock))
+            loadtable.add_row(
+                "CPU time used (total)",
+                "%s (%gs)" % (utils.time_format(rusage.ru_utime), rusage.ru_utime),
+            )
+            loadtable.add_row(
+                "CPU time used (user)",
+                "%s (%gs)" % (utils.time_format(rusage.ru_stime), rusage.ru_stime),
+            )
+            loadtable.add_row(
+                "Page faults",
+                "%g hard,  %g soft, %g swapouts"
+                % (rusage.ru_majflt, rusage.ru_minflt, rusage.ru_nswap),
+            )
+            loadtable.add_row(
+                "Disk I/O", "%g reads, %g writes" % (rusage.ru_inblock, rusage.ru_oublock)
+            )
             loadtable.add_row("Network I/O", "%g in, %g out" % (rusage.ru_msgrcv, rusage.ru_msgsnd))
-            loadtable.add_row("Context switching", "%g vol, %g forced, %g signals"
-                              % (rusage.ru_nvcsw, rusage.ru_nivcsw, rusage.ru_nsignals))
+            loadtable.add_row(
+                "Context switching",
+                "%g vol, %g forced, %g signals"
+                % (rusage.ru_nvcsw, rusage.ru_nivcsw, rusage.ru_nsignals),
+            )
 
         # os-generic
 
@@ -957,8 +1063,11 @@ def func(self):
 
         # object cache count (note that sys.getsiseof is not called so this works for pypy too.
         total_num, cachedict = _IDMAPPER.cache_size()
-        sorted_cache = sorted([(key, num) for key, num in cachedict.items() if num > 0],
-                              key=lambda tup: tup[1], reverse=True)
+        sorted_cache = sorted(
+            [(key, num) for key, num in cachedict.items() if num > 0],
+            key=lambda tup: tup[1],
+            reverse=True,
+        )
         memtable = self.styled_table("entity name", "number", "idmapper %", align="l")
         for tup in sorted_cache:
             memtable.add_row(tup[0], "%i" % tup[1], "%.2f" % (float(tup[1]) / total_num * 100))
@@ -981,22 +1090,29 @@ class CmdTickers(COMMAND_DEFAULT_CLASS):
     inspecting the current status.
 
     """
+
     key = "tickers"
     help_category = "System"
     locks = "cmd:perm(tickers) or perm(Builder)"
 
     def func(self):
         from evennia import TICKER_HANDLER
+
         all_subs = TICKER_HANDLER.all_display()
         if not all_subs:
             self.caller.msg("No tickers are currently active.")
             return
         table = self.styled_table("interval (s)", "object", "path/methodname", "idstring", "db")
         for sub in all_subs:
-            table.add_row(sub[3],
-                          "%s%s" % (sub[0] or "[None]",
-                                    sub[0] and " (#%s)" % (sub[0].id if hasattr(sub[0], "id") else "") or ""),
-                          sub[1] if sub[1] else sub[2],
-                          sub[4] or "[Unset]",
-                          "*" if sub[5] else "-")
+            table.add_row(
+                sub[3],
+                "%s%s"
+                % (
+                    sub[0] or "[None]",
+                    sub[0] and " (#%s)" % (sub[0].id if hasattr(sub[0], "id") else "") or "",
+                ),
+                sub[1] if sub[1] else sub[2],
+                sub[4] or "[Unset]",
+                "*" if sub[5] else "-",
+            )
         self.caller.msg("|wActive tickers|n:\n" + str(table))
diff --git a/evennia/commands/default/tests.py b/evennia/commands/default/tests.py
index e9fc8898121..38d5646e047 100644
--- a/evennia/commands/default/tests.py
+++ b/evennia/commands/default/tests.py
@@ -22,7 +22,18 @@
 from evennia import DefaultRoom, DefaultExit
 from evennia.commands.default.cmdset_character import CharacterCmdSet
 from evennia.utils.test_resources import EvenniaTest
-from evennia.commands.default import help, general, system, admin, account, building, batchprocess, comms, unloggedin, syscommands
+from evennia.commands.default import (
+    help,
+    general,
+    system,
+    admin,
+    account,
+    building,
+    batchprocess,
+    comms,
+    unloggedin,
+    syscommands,
+)
 from evennia.commands.cmdparser import build_matches
 from evennia.commands.default.muxcommand import MuxCommand
 from evennia.commands.command import Command, InterruptCommand
@@ -49,8 +60,21 @@ class CommandTest(EvenniaTest):
     """
     Tests a command
     """
-    def call(self, cmdobj, args, msg=None, cmdset=None, noansi=True, caller=None,
-             receiver=None, cmdstring=None, obj=None, inputs=None, raw_string=None):
+
+    def call(
+        self,
+        cmdobj,
+        args,
+        msg=None,
+        cmdset=None,
+        noansi=True,
+        caller=None,
+        receiver=None,
+        cmdstring=None,
+        obj=None,
+        inputs=None,
+        raw_string=None,
+    ):
         """
         Test a command by assigning all the needed
         properties to cmdobj and  running
@@ -111,8 +135,10 @@ def call(self, cmdobj, args, msg=None, cmdset=None, noansi=True, caller=None,
             pass
 
         # clean out evtable sugar. We only operate on text-type
-        stored_msg = [args[0] if args and args[0] else kwargs.get("text", utils.to_str(kwargs))
-                      for name, args, kwargs in receiver.msg.mock_calls]
+        stored_msg = [
+            args[0] if args and args[0] else kwargs.get("text", utils.to_str(kwargs))
+            for name, args, kwargs in receiver.msg.mock_calls
+        ]
         # Get the first element of a tuple if msg received a tuple instead of a string
         stored_msg = [str(smsg[0]) if isinstance(smsg, tuple) else str(smsg) for smsg in stored_msg]
         if msg is not None:
@@ -120,8 +146,9 @@ def call(self, cmdobj, args, msg=None, cmdset=None, noansi=True, caller=None,
             # set our separator for returned messages based on parsing ansi or not
             msg_sep = "|" if noansi else "||"
             # Have to strip ansi for each returned message for the regex to handle it correctly
-            returned_msg = msg_sep.join(_RE.sub("", ansi.parse_ansi(mess, strip_ansi=noansi))
-                                        for mess in stored_msg).strip()
+            returned_msg = msg_sep.join(
+                _RE.sub("", ansi.parse_ansi(mess, strip_ansi=noansi)) for mess in stored_msg
+            ).strip()
             if msg == "" and returned_msg or not returned_msg.startswith(msg.strip()):
                 sep1 = "\n" + "=" * 30 + "Wanted message" + "=" * 34 + "\n"
                 sep2 = "\n" + "=" * 30 + "Returned message" + "=" * 32 + "\n"
@@ -135,6 +162,7 @@ def call(self, cmdobj, args, msg=None, cmdset=None, noansi=True, caller=None,
 
         return returned_msg
 
+
 # ------------------------------------------------------------
 # Individual module Tests
 # ------------------------------------------------------------
@@ -155,14 +183,25 @@ def test_pose(self):
         self.call(general.CmdPose(), "looks around", "Char looks around")
 
     def test_nick(self):
-        self.call(general.CmdNick(), "testalias = testaliasedstring1",
-                "Inputline-nick 'testalias' mapped to 'testaliasedstring1'.")
-        self.call(general.CmdNick(), "/account testalias = testaliasedstring2",
-                "Account-nick 'testalias' mapped to 'testaliasedstring2'.")
-        self.call(general.CmdNick(), "/object testalias = testaliasedstring3",
-                "Object-nick 'testalias' mapped to 'testaliasedstring3'.")
+        self.call(
+            general.CmdNick(),
+            "testalias = testaliasedstring1",
+            "Inputline-nick 'testalias' mapped to 'testaliasedstring1'.",
+        )
+        self.call(
+            general.CmdNick(),
+            "/account testalias = testaliasedstring2",
+            "Account-nick 'testalias' mapped to 'testaliasedstring2'.",
+        )
+        self.call(
+            general.CmdNick(),
+            "/object testalias = testaliasedstring3",
+            "Object-nick 'testalias' mapped to 'testaliasedstring3'.",
+        )
         self.assertEqual("testaliasedstring1", self.char1.nicks.get("testalias"))
-        self.assertEqual("testaliasedstring2", self.char1.nicks.get("testalias", category="account"))
+        self.assertEqual(
+            "testaliasedstring2", self.char1.nicks.get("testalias", category="account")
+        )
         self.assertEqual(None, self.char1.account.nicks.get("testalias", category="account"))
         self.assertEqual("testaliasedstring3", self.char1.nicks.get("testalias", category="object"))
 
@@ -178,30 +217,48 @@ def test_give(self):
         self.call(general.CmdGive(), "Obj = Char", "You give", caller=self.char2)
 
     def test_mux_command(self):
-
         class CmdTest(MuxCommand):
-            key = 'test'
-            switch_options = ('test', 'testswitch', 'testswitch2')
+            key = "test"
+            switch_options = ("test", "testswitch", "testswitch2")
 
             def func(self):
                 self.msg("Switches matched: {}".format(self.switches))
 
-        self.call(CmdTest(), "/test/testswitch/testswitch2", "Switches matched: ['test', 'testswitch', 'testswitch2']")
+        self.call(
+            CmdTest(),
+            "/test/testswitch/testswitch2",
+            "Switches matched: ['test', 'testswitch', 'testswitch2']",
+        )
         self.call(CmdTest(), "/test", "Switches matched: ['test']")
         self.call(CmdTest(), "/test/testswitch", "Switches matched: ['test', 'testswitch']")
-        self.call(CmdTest(), "/testswitch/testswitch2", "Switches matched: ['testswitch', 'testswitch2']")
+        self.call(
+            CmdTest(), "/testswitch/testswitch2", "Switches matched: ['testswitch', 'testswitch2']"
+        )
         self.call(CmdTest(), "/testswitch", "Switches matched: ['testswitch']")
         self.call(CmdTest(), "/testswitch2", "Switches matched: ['testswitch2']")
-        self.call(CmdTest(), "/t", "test: Ambiguous switch supplied: "
-                                   "Did you mean /test or /testswitch or /testswitch2?|Switches matched: []")
-        self.call(CmdTest(), "/tests", "test: Ambiguous switch supplied: "
-                                       "Did you mean /testswitch or /testswitch2?|Switches matched: []")
+        self.call(
+            CmdTest(),
+            "/t",
+            "test: Ambiguous switch supplied: "
+            "Did you mean /test or /testswitch or /testswitch2?|Switches matched: []",
+        )
+        self.call(
+            CmdTest(),
+            "/tests",
+            "test: Ambiguous switch supplied: "
+            "Did you mean /testswitch or /testswitch2?|Switches matched: []",
+        )
 
     def test_say(self):
-        self.call(general.CmdSay(), "Testing", "You say, \"Testing\"")
+        self.call(general.CmdSay(), "Testing", 'You say, "Testing"')
 
     def test_whisper(self):
-        self.call(general.CmdWhisper(), "Obj = Testing", "You whisper to Obj, \"Testing\"", caller=self.char2)
+        self.call(
+            general.CmdWhisper(),
+            "Obj = Testing",
+            'You whisper to Obj, "Testing"',
+            caller=self.char2,
+        )
 
     def test_access(self):
         self.call(general.CmdAccess(), "", "Permission Hierarchy (climbing):")
@@ -212,7 +269,11 @@ def test_help(self):
         self.call(help.CmdHelp(), "", "Command help entries", cmdset=CharacterCmdSet())
 
     def test_set_help(self):
-        self.call(help.CmdSetHelp(), "testhelp, General = This is a test", "Topic 'testhelp' was successfully created.")
+        self.call(
+            help.CmdSetHelp(),
+            "testhelp, General = This is a test",
+            "Topic 'testhelp' was successfully created.",
+        )
         self.call(help.CmdHelp(), "testhelp", "Help for testhelp", cmdset=CharacterCmdSet())
 
 
@@ -220,7 +281,7 @@ class TestSystem(CommandTest):
     def test_py(self):
         # we are not testing CmdReload, CmdReset and CmdShutdown, CmdService or CmdTime
         # since the server is not running during these tests.
-        self.call(system.CmdPy(), "1+2", '>>> 1+2|3')
+        self.call(system.CmdPy(), "1+2", ">>> 1+2|3")
         self.call(system.CmdPy(), "/clientraw 1+2", ">>> 1+2|3")
 
     def test_scripts(self):
@@ -241,8 +302,16 @@ def test_emit(self):
         self.call(admin.CmdEmit(), "Char2 = Test", "Emitted to Char2:\nTest")
 
     def test_perm(self):
-        self.call(admin.CmdPerm(), "Obj = Builder", "Permission 'Builder' given to Obj (the Object/Character).")
-        self.call(admin.CmdPerm(), "Char2 = Builder", "Permission 'Builder' given to Char2 (the Object/Character).")
+        self.call(
+            admin.CmdPerm(),
+            "Obj = Builder",
+            "Permission 'Builder' given to Obj (the Object/Character).",
+        )
+        self.call(
+            admin.CmdPerm(),
+            "Char2 = Builder",
+            "Permission 'Builder' given to Char2 (the Object/Character).",
+        )
 
     def test_wall(self):
         self.call(admin.CmdWall(), "Test", "Announcing to all connected sessions ...")
@@ -252,27 +321,43 @@ def test_ban(self):
 
     def test_force(self):
         cid = self.char2.id
-        self.call(admin.CmdForce(), "Char2=say test", 
-                  'Char2(#{}) says, "test"|You have forced Char2 to: say test'.format(cid))
+        self.call(
+            admin.CmdForce(),
+            "Char2=say test",
+            'Char2(#{}) says, "test"|You have forced Char2 to: say test'.format(cid),
+        )
 
 
 class TestAccount(CommandTest):
-
     def test_ooc_look(self):
         if settings.MULTISESSION_MODE < 2:
-            self.call(account.CmdOOCLook(), "", "You are out-of-character (OOC).", caller=self.account)
+            self.call(
+                account.CmdOOCLook(), "", "You are out-of-character (OOC).", caller=self.account
+            )
         if settings.MULTISESSION_MODE == 2:
-            self.call(account.CmdOOCLook(), "", "Account TestAccount (you are OutofCharacter)", caller=self.account)
+            self.call(
+                account.CmdOOCLook(),
+                "",
+                "Account TestAccount (you are OutofCharacter)",
+                caller=self.account,
+            )
 
     def test_ooc(self):
         self.call(account.CmdOOC(), "", "You go OOC.", caller=self.account)
 
     def test_ic(self):
         self.account.unpuppet_object(self.session)
-        self.call(account.CmdIC(), "Char", "You become Char.", caller=self.account, receiver=self.char1)
+        self.call(
+            account.CmdIC(), "Char", "You become Char.", caller=self.account, receiver=self.char1
+        )
 
     def test_password(self):
-        self.call(account.CmdPassword(), "testpassword = testpassword", "Password changed.", caller=self.account)
+        self.call(
+            account.CmdPassword(),
+            "testpassword = testpassword",
+            "Password changed.",
+            caller=self.account,
+        )
 
     def test_option(self):
         self.call(account.CmdOption(), "", "Client settings", caller=self.account)
@@ -281,7 +366,9 @@ def test_who(self):
         self.call(account.CmdWho(), "", "Accounts:", caller=self.account)
 
     def test_quit(self):
-        self.call(account.CmdQuit(), "", "Quitting. Hope to see you again, soon.", caller=self.account)
+        self.call(
+            account.CmdQuit(), "", "Quitting. Hope to see you again, soon.", caller=self.account
+        )
 
     def test_sessions(self):
         self.call(account.CmdSessions(), "", "Your current session(s):", caller=self.account)
@@ -290,8 +377,12 @@ def test_color_test(self):
         self.call(account.CmdColorTest(), "ansi", "ANSI colors:", caller=self.account)
 
     def test_char_create(self):
-        self.call(account.CmdCharCreate(), "Test1=Test char",
-                  "Created new character Test1. Use ic Test1 to enter the game", caller=self.account)
+        self.call(
+            account.CmdCharCreate(),
+            "Test1=Test char",
+            "Created new character Test1. Use ic Test1 to enter the game",
+            caller=self.account,
+        )
 
     def test_char_delete(self):
         # Chardelete requires user input; this test is mainly to confirm
@@ -301,36 +392,62 @@ def test_char_delete(self):
         self.account.db._playable_characters.append(self.char1)
 
         # Try deleting as Developer
-        self.call(account.CmdCharDelete(), "Char", "This will permanently destroy 'Char'. This cannot be undone. Continue yes/[no]?", caller=self.account)
+        self.call(
+            account.CmdCharDelete(),
+            "Char",
+            "This will permanently destroy 'Char'. This cannot be undone. Continue yes/[no]?",
+            caller=self.account,
+        )
 
         # Downgrade permissions on account
-        self.account.permissions.add('Player')
-        self.account.permissions.remove('Developer')
+        self.account.permissions.add("Player")
+        self.account.permissions.remove("Developer")
 
         # Set lock on character object to prevent deletion
-        self.char1.locks.add('delete:none()')
+        self.char1.locks.add("delete:none()")
 
         # Try deleting as Player
-        self.call(account.CmdCharDelete(), "Char", "You do not have permission to delete this character.", caller=self.account)
+        self.call(
+            account.CmdCharDelete(),
+            "Char",
+            "You do not have permission to delete this character.",
+            caller=self.account,
+        )
 
         # Set lock on character object to allow self-delete
-        self.char1.locks.add('delete:pid(%i)' % self.account.id)
+        self.char1.locks.add("delete:pid(%i)" % self.account.id)
 
         # Try deleting as Player again
-        self.call(account.CmdCharDelete(), "Char", "This will permanently destroy 'Char'. This cannot be undone. Continue yes/[no]?", caller=self.account)
+        self.call(
+            account.CmdCharDelete(),
+            "Char",
+            "This will permanently destroy 'Char'. This cannot be undone. Continue yes/[no]?",
+            caller=self.account,
+        )
 
     def test_quell(self):
-        self.call(account.CmdQuell(), "", "Quelling to current puppet's permissions (developer).", caller=self.account)
+        self.call(
+            account.CmdQuell(),
+            "",
+            "Quelling to current puppet's permissions (developer).",
+            caller=self.account,
+        )
 
 
 class TestBuilding(CommandTest):
     def test_create(self):
-        name = settings.BASE_OBJECT_TYPECLASS.rsplit('.', 1)[1]
-        self.call(building.CmdCreate(), "/d TestObj1",   # /d switch is abbreviated form of /drop
-                  "You create a new %s: TestObj1." % name)
+        name = settings.BASE_OBJECT_TYPECLASS.rsplit(".", 1)[1]
+        self.call(
+            building.CmdCreate(),
+            "/d TestObj1",  # /d switch is abbreviated form of /drop
+            "You create a new %s: TestObj1." % name,
+        )
         self.call(building.CmdCreate(), "", "Usage: ")
-        self.call(building.CmdCreate(), "TestObj1;foo;bar",
-                  "You create a new %s: TestObj1 (aliases: foo, bar)." % name)
+        self.call(
+            building.CmdCreate(),
+            "TestObj1;foo;bar",
+            "You create a new %s: TestObj1 (aliases: foo, bar)." % name,
+        )
 
     def test_examine(self):
         self.call(building.CmdExamine(), "", "Name/key: Room")
@@ -351,40 +468,64 @@ def test_examine(self):
     def test_set_obj_alias(self):
         oid = self.obj1.id
         self.call(building.CmdSetObjAlias(), "Obj =", "Cleared aliases from Obj")
-        self.call(building.CmdSetObjAlias(), "Obj = TestObj1b",
-                  "Alias(es) for 'Obj(#{})' set to 'testobj1b'.".format(oid))
+        self.call(
+            building.CmdSetObjAlias(),
+            "Obj = TestObj1b",
+            "Alias(es) for 'Obj(#{})' set to 'testobj1b'.".format(oid),
+        )
         self.call(building.CmdSetObjAlias(), "", "Usage: ")
         self.call(building.CmdSetObjAlias(), "NotFound =", "Could not find 'NotFound'.")
 
-        self.call(building.CmdSetObjAlias(), "Obj",
-                  "Aliases for Obj(#{}): 'testobj1b'".format(oid))
+        self.call(building.CmdSetObjAlias(), "Obj", "Aliases for Obj(#{}): 'testobj1b'".format(oid))
         self.call(building.CmdSetObjAlias(), "Obj2 =", "Cleared aliases from Obj2")
         self.call(building.CmdSetObjAlias(), "Obj2 =", "No aliases to clear.")
 
     def test_copy(self):
-        self.call(building.CmdCopy(), "Obj = TestObj2;TestObj2b, TestObj3;TestObj3b",
-                  "Copied Obj to 'TestObj3' (aliases: ['TestObj3b']")
+        self.call(
+            building.CmdCopy(),
+            "Obj = TestObj2;TestObj2b, TestObj3;TestObj3b",
+            "Copied Obj to 'TestObj3' (aliases: ['TestObj3b']",
+        )
         self.call(building.CmdCopy(), "", "Usage: ")
         self.call(building.CmdCopy(), "Obj", "Identical copy of Obj, named 'Obj_copy' was created.")
         self.call(building.CmdCopy(), "NotFound = Foo", "Could not find 'NotFound'.")
 
     def test_attribute_commands(self):
         self.call(building.CmdSetAttribute(), "", "Usage: ")
-        self.call(building.CmdSetAttribute(), "Obj/test1=\"value1\"", "Created attribute Obj/test1 = 'value1'")
-        self.call(building.CmdSetAttribute(), "Obj2/test2=\"value2\"", "Created attribute Obj2/test2 = 'value2'")
+        self.call(
+            building.CmdSetAttribute(),
+            'Obj/test1="value1"',
+            "Created attribute Obj/test1 = 'value1'",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            'Obj2/test2="value2"',
+            "Created attribute Obj2/test2 = 'value2'",
+        )
         self.call(building.CmdSetAttribute(), "Obj2/test2", "Attribute Obj2/test2 = value2")
         self.call(building.CmdSetAttribute(), "Obj2/NotFound", "Obj2 has no attribute 'notfound'.")
 
         with mock.patch("evennia.commands.default.building.EvEditor") as mock_ed:
             self.call(building.CmdSetAttribute(), "/edit Obj2/test3")
-            mock_ed.assert_called_with(self.char1, Anything, Anything, key='Obj2/test3')
+            mock_ed.assert_called_with(self.char1, Anything, Anything, key="Obj2/test3")
 
-        self.call(building.CmdSetAttribute(), "Obj2/test3=\"value3\"", "Created attribute Obj2/test3 = 'value3'")
-        self.call(building.CmdSetAttribute(), "Obj2/test3 = ", "Deleted attribute 'test3' (= True) from Obj2.")
+        self.call(
+            building.CmdSetAttribute(),
+            'Obj2/test3="value3"',
+            "Created attribute Obj2/test3 = 'value3'",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj2/test3 = ",
+            "Deleted attribute 'test3' (= True) from Obj2.",
+        )
 
-        self.call(building.CmdCpAttr(), "/copy Obj2/test2 = Obj2/test3",
-                  "cpattr: Extra switch \"/copy\" ignored.|\nCopied Obj2.test2 -> Obj2.test3. "
-                  "(value: 'value2')")
+        self.call(
+            building.CmdCpAttr(),
+            "/copy Obj2/test2 = Obj2/test3",
+            'cpattr: Extra switch "/copy" ignored.|\nCopied Obj2.test2 -> Obj2.test3. '
+            "(value: 'value2')",
+        )
         self.call(building.CmdMvAttr(), "", "Usage: ")
         self.call(building.CmdMvAttr(), "Obj2/test2 = Obj/test3", "Moved Obj2.test2 -> Obj.test3")
         self.call(building.CmdCpAttr(), "", "Usage: ")
@@ -394,30 +535,270 @@ def test_attribute_commands(self):
         self.call(building.CmdWipe(), "Obj2/test2/test3", "Wiped attributes test2,test3 on Obj2.")
         self.call(building.CmdWipe(), "Obj2", "Wiped all attributes on Obj2.")
 
+    def test_nested_attribute_commands(self):
+        # list - adding white space proves real parsing
+        self.call(
+            building.CmdSetAttribute(), "Obj/test1=[1,2]", "Created attribute Obj/test1 = [1, 2]"
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test1", "Attribute Obj/test1 = [1, 2]")
+        self.call(building.CmdSetAttribute(), "Obj/test1[0]", "Attribute Obj/test1[0] = 1")
+        self.call(building.CmdSetAttribute(), "Obj/test1[1]", "Attribute Obj/test1[1] = 2")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test1[0] = 99",
+            "Modified attribute Obj/test1 = [99, 2]",
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test1[0]", "Attribute Obj/test1[0] = 99")
+        # list delete
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test1[0] =",
+            "Deleted attribute 'test1[0]' (= nested) from Obj.",
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test1[0]", "Attribute Obj/test1[0] = 2")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test1[1]",
+            "Obj has no attribute 'test1[1]'. (Nested lookups attempted)",
+        )
+        # Delete non-existent
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test1[5] =",
+            "Obj has no attribute 'test1[5]'. (Nested lookups attempted)",
+        )
+        # Append
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test1[+] = 42",
+            "Modified attribute Obj/test1 = [2, 42]",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test1[+0] = -1",
+            "Modified attribute Obj/test1 = [-1, 2, 42]",
+        )
+
+        # dict - removing white space proves real parsing
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2={ 'one': 1, 'two': 2 }",
+            "Created attribute Obj/test2 = {'one': 1, 'two': 2}",
+        )
+        self.call(
+            building.CmdSetAttribute(), "Obj/test2", "Attribute Obj/test2 = {'one': 1, 'two': 2}"
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test2['one']", "Attribute Obj/test2['one'] = 1")
+        self.call(building.CmdSetAttribute(), "Obj/test2['one]", "Attribute Obj/test2['one] = 1")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2['one']=99",
+            "Modified attribute Obj/test2 = {'one': 99, 'two': 2}",
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test2['one']", "Attribute Obj/test2['one'] = 99")
+        self.call(building.CmdSetAttribute(), "Obj/test2['two']", "Attribute Obj/test2['two'] = 2")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2[+'three']",
+            "Obj has no attribute 'test2[+'three']'. (Nested lookups attempted)",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2[+'three'] = 3",
+            "Modified attribute Obj/test2 = {'one': 99, 'two': 2, \"+'three'\": 3}",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2[+'three'] =",
+            "Deleted attribute 'test2[+'three']' (= nested) from Obj.",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2['three']=3",
+            "Modified attribute Obj/test2 = {'one': 99, 'two': 2, 'three': 3}",
+        )
+        # Dict delete
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2['two'] =",
+            "Deleted attribute 'test2['two']' (= nested) from Obj.",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2['two']",
+            "Obj has no attribute 'test2['two']'. (Nested lookups attempted)",
+        )
+        self.call(
+            building.CmdSetAttribute(), "Obj/test2", "Attribute Obj/test2 = {'one': 99, 'three': 3}"
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2[0]",
+            "Obj has no attribute 'test2[0]'. (Nested lookups attempted)",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2['five'] =",
+            "Obj has no attribute 'test2['five']'. (Nested lookups attempted)",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2[+]=42",
+            "Modified attribute Obj/test2 = {'one': 99, 'three': 3, '+': 42}",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test2[+1]=33",
+            "Modified attribute Obj/test2 = {'one': 99, 'three': 3, '+': 42, '+1': 33}",
+        )
+
+        # tuple
+        self.call(
+            building.CmdSetAttribute(), "Obj/tup = (1,2)", "Created attribute Obj/tup = (1, 2)"
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/tup[1] = 99",
+            "'tuple' object does not support item assignment - (1, 2)",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/tup[+] = 99",
+            "'tuple' object does not support item assignment - (1, 2)",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/tup[+1] = 99",
+            "'tuple' object does not support item assignment - (1, 2)",
+        )
+        self.call(
+            building.CmdSetAttribute(),
+            # Special case for tuple, could have a better message
+            "Obj/tup[1] = ",
+            "Obj has no attribute 'tup[1]'. (Nested lookups attempted)",
+        )
+
+        # Deaper nesting
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test3=[{'one': 1}]",
+            "Created attribute Obj/test3 = [{'one': 1}]",
+        )
+        self.call(
+            building.CmdSetAttribute(), "Obj/test3[0]['one']", "Attribute Obj/test3[0]['one'] = 1"
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test3[0]", "Attribute Obj/test3[0] = {'one': 1}")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test3[0]['one'] =",
+            "Deleted attribute 'test3[0]['one']' (= nested) from Obj.",
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test3[0]", "Attribute Obj/test3[0] = {}")
+        self.call(building.CmdSetAttribute(), "Obj/test3", "Attribute Obj/test3 = [{}]")
+
+        # Naughty keys
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test4[0]='foo'",
+            "Created attribute Obj/test4[0] = 'foo'",
+        )
+        self.call(building.CmdSetAttribute(), "Obj/test4[0]", "Attribute Obj/test4[0] = foo")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test4=[{'one': 1}]",
+            "Created attribute Obj/test4 = [{'one': 1}]",
+        )
+        self.call(
+            building.CmdSetAttribute(), "Obj/test4[0]['one']", "Attribute Obj/test4[0]['one'] = 1"
+        )
+        # Prefer nested items
+        self.call(building.CmdSetAttribute(), "Obj/test4[0]", "Attribute Obj/test4[0] = {'one': 1}")
+        self.call(
+            building.CmdSetAttribute(), "Obj/test4[0]['one']", "Attribute Obj/test4[0]['one'] = 1"
+        )
+        # Restored access
+        self.call(building.CmdWipe(), "Obj/test4", "Wiped attributes test4 on Obj.")
+        self.call(building.CmdSetAttribute(), "Obj/test4[0]", "Attribute Obj/test4[0] = foo")
+        self.call(
+            building.CmdSetAttribute(),
+            "Obj/test4[0]['one']",
+            "Obj has no attribute 'test4[0]['one']'.",
+        )
+
+    def test_split_nested_attr(self):
+        split_nested_attr = building.CmdSetAttribute().split_nested_attr
+        test_cases = {
+            "test1": [("test1", [])],
+            'test2["dict"]': [("test2", ["dict"]), ('test2["dict"]', [])],
+            # Quotes not actually required
+            "test3[dict]": [("test3", ["dict"]), ("test3[dict]", [])],
+            'test4["dict]': [("test4", ["dict"]), ('test4["dict]', [])],
+            # duplicate keys don't cause issues
+            "test5[0][0]": [("test5", [0, 0]), ("test5[0]", [0]), ("test5[0][0]", [])],
+            # String ints preserved
+            'test6["0"][0]': [("test6", ["0", 0]), ('test6["0"]', [0]), ('test6["0"][0]', [])],
+            # Unmatched []
+            "test7[dict": [("test7[dict", [])],
+        }
+
+        for attr, result in test_cases.items():
+            self.assertEqual(list(split_nested_attr(attr)), result)
+
+    def test_do_nested_lookup(self):
+        do_nested_lookup = building.CmdSetAttribute().do_nested_lookup
+        not_found = building.CmdSetAttribute.not_found
+
+        def do_test_single(value, key, result):
+            self.assertEqual(do_nested_lookup(value, key), result)
+
+        def do_test_multi(value, keys, result):
+            self.assertEqual(do_nested_lookup(value, *keys), result)
+
+        do_test_single([], "test1", not_found)
+        do_test_single([1], "test2", not_found)
+        do_test_single([], 0, not_found)
+        do_test_single([], "0", not_found)
+        do_test_single([1], 2, not_found)
+        do_test_single([1], 0, 1)
+        do_test_single([1], "0", not_found)  # str key is str not int
+        do_test_single({}, "test3", not_found)
+        do_test_single({}, 0, not_found)
+        do_test_single({"foo": "bar"}, "foo", "bar")
+
+        do_test_multi({"one": [1, 2, 3]}, ("one", 0), 1)
+        do_test_multi([{}, {"two": 2}, 3], (1, "two"), 2)
+
     def test_name(self):
         self.call(building.CmdName(), "", "Usage: ")
         self.call(building.CmdName(), "Obj2=Obj3", "Object's name changed to 'Obj3'.")
-        self.call(building.CmdName(), "*TestAccount=TestAccountRenamed",
-                  "Account's name changed to 'TestAccountRenamed'.")
-        self.call(building.CmdName(), "*NotFound=TestAccountRenamed",
-                  "Could not find '*NotFound'")
-        self.call(building.CmdName(), "Obj3=Obj4;foo;bar",
-                  "Object's name changed to 'Obj4' (foo, bar).")
+        self.call(
+            building.CmdName(),
+            "*TestAccount=TestAccountRenamed",
+            "Account's name changed to 'TestAccountRenamed'.",
+        )
+        self.call(building.CmdName(), "*NotFound=TestAccountRenamed", "Could not find '*NotFound'")
+        self.call(
+            building.CmdName(), "Obj3=Obj4;foo;bar", "Object's name changed to 'Obj4' (foo, bar)."
+        )
         self.call(building.CmdName(), "Obj4=", "No names or aliases defined!")
 
     def test_desc(self):
         oid = self.obj2.id
-        self.call(building.CmdDesc(), "Obj2=TestDesc", 
-                  "The description was set on Obj2(#{}).".format(oid))
+        self.call(
+            building.CmdDesc(), "Obj2=TestDesc", "The description was set on Obj2(#{}).".format(oid)
+        )
         self.call(building.CmdDesc(), "", "Usage: ")
 
         with mock.patch("evennia.commands.default.building.EvEditor") as mock_ed:
             self.call(building.CmdDesc(), "/edit")
-            mock_ed.assert_called_with(self.char1, key='desc',
-                                       loadfunc=building._desc_load,
-                                       quitfunc=building._desc_quit,
-                                       savefunc=building._desc_save,
-                                       persistent=True)
+            mock_ed.assert_called_with(
+                self.char1,
+                key="desc",
+                loadfunc=building._desc_load,
+                quitfunc=building._desc_quit,
+                savefunc=building._desc_save,
+                persistent=True,
+            )
 
     def test_empty_desc(self):
         """
@@ -426,9 +807,8 @@ def test_empty_desc(self):
         oid = self.obj2.id
         o2d = self.obj2.db.desc
         r1d = self.room1.db.desc
-        self.call(building.CmdDesc(), "Obj2=",
-                  "The description was set on Obj2(#{}).".format(oid))
-        assert self.obj2.db.desc == '' and self.obj2.db.desc != o2d
+        self.call(building.CmdDesc(), "Obj2=", "The description was set on Obj2(#{}).".format(oid))
+        assert self.obj2.db.desc == "" and self.obj2.db.desc != o2d
         assert self.room1.db.desc == r1d
 
     def test_desc_default_to_room(self):
@@ -436,10 +816,9 @@ def test_desc_default_to_room(self):
         rid = self.room1.id
         o2d = self.obj2.db.desc
         r1d = self.room1.db.desc
-        self.call(building.CmdDesc(), "Obj2",
-                  "The description was set on Room(#{}).".format(rid))
+        self.call(building.CmdDesc(), "Obj2", "The description was set on Room(#{}).".format(rid))
         assert self.obj2.db.desc == o2d
-        assert self.room1.db.desc == 'Obj2' and self.room1.db.desc != r1d
+        assert self.room1.db.desc == "Obj2" and self.room1.db.desc != r1d
 
     def test_destroy(self):
         confirm = building.CmdDestroy.confirm
@@ -447,25 +826,36 @@ def test_destroy(self):
         self.call(building.CmdDestroy(), "", "Usage: ")
         self.call(building.CmdDestroy(), "Obj", "Obj was destroyed.")
         self.call(building.CmdDestroy(), "Obj", "Obj2 was destroyed.")
-        self.call(building.CmdDestroy(), "Obj", "Could not find 'Obj'.| (Objects to destroy "
-                  "must either be local or specified with a unique #dbref.)")
-        self.call(building.CmdDestroy(), settings.DEFAULT_HOME,
-                  "You are trying to delete")  # DEFAULT_HOME should not be deleted
+        self.call(
+            building.CmdDestroy(),
+            "Obj",
+            "Could not find 'Obj'.| (Objects to destroy "
+            "must either be local or specified with a unique #dbref.)",
+        )
+        self.call(
+            building.CmdDestroy(), settings.DEFAULT_HOME, "You are trying to delete"
+        )  # DEFAULT_HOME should not be deleted
         self.char2.location = self.room2
         charid = self.char2.id
         room1id = self.room1.id
         room2id = self.room2.id
-        self.call(building.CmdDestroy(), self.room2.dbref,
-                  "Char2(#{}) arrives to Room(#{}) from Room2(#{}).|Room2 was destroyed.".format(
-                    charid, room1id, room2id))
+        self.call(
+            building.CmdDestroy(),
+            self.room2.dbref,
+            "Char2(#{}) arrives to Room(#{}) from Room2(#{}).|Room2 was destroyed.".format(
+                charid, room1id, room2id
+            ),
+        )
         building.CmdDestroy.confirm = confirm
 
     def test_destroy_sequence(self):
         confirm = building.CmdDestroy.confirm
         building.CmdDestroy.confirm = False
-        self.call(building.CmdDestroy(),
-                  "{}-{}".format(self.obj1.dbref, self.obj2.dbref),
-                  "Obj was destroyed.\nObj2 was destroyed.")
+        self.call(
+            building.CmdDestroy(),
+            "{}-{}".format(self.obj1.dbref, self.obj2.dbref),
+            "Obj was destroyed.\nObj2 was destroyed.",
+        )
 
     def test_dig(self):
         self.call(building.CmdDig(), "TestRoom1=testroom;tr,back;b", "Created room TestRoom1")
@@ -481,38 +871,65 @@ def test_tunnel(self):
         self.assertEqual(len(exits), 2)
 
     def test_tunnel_exit_typeclass(self):
-        self.call(building.CmdTunnel(), "n:evennia.objects.objects.DefaultExit = TestRoom3",
-                  "Created room TestRoom3")
+        self.call(
+            building.CmdTunnel(),
+            "n:evennia.objects.objects.DefaultExit = TestRoom3",
+            "Created room TestRoom3",
+        )
 
     def test_exit_commands(self):
-        self.call(building.CmdOpen(), "TestExit1=Room2", "Created new Exit 'TestExit1' from Room to Room2")
+        self.call(
+            building.CmdOpen(), "TestExit1=Room2", "Created new Exit 'TestExit1' from Room to Room2"
+        )
         self.call(building.CmdLink(), "TestExit1=Room", "Link created TestExit1 -> Room (one way).")
         self.call(building.CmdUnLink(), "", "Usage: ")
         self.call(building.CmdLink(), "NotFound", "Could not find 'NotFound'.")
         self.call(building.CmdLink(), "TestExit", "TestExit1 is an exit to Room.")
         self.call(building.CmdLink(), "Obj", "Obj is not an exit. Its home location is Room.")
-        self.call(building.CmdUnLink(), "TestExit1", "Former exit TestExit1 no longer links anywhere.")
+        self.call(
+            building.CmdUnLink(), "TestExit1", "Former exit TestExit1 no longer links anywhere."
+        )
 
         self.char1.location = self.room2
-        self.call(building.CmdOpen(), "TestExit2=Room", "Created new Exit 'TestExit2' from Room2 to Room.")
-        self.call(building.CmdOpen(), "TestExit2=Room", "Exit TestExit2 already exists. It already points to the correct place.")
-
+        self.call(
+            building.CmdOpen(), "TestExit2=Room", "Created new Exit 'TestExit2' from Room2 to Room."
+        )
+        self.call(
+            building.CmdOpen(),
+            "TestExit2=Room",
+            "Exit TestExit2 already exists. It already points to the correct place.",
+        )
 
         # ensure it matches locally first
-        self.call(building.CmdLink(), "TestExit=Room2", "Link created TestExit2 -> Room2 (one way).")
-        self.call(building.CmdLink(), "/twoway TestExit={}".format(self.exit.dbref),
-                  "Link created TestExit2 (in Room2) <-> out (in Room) (two-way).")
-        self.call(building.CmdLink(), "/twoway TestExit={}".format(self.room1.dbref),
-                  "To create a two-way link, TestExit2 and Room must both have a location ")
-        self.call(building.CmdLink(), "/twoway {}={}".format(self.exit.dbref, self.exit.dbref),
-                  "Cannot link an object to itself.")
+        self.call(
+            building.CmdLink(), "TestExit=Room2", "Link created TestExit2 -> Room2 (one way)."
+        )
+        self.call(
+            building.CmdLink(),
+            "/twoway TestExit={}".format(self.exit.dbref),
+            "Link created TestExit2 (in Room2) <-> out (in Room) (two-way).",
+        )
+        self.call(
+            building.CmdLink(),
+            "/twoway TestExit={}".format(self.room1.dbref),
+            "To create a two-way link, TestExit2 and Room must both have a location ",
+        )
+        self.call(
+            building.CmdLink(),
+            "/twoway {}={}".format(self.exit.dbref, self.exit.dbref),
+            "Cannot link an object to itself.",
+        )
         self.call(building.CmdLink(), "", "Usage: ")
         # ensure can still match globally when not a local name
         self.call(building.CmdLink(), "TestExit1=Room2", "Note: TestExit1")
-        self.call(building.CmdLink(), "TestExit1=", "Former exit TestExit1 no longer links anywhere.")
+        self.call(
+            building.CmdLink(), "TestExit1=", "Former exit TestExit1 no longer links anywhere."
+        )
 
     def test_set_home(self):
-        self.call(building.CmdSetHome(), "Obj = Room2", "Home location of Obj was changed from Room")
+        self.call(
+            building.CmdSetHome(), "Obj = Room2", "Home location of Obj was changed from Room"
+        )
         self.call(building.CmdSetHome(), "", "Usage: ")
         self.call(building.CmdSetHome(), "self", "Char's current home is Room")
         self.call(building.CmdSetHome(), "Obj", "Obj's current home is Room2")
@@ -525,37 +942,71 @@ def test_list_cmdsets(self):
 
     def test_typeclass(self):
         self.call(building.CmdTypeclass(), "", "Usage: ")
-        self.call(building.CmdTypeclass(), "Obj = evennia.objects.objects.DefaultExit",
-                  "Obj changed typeclass from evennia.objects.objects.DefaultObject "
-                  "to evennia.objects.objects.DefaultExit.")
-        self.call(building.CmdTypeclass(), "Obj2 = evennia.objects.objects.DefaultExit",
-                  "Obj2 changed typeclass from evennia.objects.objects.DefaultObject "
-                  "to evennia.objects.objects.DefaultExit.", cmdstring="swap")
+        self.call(
+            building.CmdTypeclass(),
+            "Obj = evennia.objects.objects.DefaultExit",
+            "Obj changed typeclass from evennia.objects.objects.DefaultObject "
+            "to evennia.objects.objects.DefaultExit.",
+        )
+        self.call(
+            building.CmdTypeclass(),
+            "Obj2 = evennia.objects.objects.DefaultExit",
+            "Obj2 changed typeclass from evennia.objects.objects.DefaultObject "
+            "to evennia.objects.objects.DefaultExit.",
+            cmdstring="swap",
+        )
         self.call(building.CmdTypeclass(), "/list Obj", "Core typeclasses")
-        self.call(building.CmdTypeclass(), "/show Obj", "Obj's current typeclass is 'evennia.objects.objects.DefaultExit'")
-        self.call(building.CmdTypeclass(), "Obj = evennia.objects.objects.DefaultExit",
-                  "Obj already has the typeclass 'evennia.objects.objects.DefaultExit'. Use /force to override.")
-        self.call(building.CmdTypeclass(), "/force Obj = evennia.objects.objects.DefaultExit",
-                  "Obj updated its existing typeclass ")
+        self.call(
+            building.CmdTypeclass(),
+            "/show Obj",
+            "Obj's current typeclass is 'evennia.objects.objects.DefaultExit'",
+        )
+        self.call(
+            building.CmdTypeclass(),
+            "Obj = evennia.objects.objects.DefaultExit",
+            "Obj already has the typeclass 'evennia.objects.objects.DefaultExit'. Use /force to override.",
+        )
+        self.call(
+            building.CmdTypeclass(),
+            "/force Obj = evennia.objects.objects.DefaultExit",
+            "Obj updated its existing typeclass ",
+        )
         self.call(building.CmdTypeclass(), "Obj = evennia.objects.objects.DefaultObject")
-        self.call(building.CmdTypeclass(), "/show Obj", "Obj's current typeclass is 'evennia.objects.objects.DefaultObject'")
-        self.call(building.CmdTypeclass(), "Obj",
-                  "Obj updated its existing typeclass (evennia.objects.objects.DefaultObject).\n"
-                  "Only the at_object_creation hook was run (update mode). Attributes set before swap were not removed.",
-                  cmdstring="update")
-        self.call(building.CmdTypeclass(), "/reset/force Obj=evennia.objects.objects.DefaultObject",
-                  "Obj updated its existing typeclass (evennia.objects.objects.DefaultObject).\n"
-                  "All object creation hooks were run. All old attributes where deleted before the swap.")
+        self.call(
+            building.CmdTypeclass(),
+            "/show Obj",
+            "Obj's current typeclass is 'evennia.objects.objects.DefaultObject'",
+        )
+        self.call(
+            building.CmdTypeclass(),
+            "Obj",
+            "Obj updated its existing typeclass (evennia.objects.objects.DefaultObject).\n"
+            "Only the at_object_creation hook was run (update mode). Attributes set before swap were not removed.",
+            cmdstring="update",
+        )
+        self.call(
+            building.CmdTypeclass(),
+            "/reset/force Obj=evennia.objects.objects.DefaultObject",
+            "Obj updated its existing typeclass (evennia.objects.objects.DefaultObject).\n"
+            "All object creation hooks were run. All old attributes where deleted before the swap.",
+        )
 
     def test_lock(self):
         self.call(building.CmdLock(), "", "Usage: ")
         self.call(building.CmdLock(), "Obj = test:all()", "Added lock 'test:all()' to Obj.")
-        self.call(building.CmdLock(), "*TestAccount = test:all()", "Added lock 'test:all()' to TestAccount")
+        self.call(
+            building.CmdLock(),
+            "*TestAccount = test:all()",
+            "Added lock 'test:all()' to TestAccount",
+        )
         self.call(building.CmdLock(), "Obj/notfound", "Obj has no lock of access type 'notfound'.")
         self.call(building.CmdLock(), "Obj/test", "test:all()")
-        self.call(building.CmdLock(), "/view Obj = edit:false()",
-                  "Switch(es) view can not be used with a lock assignment. "
-                  "Use e.g. lock/del objname/locktype instead.")
+        self.call(
+            building.CmdLock(),
+            "/view Obj = edit:false()",
+            "Switch(es) view can not be used with a lock assignment. "
+            "Use e.g. lock/del objname/locktype instead.",
+        )
         self.call(building.CmdLock(), "Obj = control:false()")
         self.call(building.CmdLock(), "Obj = edit:false()")
         self.call(building.CmdLock(), "Obj/test", "You are not allowed to do that.")
@@ -571,11 +1022,16 @@ def test_find(self):
         self.call(building.CmdFind(), "oom2 = 1-{}".format(rmax), "One Match")
         self.call(building.CmdFind(), "oom2 = 1 {}".format(rmax), "One Match")  # space works too
         self.call(building.CmdFind(), "Char2", "One Match", cmdstring="locate")
-        self.call(building.CmdFind(), "/ex Char2",  # /ex is an ambiguous switch
-                  "locate: Ambiguous switch supplied: Did you mean /exit or /exact?|",
-                  cmdstring="locate")
+        self.call(
+            building.CmdFind(),
+            "/ex Char2",  # /ex is an ambiguous switch
+            "locate: Ambiguous switch supplied: Did you mean /exit or /exact?|",
+            cmdstring="locate",
+        )
         self.call(building.CmdFind(), "Char2", "One Match", cmdstring="locate")
-        self.call(building.CmdFind(), "/l Char2", "One Match", cmdstring="find")  # /l switch is abbreviated form of /loc
+        self.call(
+            building.CmdFind(), "/l Char2", "One Match", cmdstring="find"
+        )  # /l switch is abbreviated form of /loc
         self.call(building.CmdFind(), "Char2", "One Match", cmdstring="find")
         self.call(building.CmdFind(), "/startswith Room2", "One Match")
 
@@ -589,17 +1045,35 @@ def test_find(self):
 
     def test_script(self):
         self.call(building.CmdScript(), "Obj = ", "No scripts defined on Obj")
-        self.call(building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added")
+        self.call(
+            building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added"
+        )
         self.call(building.CmdScript(), "", "Usage: ")
-        self.call(building.CmdScript(), "= Obj", "To create a global script you need scripts/add <typeclass>.")
+        self.call(
+            building.CmdScript(),
+            "= Obj",
+            "To create a global script you need scripts/add <typeclass>.",
+        )
         self.call(building.CmdScript(), "Obj = ", "dbref obj")
 
-        self.call(building.CmdScript(), "/start Obj", "0 scripts started on Obj")  # because it's already started
+        self.call(
+            building.CmdScript(), "/start Obj", "0 scripts started on Obj"
+        )  # because it's already started
         self.call(building.CmdScript(), "/stop Obj", "Stopping script")
 
-        self.call(building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added")
-        self.call(building.CmdScript(), "/start Obj = scripts.Script", "Script scripts.Script could not be (re)started.")
-        self.call(building.CmdScript(), "/stop Obj = scripts.Script", "Script stopped and removed from object.")
+        self.call(
+            building.CmdScript(), "Obj = scripts.Script", "Script scripts.Script successfully added"
+        )
+        self.call(
+            building.CmdScript(),
+            "/start Obj = scripts.Script",
+            "Script scripts.Script could not be (re)started.",
+        )
+        self.call(
+            building.CmdScript(),
+            "/stop Obj = scripts.Script",
+            "Script stopped and removed from object.",
+        )
 
     def test_teleport(self):
         oid = self.obj1.id
@@ -607,21 +1081,40 @@ def test_teleport(self):
         rid2 = self.room2.id
         self.call(building.CmdTeleport(), "", "Usage: ")
         self.call(building.CmdTeleport(), "Obj = Room", "Obj is already at Room.")
-        self.call(building.CmdTeleport(), "Obj = NotFound", "Could not find 'NotFound'.|Destination not found.")
-        self.call(building.CmdTeleport(),
-                  "Obj = Room2", "Obj(#{}) is leaving Room(#{}), heading for Room2(#{}).|Teleported Obj -> Room2.".format(
-                  oid, rid, rid2))
+        self.call(
+            building.CmdTeleport(),
+            "Obj = NotFound",
+            "Could not find 'NotFound'.|Destination not found.",
+        )
+        self.call(
+            building.CmdTeleport(),
+            "Obj = Room2",
+            "Obj(#{}) is leaving Room(#{}), heading for Room2(#{}).|Teleported Obj -> Room2.".format(
+                oid, rid, rid2
+            ),
+        )
         self.call(building.CmdTeleport(), "NotFound = Room", "Could not find 'NotFound'.")
-        self.call(building.CmdTeleport(), "Obj = Obj", "You can't teleport an object inside of itself!")
+        self.call(
+            building.CmdTeleport(), "Obj = Obj", "You can't teleport an object inside of itself!"
+        )
 
         self.call(building.CmdTeleport(), "/tonone Obj2", "Teleported Obj2 -> None-location.")
         self.call(building.CmdTeleport(), "/quiet Room2", "Room2(#{})".format(rid2))
-        self.call(building.CmdTeleport(), "/t",  # /t switch is abbreviated form of /tonone
-                  "Cannot teleport a puppeted object (Char, puppeted by TestAccount")
-        self.call(building.CmdTeleport(), "/l Room2",  # /l switch is abbreviated form of /loc
-                  "Destination has no location.")
-        self.call(building.CmdTeleport(), "/q me to Room2",  # /q switch is abbreviated form of /quiet
-                  "Char is already at Room2.")
+        self.call(
+            building.CmdTeleport(),
+            "/t",  # /t switch is abbreviated form of /tonone
+            "Cannot teleport a puppeted object (Char, puppeted by TestAccount",
+        )
+        self.call(
+            building.CmdTeleport(),
+            "/l Room2",  # /l switch is abbreviated form of /loc
+            "Destination has no location.",
+        )
+        self.call(
+            building.CmdTeleport(),
+            "/q me to Room2",  # /q switch is abbreviated form of /quiet
+            "Char is already at Room2.",
+        )
 
     def test_tag(self):
         self.call(building.CmdTag(), "", "Usage: ")
@@ -631,19 +1124,27 @@ def test_tag(self):
         self.call(building.CmdTag(), "Obj = testtag2:category1")
         self.call(building.CmdTag(), "Obj = testtag3")
 
-        self.call(building.CmdTag(), "Obj", "Tags on Obj: 'testtag', 'testtag2', "
-                  "'testtag2' (category: category1), 'testtag3'")
+        self.call(
+            building.CmdTag(),
+            "Obj",
+            "Tags on Obj: 'testtag', 'testtag2', " "'testtag2' (category: category1), 'testtag3'",
+        )
 
         self.call(building.CmdTag(), "/search NotFound", "No objects found with tag 'NotFound'.")
         self.call(building.CmdTag(), "/search testtag", "Found 1 object with tag 'testtag':")
         self.call(building.CmdTag(), "/search testtag2", "Found 1 object with tag 'testtag2':")
-        self.call(building.CmdTag(), "/search testtag2:category1",
-                  "Found 1 object with tag 'testtag2' (category: 'category1'):")
-
+        self.call(
+            building.CmdTag(),
+            "/search testtag2:category1",
+            "Found 1 object with tag 'testtag2' (category: 'category1'):",
+        )
 
         self.call(building.CmdTag(), "/del Obj = testtag3", "Removed tag 'testtag3' from Obj.")
-        self.call(building.CmdTag(), "/del Obj",
-            "Cleared all tags from Obj: testtag, testtag2, testtag2 (category: category1)")
+        self.call(
+            building.CmdTag(),
+            "/del Obj",
+            "Cleared all tags from Obj: testtag, testtag2, testtag2 (category: category1)",
+        )
 
     def test_spawn(self):
         def getObject(commandTest, objKeyStr):
@@ -661,22 +1162,26 @@ def getObject(commandTest, objKeyStr):
 
         # Tests "spawn <prototype_dictionary>" without specifying location.
 
-        self.call(building.CmdSpawn(),
-                  "/save {'prototype_key': 'testprot', 'key':'Test Char', "
-                  "'typeclass':'evennia.objects.objects.DefaultCharacter'}",
-                  "Saved prototype: testprot", inputs=['y'])
+        self.call(
+            building.CmdSpawn(),
+            "/save {'prototype_key': 'testprot', 'key':'Test Char', "
+            "'typeclass':'evennia.objects.objects.DefaultCharacter'}",
+            "Saved prototype: testprot",
+            inputs=["y"],
+        )
 
         self.call(building.CmdSpawn(), "/search ", "Key ")
         self.call(building.CmdSpawn(), "/search test;test2", "")
 
-        self.call(building.CmdSpawn(),
-                  "/save {'key':'Test Char', "
-                  "'typeclass':'evennia.objects.objects.DefaultCharacter'}",
-                  "To save a prototype it must have the 'prototype_key' set.")
+        self.call(
+            building.CmdSpawn(),
+            "/save {'key':'Test Char', " "'typeclass':'evennia.objects.objects.DefaultCharacter'}",
+            "To save a prototype it must have the 'prototype_key' set.",
+        )
 
         self.call(building.CmdSpawn(), "/list", "Key ")
 
-        self.call(building.CmdSpawn(), 'testprot', "Spawned Test Char")
+        self.call(building.CmdSpawn(), "testprot", "Spawned Test Char")
         # Tests that the spawned object's location is the same as the caharacter's location, since
         # we did not specify it.
         testchar = getObject(self, "Test Char")
@@ -690,9 +1195,12 @@ def getObject(commandTest, objKeyStr):
             # char1's default location in the future...
             spawnLoc = self.room1
 
-        self.call(building.CmdSpawn(),
-                "{'prototype_key':'GOBLIN', 'typeclass':'evennia.objects.objects.DefaultCharacter', "
-                "'key':'goblin', 'location':'%s'}" % spawnLoc.dbref, "Spawned goblin")
+        self.call(
+            building.CmdSpawn(),
+            "{'prototype_key':'GOBLIN', 'typeclass':'evennia.objects.objects.DefaultCharacter', "
+            "'key':'goblin', 'location':'%s'}" % spawnLoc.dbref,
+            "Spawned goblin",
+        )
         goblin = getObject(self, "goblin")
         # Tests that the spawned object's type is a DefaultCharacter.
         self.assertIsInstance(goblin, DefaultCharacter)
@@ -701,9 +1209,13 @@ def getObject(commandTest, objKeyStr):
         goblin.delete()
 
         # create prototype
-        protlib.create_prototype({'key': 'Ball',
-                                  'typeclass': 'evennia.objects.objects.DefaultCharacter',
-                                  'prototype_key': 'testball'})
+        protlib.create_prototype(
+            {
+                "key": "Ball",
+                "typeclass": "evennia.objects.objects.DefaultCharacter",
+                "prototype_key": "testball",
+            }
+        )
 
         # Tests "spawn <prototype_name>"
         self.call(building.CmdSpawn(), "testball", "Spawned Ball")
@@ -715,20 +1227,28 @@ def getObject(commandTest, objKeyStr):
 
         # Tests "spawn/n ..." without specifying a location.
         # Location should be "None".
-        self.call(building.CmdSpawn(), "/n 'BALL'", "Spawned Ball")   # /n switch is abbreviated form of /noloc
+        self.call(
+            building.CmdSpawn(), "/n 'BALL'", "Spawned Ball"
+        )  # /n switch is abbreviated form of /noloc
         ball = getObject(self, "Ball")
         self.assertIsNone(ball.location)
         ball.delete()
 
-        self.call(building.CmdSpawn(),
-                "/noloc {'prototype_parent':'TESTBALL', 'prototype_key': 'testball', 'location':'%s'}"
-                % spawnLoc.dbref, "Error: Prototype testball tries to parent itself.")
+        self.call(
+            building.CmdSpawn(),
+            "/noloc {'prototype_parent':'TESTBALL', 'prototype_key': 'testball', 'location':'%s'}"
+            % spawnLoc.dbref,
+            "Error: Prototype testball tries to parent itself.",
+        )
 
         # Tests "spawn/noloc ...", but DO specify a location.
         # Location should be the specified location.
-        self.call(building.CmdSpawn(),
-                "/noloc {'prototype_parent':'TESTBALL', 'key': 'Ball', 'prototype_key': 'foo', 'location':'%s'}"
-                  % spawnLoc.dbref, "Spawned Ball")
+        self.call(
+            building.CmdSpawn(),
+            "/noloc {'prototype_parent':'TESTBALL', 'key': 'Ball', 'prototype_key': 'foo', 'location':'%s'}"
+            % spawnLoc.dbref,
+            "Spawned Ball",
+        )
         ball = getObject(self, "Ball")
         self.assertEqual(ball.location, spawnLoc)
         ball.delete()
@@ -741,115 +1261,156 @@ def getObject(commandTest, objKeyStr):
 
         # spawn/edit (missing prototype)
         # brings up olc menu
-        msg = self.call(
-            building.CmdSpawn(),
-            '/edit')
-        assert 'Prototype wizard' in msg
+        msg = self.call(building.CmdSpawn(), "/edit")
+        assert "Prototype wizard" in msg
 
         # spawn/edit with valid prototype
         # brings up olc menu loaded with prototype
-        msg = self.call(
-            building.CmdSpawn(),
-            '/edit testball')
-        assert 'Prototype wizard' in msg
+        msg = self.call(building.CmdSpawn(), "/edit testball")
+        assert "Prototype wizard" in msg
         assert hasattr(self.char1.ndb._menutree, "olc_prototype")
-        assert dict == type(self.char1.ndb._menutree.olc_prototype) \
-                and 'prototype_key' in self.char1.ndb._menutree.olc_prototype \
-                and 'key' in self.char1.ndb._menutree.olc_prototype \
-                and 'testball' == self.char1.ndb._menutree.olc_prototype['prototype_key'] \
-                and 'Ball' == self.char1.ndb._menutree.olc_prototype['key']
-        assert 'Ball' in msg and 'testball' in msg
+        assert (
+            dict == type(self.char1.ndb._menutree.olc_prototype)
+            and "prototype_key" in self.char1.ndb._menutree.olc_prototype
+            and "key" in self.char1.ndb._menutree.olc_prototype
+            and "testball" == self.char1.ndb._menutree.olc_prototype["prototype_key"]
+            and "Ball" == self.char1.ndb._menutree.olc_prototype["key"]
+        )
+        assert "Ball" in msg and "testball" in msg
 
         # spawn/edit with valid prototype (synomym)
-        msg = self.call(
-            building.CmdSpawn(),
-            '/edit BALL')
-        assert 'Prototype wizard' in msg
-        assert 'Ball' in msg and 'testball' in msg
+        msg = self.call(building.CmdSpawn(), "/edit BALL")
+        assert "Prototype wizard" in msg
+        assert "Ball" in msg and "testball" in msg
 
         # spawn/edit with invalid prototype
         msg = self.call(
-            building.CmdSpawn(),
-            '/edit NO_EXISTS',
-            "No prototype 'NO_EXISTS' was found.")
+            building.CmdSpawn(), "/edit NO_EXISTS", "No prototype 'NO_EXISTS' was found."
+        )
 
         # spawn/examine (missing prototype)
         # lists all prototypes that exist
-        msg = self.call(
-            building.CmdSpawn(),
-            '/examine')
-        assert 'testball' in msg and 'testprot' in msg
+        msg = self.call(building.CmdSpawn(), "/examine")
+        assert "testball" in msg and "testprot" in msg
 
         # spawn/examine with valid prototype
         # prints the prototype
-        msg = self.call(
-            building.CmdSpawn(),
-            '/examine BALL')
-        assert 'Ball' in msg and 'testball' in msg
+        msg = self.call(building.CmdSpawn(), "/examine BALL")
+        assert "Ball" in msg and "testball" in msg
 
         # spawn/examine with invalid prototype
         # shows error
-        self.call(
-            building.CmdSpawn(),
-            '/examine NO_EXISTS',
-            "No prototype 'NO_EXISTS' was found.")
+        self.call(building.CmdSpawn(), "/examine NO_EXISTS", "No prototype 'NO_EXISTS' was found.")
 
 
 class TestComms(CommandTest):
-
     def setUp(self):
         super(CommandTest, self).setUp()
-        self.call(comms.CmdChannelCreate(), "testchan;test=Test Channel",
-                  "Created channel testchan and connected to it.", receiver=self.account)
+        self.call(
+            comms.CmdChannelCreate(),
+            "testchan;test=Test Channel",
+            "Created channel testchan and connected to it.",
+            receiver=self.account,
+        )
 
     def test_toggle_com(self):
-        self.call(comms.CmdAddCom(), "tc = testchan",
-                  "You are already connected to channel testchan. You can now", receiver=self.account)
-        self.call(comms.CmdDelCom(), "tc", "Your alias 'tc' for channel testchan was cleared.", receiver=self.account)
+        self.call(
+            comms.CmdAddCom(),
+            "tc = testchan",
+            "You are already connected to channel testchan. You can now",
+            receiver=self.account,
+        )
+        self.call(
+            comms.CmdDelCom(),
+            "tc",
+            "Your alias 'tc' for channel testchan was cleared.",
+            receiver=self.account,
+        )
 
     def test_channels(self):
-        self.call(comms.CmdChannels(), "",
-                  "Available channels (use comlist,addcom and delcom to manage", receiver=self.account)
+        self.call(
+            comms.CmdChannels(),
+            "",
+            "Available channels (use comlist,addcom and delcom to manage",
+            receiver=self.account,
+        )
 
     def test_all_com(self):
-        self.call(comms.CmdAllCom(), "",
-                  "Available channels (use comlist,addcom and delcom to manage", receiver=self.account)
+        self.call(
+            comms.CmdAllCom(),
+            "",
+            "Available channels (use comlist,addcom and delcom to manage",
+            receiver=self.account,
+        )
 
     def test_clock(self):
-        self.call(comms.CmdClock(),
-                  "testchan=send:all()", "Lock(s) applied. Current locks on testchan:", receiver=self.account)
+        self.call(
+            comms.CmdClock(),
+            "testchan=send:all()",
+            "Lock(s) applied. Current locks on testchan:",
+            receiver=self.account,
+        )
 
     def test_cdesc(self):
-        self.call(comms.CmdCdesc(), "testchan = Test Channel",
-                  "Description of channel 'testchan' set to 'Test Channel'.", receiver=self.account)
+        self.call(
+            comms.CmdCdesc(),
+            "testchan = Test Channel",
+            "Description of channel 'testchan' set to 'Test Channel'.",
+            receiver=self.account,
+        )
 
     def test_cemit(self):
-        self.call(comms.CmdCemit(), "testchan = Test Message",
-                  "[testchan] Test Message|Sent to channel testchan: Test Message", receiver=self.account)
+        self.call(
+            comms.CmdCemit(),
+            "testchan = Test Message",
+            "[testchan] Test Message|Sent to channel testchan: Test Message",
+            receiver=self.account,
+        )
 
     def test_cwho(self):
-        self.call(comms.CmdCWho(), "testchan", "Channel subscriptions\ntestchan:\n  TestAccount", receiver=self.account)
+        self.call(
+            comms.CmdCWho(),
+            "testchan",
+            "Channel subscriptions\ntestchan:\n  TestAccount",
+            receiver=self.account,
+        )
 
     def test_page(self):
-        self.call(comms.CmdPage(), "TestAccount2 = Test",
-                  "TestAccount2 is offline. They will see your message if they list their pages later."
-                  "|You paged TestAccount2 with: 'Test'.", receiver=self.account)
+        self.call(
+            comms.CmdPage(),
+            "TestAccount2 = Test",
+            "TestAccount2 is offline. They will see your message if they list their pages later."
+            "|You paged TestAccount2 with: 'Test'.",
+            receiver=self.account,
+        )
 
     def test_cboot(self):
         # No one else connected to boot
-        self.call(comms.CmdCBoot(), "", "Usage: cboot[/quiet] <channel> = <account> [:reason]", receiver=self.account)
+        self.call(
+            comms.CmdCBoot(),
+            "",
+            "Usage: cboot[/quiet] <channel> = <account> [:reason]",
+            receiver=self.account,
+        )
 
     def test_cdestroy(self):
-        self.call(comms.CmdCdestroy(), "testchan",
-                  "[testchan] TestAccount: testchan is being destroyed. Make sure to change your aliases."
-                  "|Channel 'testchan' was destroyed.", receiver=self.account)
+        self.call(
+            comms.CmdCdestroy(),
+            "testchan",
+            "[testchan] TestAccount: testchan is being destroyed. Make sure to change your aliases."
+            "|Channel 'testchan' was destroyed.",
+            receiver=self.account,
+        )
 
 
 class TestBatchProcess(CommandTest):
     def test_batch_commands(self):
         # cannot test batchcode here, it must run inside the server process
-        self.call(batchprocess.CmdBatchCommands(), "example_batch_cmds",
-                "Running Batch-command processor - Automatic mode for example_batch_cmds")
+        self.call(
+            batchprocess.CmdBatchCommands(),
+            "example_batch_cmds",
+            "Running Batch-command processor - Automatic mode for example_batch_cmds",
+        )
         # we make sure to delete the button again here to stop the running reactor
         confirm = building.CmdDestroy.confirm
         building.CmdDestroy.confirm = False
@@ -878,18 +1439,23 @@ class TestUnconnectedCommand(CommandTest):
     def test_info_command(self):
         # instead of using SERVER_START_TIME (0), we use 86400 because Windows won't let us use anything lower
         gametime.SERVER_START_TIME = 86400
-        expected = "## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO" % (
-                        settings.SERVERNAME,
-                        datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
-                        SESSIONS.account_count(), utils.get_evennia_version())
+        expected = (
+            "## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO"
+            % (
+                settings.SERVERNAME,
+                datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
+                SESSIONS.account_count(),
+                utils.get_evennia_version(),
+            )
+        )
         self.call(unloggedin.CmdUnconnectedInfo(), "", expected)
         del gametime.SERVER_START_TIME
 
 
 # Test syscommands
 
-class TestSystemCommands(CommandTest):
 
+class TestSystemCommands(CommandTest):
     def test_simple_defaults(self):
         self.call(syscommands.SystemNoInput(), "")
         self.call(syscommands.SystemNoMatch(), "Huh?")
diff --git a/evennia/commands/default/unloggedin.py b/evennia/commands/default/unloggedin.py
index 3260da26262..2cceeca4fb2 100644
--- a/evennia/commands/default/unloggedin.py
+++ b/evennia/commands/default/unloggedin.py
@@ -14,8 +14,13 @@
 COMMAND_DEFAULT_CLASS = utils.class_from_module(settings.COMMAND_DEFAULT_CLASS)
 
 # limit symbol import for API
-__all__ = ("CmdUnconnectedConnect", "CmdUnconnectedCreate",
-           "CmdUnconnectedQuit", "CmdUnconnectedLook", "CmdUnconnectedHelp")
+__all__ = (
+    "CmdUnconnectedConnect",
+    "CmdUnconnectedCreate",
+    "CmdUnconnectedQuit",
+    "CmdUnconnectedLook",
+    "CmdUnconnectedHelp",
+)
 
 MULTISESSION_MODE = settings.MULTISESSION_MODE
 CONNECTION_SCREEN_MODULE = settings.CONNECTION_SCREEN_MODULE
@@ -45,7 +50,7 @@ def create_guest_account(session):
     if account:
         return enabled, account
     else:
-        session.msg("|R%s|n" % '\n'.join(errors))
+        session.msg("|R%s|n" % "\n".join(errors))
         return enabled, None
 
 
@@ -68,10 +73,12 @@ def create_normal_account(session, name, password):
 
     # Match account name and check password
     # authenticate() handles all its own throttling
-    account, errors = Account.authenticate(username=name, password=password, ip=address, session=session)
+    account, errors = Account.authenticate(
+        username=name, password=password, ip=address, session=session
+    )
     if not account:
         # No accountname or password match
-        session.msg("|R%s|n" % '\n'.join(errors))
+        session.msg("|R%s|n" % "\n".join(errors))
         return None
 
     return account
@@ -89,6 +96,7 @@ class CmdUnconnectedConnect(COMMAND_DEFAULT_CLASS):
 
     If you have spaces in your name, enclose it in double quotes.
     """
+
     key = "connect"
     aliases = ["conn", "con", "co"]
     locks = "cmd:all()"  # not really needed
@@ -122,7 +130,7 @@ def func(self):
                     session.sessionhandler.login(session, account)
                     return
                 else:
-                    session.msg("|R%s|n" % '\n'.join(errors))
+                    session.msg("|R%s|n" % "\n".join(errors))
                     return
 
         if len(parts) != 2:
@@ -133,11 +141,13 @@ def func(self):
         Account = class_from_module(settings.BASE_ACCOUNT_TYPECLASS)
 
         name, password = parts
-        account, errors = Account.authenticate(username=name, password=password, ip=address, session=session)
+        account, errors = Account.authenticate(
+            username=name, password=password, ip=address, session=session
+        )
         if account:
             session.sessionhandler.login(session, account)
         else:
-            session.msg("|R%s|n" % '\n'.join(errors))
+            session.msg("|R%s|n" % "\n".join(errors))
 
 
 class CmdUnconnectedCreate(COMMAND_DEFAULT_CLASS):
@@ -152,6 +162,7 @@ class CmdUnconnectedCreate(COMMAND_DEFAULT_CLASS):
 
     If you have spaces in your name, enclose it in double quotes.
     """
+
     key = "create"
     aliases = ["cre", "cr"]
     locks = "cmd:all()"
@@ -174,25 +185,31 @@ def func(self):
             # this was (hopefully) due to no quotes being found
             parts = parts[0].split(None, 1)
         if len(parts) != 2:
-            string = "\n Usage (without <>): create <name> <password>" \
-                     "\nIf <name> or <password> contains spaces, enclose it in double quotes."
+            string = (
+                "\n Usage (without <>): create <name> <password>"
+                "\nIf <name> or <password> contains spaces, enclose it in double quotes."
+            )
             session.msg(string)
             return
 
         username, password = parts
 
         # everything's ok. Create the new account account.
-        account, errors = Account.create(username=username, password=password, ip=address, session=session)
+        account, errors = Account.create(
+            username=username, password=password, ip=address, session=session
+        )
         if account:
             # tell the caller everything went well.
             string = "A new account '%s' was created. Welcome!"
             if " " in username:
-                string += "\n\nYou can now log in with the command 'connect \"%s\" <your password>'."
+                string += (
+                    "\n\nYou can now log in with the command 'connect \"%s\" <your password>'."
+                )
             else:
                 string += "\n\nYou can now log with the command 'connect %s <your password>'."
             session.msg(string % (username, username))
         else:
-            session.msg("|R%s|n" % '\n'.join(errors))
+            session.msg("|R%s|n" % "\n".join(errors))
 
 
 class CmdUnconnectedQuit(COMMAND_DEFAULT_CLASS):
@@ -206,6 +223,7 @@ class CmdUnconnectedQuit(COMMAND_DEFAULT_CLASS):
     here for unconnected accounts for the sake of simplicity. The logged in
     version is a bit more complicated.
     """
+
     key = "quit"
     aliases = ["q", "qu"]
     locks = "cmd:all()"
@@ -228,6 +246,7 @@ class CmdUnconnectedLook(COMMAND_DEFAULT_CLASS):
     This is called by the server and kicks everything in gear.
     All it does is display the connect screen.
     """
+
     key = CMD_LOGINSTART
     aliases = ["look", "l"]
     locks = "cmd:all()"
@@ -237,7 +256,7 @@ def func(self):
 
         callables = utils.callables_from_module(CONNECTION_SCREEN_MODULE)
         if "connection_screen" in callables:
-            connection_screen = callables['connection_screen']()
+            connection_screen = callables["connection_screen"]()
         else:
             connection_screen = utils.random_string_from_module(CONNECTION_SCREEN_MODULE)
             if not connection_screen:
@@ -255,6 +274,7 @@ class CmdUnconnectedHelp(COMMAND_DEFAULT_CLASS):
     This is an unconnected version of the help command,
     for simplicity. It shows a pane of info.
     """
+
     key = "help"
     aliases = ["h", "?"]
     locks = "cmd:all()"
@@ -262,8 +282,7 @@ class CmdUnconnectedHelp(COMMAND_DEFAULT_CLASS):
     def func(self):
         """Shows help"""
 
-        string = \
-            """
+        string = """
 You are not yet logged into the game. Commands available at this point:
 
   |wcreate|n - create a new account
@@ -283,7 +302,7 @@ def func(self):
 """
 
         if settings.STAFF_CONTACT_EMAIL:
-            string += 'For support, please contact: %s' % settings.STAFF_CONTACT_EMAIL
+            string += "For support, please contact: %s" % settings.STAFF_CONTACT_EMAIL
         self.caller.msg(string)
 
 
@@ -311,7 +330,7 @@ class CmdUnconnectedEncoding(COMMAND_DEFAULT_CLASS):
   """
 
     key = "encoding"
-    aliases = ("encode")
+    aliases = "encode"
     locks = "cmd:all()"
 
     def func(self):
@@ -323,7 +342,7 @@ def func(self):
             return
 
         sync = False
-        if 'clear' in self.switches:
+        if "clear" in self.switches:
             # remove customization
             old_encoding = self.session.protocol_flags.get("ENCODING", None)
             if old_encoding:
@@ -337,10 +356,15 @@ def func(self):
             pencoding = self.session.protocol_flags.get("ENCODING", None)
             string = ""
             if pencoding:
-                string += "Default encoding: |g%s|n (change with |wencoding <encoding>|n)" % pencoding
+                string += (
+                    "Default encoding: |g%s|n (change with |wencoding <encoding>|n)" % pencoding
+                )
             encodings = settings.ENCODINGS
             if encodings:
-                string += "\nServer's alternative encodings (tested in this order):\n   |g%s|n" % ", ".join(encodings)
+                string += (
+                    "\nServer's alternative encodings (tested in this order):\n   |g%s|n"
+                    % ", ".join(encodings)
+                )
             if not string:
                 string = "No encodings found."
         else:
@@ -350,11 +374,16 @@ def func(self):
             try:
                 codecs_lookup(encoding)
             except LookupError:
-                string = "|rThe encoding '|w%s|r' is invalid. Keeping the previous encoding '|w%s|r'.|n"\
-                         % (encoding, old_encoding)
+                string = (
+                    "|rThe encoding '|w%s|r' is invalid. Keeping the previous encoding '|w%s|r'.|n"
+                    % (encoding, old_encoding)
+                )
             else:
                 self.session.protocol_flags["ENCODING"] = encoding
-                string = "Your custom text encoding was changed from '|w%s|n' to '|w%s|n'." % (old_encoding, encoding)
+                string = "Your custom text encoding was changed from '|w%s|n' to '|w%s|n'." % (
+                    old_encoding,
+                    encoding,
+                )
                 sync = True
         if sync:
             self.session.sessionhandler.session_portal_sync(self.session)
@@ -371,6 +400,7 @@ class CmdUnconnectedScreenreader(COMMAND_DEFAULT_CLASS):
     Used to flip screenreader mode on and off before logging in (when
     logged in, use option screenreader on).
     """
+
     key = "screenreader"
 
     def func(self):
@@ -390,14 +420,20 @@ class CmdUnconnectedInfo(COMMAND_DEFAULT_CLASS):
     was created by looking at the MUDINFO implementation in MUX2, TinyMUSH, Rhost,
     and PennMUSH.
     """
+
     key = "info"
     locks = "cmd:all()"
 
     def func(self):
-        self.caller.msg("## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO" % (
-                        settings.SERVERNAME,
-                        datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
-                        SESSIONS.account_count(), utils.get_evennia_version()))
+        self.caller.msg(
+            "## BEGIN INFO 1.1\nName: %s\nUptime: %s\nConnected: %d\nVersion: Evennia %s\n## END INFO"
+            % (
+                settings.SERVERNAME,
+                datetime.datetime.fromtimestamp(gametime.SERVER_START_TIME).ctime(),
+                SESSIONS.account_count(),
+                utils.get_evennia_version(),
+            )
+        )
 
 
 def _create_account(session, accountname, password, permissions, typeclass=None, email=None):
@@ -405,10 +441,15 @@ def _create_account(session, accountname, password, permissions, typeclass=None,
     Helper function, creates an account of the specified typeclass.
     """
     try:
-        new_account = create.create_account(accountname, email, password, permissions=permissions, typeclass=typeclass)
+        new_account = create.create_account(
+            accountname, email, password, permissions=permissions, typeclass=typeclass
+        )
 
     except Exception as e:
-        session.msg("There was an error creating the Account:\n%s\n If this problem persists, contact an admin." % e)
+        session.msg(
+            "There was an error creating the Account:\n%s\n If this problem persists, contact an admin."
+            % e
+        )
         logger.log_trace()
         return False
 
@@ -431,13 +472,17 @@ def _create_character(session, new_account, typeclass, home, permissions):
     This is meant for Guest and MULTISESSION_MODE < 2 situations.
     """
     try:
-        new_character = create.create_object(typeclass, key=new_account.key, home=home, permissions=permissions)
+        new_character = create.create_object(
+            typeclass, key=new_account.key, home=home, permissions=permissions
+        )
         # set playable character list
         new_account.db._playable_characters.append(new_character)
 
         # allow only the character itself and the account to puppet this character (and Developers).
-        new_character.locks.add("puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)" %
-                                (new_character.id, new_account.id))
+        new_character.locks.add(
+            "puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)"
+            % (new_character.id, new_account.id)
+        )
 
         # If no description is set, set a default description
         if not new_character.db.desc:
@@ -445,5 +490,8 @@ def _create_character(session, new_account, typeclass, home, permissions):
         # We need to set this to have ic auto-connect to this character
         new_account.db._last_puppet = new_character
     except Exception as e:
-        session.msg("There was an error creating the Character:\n%s\n If this problem persists, contact an admin." % e)
+        session.msg(
+            "There was an error creating the Character:\n%s\n If this problem persists, contact an admin."
+            % e
+        )
         logger.log_trace()
diff --git a/evennia/commands/tests.py b/evennia/commands/tests.py
index b2f903996ec..a1ab9809f57 100644
--- a/evennia/commands/tests.py
+++ b/evennia/commands/tests.py
@@ -3,13 +3,16 @@
 
 """
 
+from django.test import override_settings
 from evennia.utils.test_resources import EvenniaTest, TestCase
 from evennia.commands.cmdset import CmdSet
 from evennia.commands.command import Command
+from evennia.commands import cmdparser
 
 
 # Testing-command sets
 
+
 class _CmdA(Command):
     key = "A"
 
@@ -78,6 +81,7 @@ def at_cmdset_creation(self):
         self.add(_CmdC("D"))
         self.add(_CmdD("D"))
 
+
 # testing Command Sets
 
 
@@ -261,6 +265,7 @@ def test_option_transfer(self):
         cmdset_f = d + b + c + a  # two last mergers duplicates=True
         self.assertEqual(len(cmdset_f.commands), 10)
 
+
 # test cmdhandler functions
 
 
@@ -277,7 +282,7 @@ class TestGetAndMergeCmdSets(TwistedTestCase, EvenniaTest):
     "Test the cmdhandler.get_and_merge_cmdsets function."
 
     def setUp(self):
-        self.patch(sys.modules['evennia.server.sessionhandler'], 'delay', _mockdelay)
+        self.patch(sys.modules["evennia.server.sessionhandler"], "delay", _mockdelay)
         super().setUp()
         self.cmdset_a = _CmdSetA()
         self.cmdset_b = _CmdSetB()
@@ -293,19 +298,25 @@ def test_from_session(self):
         a = self.cmdset_a
         a.no_channels = True
         self.set_cmdsets(self.session, a)
-        deferred = cmdhandler.get_and_merge_cmdsets(self.session, self.session, None, None, "session", "")
+        deferred = cmdhandler.get_and_merge_cmdsets(
+            self.session, self.session, None, None, "session", ""
+        )
 
         def _callback(cmdset):
             self.assertEqual(cmdset.key, "A")
+
         deferred.addCallback(_callback)
         return deferred
 
     def test_from_account(self):
         from evennia.commands.default.cmdset_account import AccountCmdSet
+
         a = self.cmdset_a
         a.no_channels = True
         self.set_cmdsets(self.account, a)
-        deferred = cmdhandler.get_and_merge_cmdsets(self.account, None, self.account, None, "account", "")
+        deferred = cmdhandler.get_and_merge_cmdsets(
+            self.account, None, self.account, None, "account", ""
+        )
         # get_and_merge_cmdsets converts  to lower-case internally.
 
         def _callback(cmdset):
@@ -313,7 +324,8 @@ def _callback(cmdset):
             pcmdset.at_cmdset_creation()
             pcmds = [cmd.key for cmd in pcmdset.commands] + ["a", "b", "c", "d"]
             self.assertTrue(all(cmd.key in pcmds for cmd in cmdset.commands))
-        #_callback = lambda cmdset: self.assertEqual(sum(1 for cmd in cmdset.commands if cmd.key in ("a", "b", "c", "d")), 4)
+
+        # _callback = lambda cmdset: self.assertEqual(sum(1 for cmd in cmdset.commands if cmd.key in ("a", "b", "c", "d")), 4)
         deferred.addCallback(_callback)
         return deferred
 
@@ -322,7 +334,11 @@ def test_from_object(self):
         deferred = cmdhandler.get_and_merge_cmdsets(self.obj1, None, None, self.obj1, "object", "")
         # get_and_merge_cmdsets converts  to lower-case internally.
 
-        def _callback(cmdset): return self.assertEqual(sum(1 for cmd in cmdset.commands if cmd.key in ("a", "b", "c", "d")), 4)
+        def _callback(cmdset):
+            return self.assertEqual(
+                sum(1 for cmd in cmdset.commands if cmd.key in ("a", "b", "c", "d")), 4
+            )
+
         deferred.addCallback(_callback)
         return deferred
 
@@ -338,6 +354,7 @@ def _callback(cmdset):
             self.assertTrue(cmdset.no_exits)
             self.assertTrue(cmdset.no_channels)
             self.assertEqual(cmdset.key, "D")
+
         deferred.addCallback(_callback)
         return deferred
 
@@ -345,6 +362,7 @@ def test_autocmdsets(self):
         import evennia
         from evennia.commands.default.cmdset_account import AccountCmdSet
         from evennia.comms.channelhandler import CHANNEL_HANDLER
+
         testchannel = evennia.create_channel("channeltest", locks="listen:all();send:all()")
         CHANNEL_HANDLER.add(testchannel)
         CHANNEL_HANDLER.update()
@@ -352,14 +370,19 @@ def test_autocmdsets(self):
         self.assertTrue(testchannel.has_connection(self.account))
         a, b, c, d = self.cmdset_a, self.cmdset_b, self.cmdset_c, self.cmdset_d
         self.set_cmdsets(self.account, a, b, c, d)
-        deferred = cmdhandler.get_and_merge_cmdsets(self.session, self.session, self.account, self.char1, "session", "")
+        deferred = cmdhandler.get_and_merge_cmdsets(
+            self.session, self.session, self.account, self.char1, "session", ""
+        )
 
         def _callback(cmdset):
             pcmdset = AccountCmdSet()
             pcmdset.at_cmdset_creation()
             pcmds = [cmd.key for cmd in pcmdset.commands] + ["a", "b", "c", "d"] + ["out"]
-            self.assertTrue(all(cmd.key or hasattr(cmd, "is_channel") in pcmds for cmd in cmdset.commands))
+            self.assertTrue(
+                all(cmd.key or hasattr(cmd, "is_channel") in pcmds for cmd in cmdset.commands)
+            )
             self.assertTrue(any(hasattr(cmd, "is_channel") for cmd in cmdset.commands))
+
         deferred.addCallback(_callback)
         return deferred
 
@@ -374,5 +397,93 @@ def test_duplicates(self):
 
         def _callback(cmdset):
             self.assertEqual(len(cmdset.commands), 9)
+
         deferred.addCallback(_callback)
         return deferred
+
+
+class AccessableCommand(Command):
+    def access(*args, **kwargs):
+        return True
+
+
+class _CmdTest1(AccessableCommand):
+    key = "test1"
+
+
+class _CmdTest2(AccessableCommand):
+    key = "another command"
+
+
+class _CmdTest3(AccessableCommand):
+    key = "&the third command"
+
+
+class _CmdTest4(AccessableCommand):
+    key = "test2"
+
+
+class _CmdSetTest(CmdSet):
+    key = "test_cmdset"
+
+    def at_cmdset_creation(self):
+        self.add(_CmdTest1)
+        self.add(_CmdTest2)
+        self.add(_CmdTest3)
+
+
+class TestCmdParser(TestCase):
+    def test_create_match(self):
+        class DummyCmd:
+            pass
+
+        dummy = DummyCmd()
+
+        self.assertEqual(
+            cmdparser.create_match("look at", "look at target", dummy, "look"),
+            ("look at", " target", dummy, 7, 0.5, "look"),
+        )
+
+    @override_settings(CMD_IGNORE_PREFIXES="@&/+")
+    def test_build_matches(self):
+        a_cmdset = _CmdSetTest()
+        bcmd = [cmd for cmd in a_cmdset.commands if cmd.key == "test1"][0]
+
+        # normal parsing
+        self.assertEqual(
+            cmdparser.build_matches("test1 rock", a_cmdset, include_prefixes=False),
+            [("test1", " rock", bcmd, 5, 0.5, "test1")],
+        )
+
+        # test prefix exclusion
+        bcmd = [cmd for cmd in a_cmdset.commands if cmd.key == "another command"][0]
+        self.assertEqual(
+            cmdparser.build_matches(
+                "@another command smiles to me  ", a_cmdset, include_prefixes=False
+            ),
+            [("another command", " smiles to me  ", bcmd, 15, 0.5, "another command")],
+        )
+        # test prefix exclusion on the cmd class
+        bcmd = [cmd for cmd in a_cmdset.commands if cmd.key == "&the third command"][0]
+        self.assertEqual(
+            cmdparser.build_matches("the third command", a_cmdset, include_prefixes=False),
+            [("the third command", "", bcmd, 17, 1.0, "&the third command")],
+        )
+
+    @override_settings(SEARCH_MULTIMATCH_REGEX=r"(?P<number>[0-9]+)-(?P<name>.*)")
+    def test_num_prefixes(self):
+        self.assertEqual(cmdparser.try_num_prefixes("look me"), (None, None))
+        self.assertEqual(cmdparser.try_num_prefixes("3-look me"), ("3", "look me"))
+        self.assertEqual(cmdparser.try_num_prefixes("567-look me"), ("567", "look me"))
+
+    @override_settings(
+        SEARCH_MULTIMATCH_REGEX=r"(?P<number>[0-9]+)-(?P<name>.*)", CMD_IGNORE_PREFIXES="@&/+"
+    )
+    def test_cmdparser(self):
+        a_cmdset = _CmdSetTest()
+        bcmd = [cmd for cmd in a_cmdset.commands if cmd.key == "test1"][0]
+
+        self.assertEqual(
+            cmdparser.cmdparser("test1hello", a_cmdset, None),
+            [("test1", "hello", bcmd, 5, 0.5, "test1")],
+        )
diff --git a/evennia/comms/admin.py b/evennia/comms/admin.py
index 5162334b6f0..dc84519437a 100644
--- a/evennia/comms/admin.py
+++ b/evennia/comms/admin.py
@@ -14,6 +14,7 @@ class ChannelAttributeInline(AttributeInline):
     Inline display of Channel Attribute - experimental
 
     """
+
     model = ChannelDB.db_attributes.through
     related_field = "channeldb"
 
@@ -23,6 +24,7 @@ class ChannelTagInline(TagInline):
     Inline display of Channel Tags - experimental
 
     """
+
     model = ChannelDB.db_tags.through
     related_field = "channeldb"
 
@@ -32,16 +34,26 @@ class MsgAdmin(admin.ModelAdmin):
     Defines display for Msg objects
 
     """
-    list_display = ('id', 'db_date_created', 'db_sender', 'db_receivers',
-                    'db_channels', 'db_message', 'db_lock_storage')
+
+    list_display = (
+        "id",
+        "db_date_created",
+        "db_sender",
+        "db_receivers",
+        "db_channels",
+        "db_message",
+        "db_lock_storage",
+    )
     list_display_links = ("id",)
-    ordering = ["db_date_created", 'db_sender', 'db_receivers', 'db_channels']
-    #readonly_fields = ['db_message', 'db_sender', 'db_receivers', 'db_channels']
-    search_fields = ['id', '^db_date_created', '^db_message']
+    ordering = ["db_date_created", "db_sender", "db_receivers", "db_channels"]
+    # readonly_fields = ['db_message', 'db_sender', 'db_receivers', 'db_channels']
+    search_fields = ["id", "^db_date_created", "^db_message"]
     save_as = True
     save_on_top = True
     list_select_related = True
-#admin.site.register(Msg, MsgAdmin)
+
+
+# admin.site.register(Msg, MsgAdmin)
 
 
 class ChannelAdmin(admin.ModelAdmin):
@@ -49,17 +61,28 @@ class ChannelAdmin(admin.ModelAdmin):
     Defines display for Channel objects
 
     """
+
     inlines = [ChannelTagInline, ChannelAttributeInline]
-    list_display = ('id', 'db_key', 'db_lock_storage', "subscriptions")
-    list_display_links = ("id", 'db_key')
+    list_display = ("id", "db_key", "db_lock_storage", "subscriptions")
+    list_display_links = ("id", "db_key")
     ordering = ["db_key"]
-    search_fields = ['id', 'db_key', 'db_tags__db_key']
+    search_fields = ["id", "db_key", "db_tags__db_key"]
     save_as = True
     save_on_top = True
     list_select_related = True
-    raw_id_fields = ('db_object_subscriptions', 'db_account_subscriptions',)
+    raw_id_fields = ("db_object_subscriptions", "db_account_subscriptions")
     fieldsets = (
-        (None, {'fields': (('db_key',), 'db_lock_storage', 'db_account_subscriptions', 'db_object_subscriptions')}),
+        (
+            None,
+            {
+                "fields": (
+                    ("db_key",),
+                    "db_lock_storage",
+                    "db_account_subscriptions",
+                    "db_object_subscriptions",
+                )
+            },
+        ),
     )
 
     def subscriptions(self, obj):
@@ -93,6 +116,7 @@ def save_model(self, request, obj, form, change):
     def response_add(self, request, obj, post_url_continue=None):
         from django.http import HttpResponseRedirect
         from django.urls import reverse
+
         return HttpResponseRedirect(reverse("admin:comms_channeldb_change", args=[obj.id]))
 
 
diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py
index 297aa7268e2..e33a95ed5ac 100644
--- a/evennia/comms/channelhandler.py
+++ b/evennia/comms/channelhandler.py
@@ -23,8 +23,6 @@
 does this for you.
 
 """
-from builtins import object
-
 from django.conf import settings
 from evennia.commands import cmdset, command
 from evennia.utils.logger import tail_log_file
@@ -57,6 +55,7 @@ class ChannelCommand(command.Command):
         {lower_channelkey}/history 30
 
     """
+
     # ^note that channeldesc and lower_channelkey will be filled
     # automatically by ChannelHandler
 
@@ -108,12 +107,12 @@ def func(self):
             string = _("You are not connected to channel '%s'.")
             self.msg(string % channelkey)
             return
-        if not channel.access(caller, 'send'):
+        if not channel.access(caller, "send"):
             string = _("You are not permitted to send to channel '%s'.")
             self.msg(string % channelkey)
             return
         if msg == "on":
-            caller = caller if not hasattr(caller, 'account') else caller.account
+            caller = caller if not hasattr(caller, "account") else caller.account
             unmuted = channel.unmute(caller)
             if unmuted:
                 self.msg("You start listening to %s." % channel)
@@ -121,7 +120,7 @@ def func(self):
             self.msg("You were already listening to %s." % channel)
             return
         if msg == "off":
-            caller = caller if not hasattr(caller, 'account') else caller.account
+            caller = caller if not hasattr(caller, "account") else caller.account
             muted = channel.mute(caller)
             if muted:
                 self.msg("You stop listening to %s." % channel)
@@ -132,11 +131,14 @@ def func(self):
             # Try to view history
             log_file = channel.attributes.get("log_file", default="channel_%s.log" % channel.key)
 
-            def send_msg(lines): return self.msg("".join(line.split("[-]", 1)[1]
-                                                         if "[-]" in line else line for line in lines))
+            def send_msg(lines):
+                return self.msg(
+                    "".join(line.split("[-]", 1)[1] if "[-]" in line else line for line in lines)
+                )
+
             tail_log_file(log_file, self.history_start, 20, callback=send_msg)
         else:
-            caller = caller if not hasattr(caller, 'account') else caller.account
+            caller = caller if not hasattr(caller, "account") else caller.account
             if caller in channel.mutelist:
                 self.msg("You currently have %s muted." % channel)
                 return
@@ -218,16 +220,19 @@ def add(self, channel):
             locks="cmd:all();%s" % channel.locks,
             help_category="Channel names",
             obj=channel,
-            is_channel=True)
+            is_channel=True,
+        )
         # format the help entry
         key = channel.key
-        cmd.__doc__ = cmd.__doc__.format(channelkey=key,
-                                         lower_channelkey=key.strip().lower(),
-                                         channeldesc=channel.attributes.get(
-                                            "desc", default="").strip())
+        cmd.__doc__ = cmd.__doc__.format(
+            channelkey=key,
+            lower_channelkey=key.strip().lower(),
+            channeldesc=channel.attributes.get("desc", default="").strip(),
+        )
         self._cached_channel_cmds[channel] = cmd
         self._cached_channels[key] = channel
         self._cached_cmdsets = {}
+
     add_channel = add  # legacy alias
 
     def remove(self, channel):
@@ -292,12 +297,15 @@ def get_cmdset(self, source_object):
         else:
             # create a new cmdset holding all viable channels
             chan_cmdset = None
-            chan_cmds = [channelcmd for channel, channelcmd in self._cached_channel_cmds.items()
-                         if channel.subscriptions.has(source_object) and
-                         channelcmd.access(source_object, 'send')]
+            chan_cmds = [
+                channelcmd
+                for channel, channelcmd in self._cached_channel_cmds.items()
+                if channel.subscriptions.has(source_object)
+                and channelcmd.access(source_object, "send")
+            ]
             if chan_cmds:
                 chan_cmdset = cmdset.CmdSet()
-                chan_cmdset.key = 'ChannelCmdSet'
+                chan_cmdset.key = "ChannelCmdSet"
                 chan_cmdset.priority = 101
                 chan_cmdset.duplicates = True
                 for cmd in chan_cmds:
diff --git a/evennia/comms/comms.py b/evennia/comms/comms.py
index 8c885d3458d..430478828c3 100644
--- a/evennia/comms/comms.py
+++ b/evennia/comms/comms.py
@@ -11,16 +11,17 @@
 from evennia.comms.managers import ChannelManager
 from evennia.utils import create, logger
 from evennia.utils.utils import make_iter
-from future.utils import with_metaclass
+
 _CHANNEL_HANDLER = None
 
 
-class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
+class DefaultChannel(ChannelDB, metaclass=TypeclassBase):
     """
     This is the base class for all Channel Comms. Inherit from this to
     create different types of communication channels.
 
     """
+
     objects = ChannelManager()
 
     def at_first_save(self):
@@ -105,7 +106,12 @@ def wholist(self):
         listening = [ob for ob in subs if ob.is_connected and ob not in muted]
         if subs:
             # display listening subscribers in bold
-            string = ", ".join([account.key if account not in listening else "|w%s|n" % account.key for account in subs])
+            string = ", ".join(
+                [
+                    account.key if account not in listening else "|w%s|n" % account.key
+                    for account in subs
+                ]
+            )
         else:
             string = "<None>"
         return string
@@ -163,7 +169,7 @@ def connect(self, subscriber, **kwargs):
 
         """
         # check access
-        if not self.access(subscriber, 'listen'):
+        if not self.access(subscriber, "listen"):
             return False
         # pre-join hook
         connect = self.pre_join_channel(subscriber)
@@ -204,7 +210,14 @@ def disconnect(self, subscriber, **kwargs):
         self.post_leave_channel(subscriber)
         return True
 
-    def access(self, accessing_obj, access_type='listen', default=False, no_superuser_bypass=False, **kwargs):
+    def access(
+        self,
+        accessing_obj,
+        access_type="listen",
+        default=False,
+        no_superuser_bypass=False,
+        **kwargs,
+    ):
         """
         Determines if another object has permission to access.
 
@@ -221,8 +234,12 @@ def access(self, accessing_obj, access_type='listen', default=False, no_superuse
             return (bool): Result of lock check.
 
         """
-        return self.locks.check(accessing_obj, access_type=access_type,
-                                default=default, no_superuser_bypass=no_superuser_bypass)
+        return self.locks.check(
+            accessing_obj,
+            access_type=access_type,
+            default=default,
+            no_superuser_bypass=no_superuser_bypass,
+        )
 
     @classmethod
     def create(cls, key, account=None, *args, **kwargs):
@@ -252,16 +269,18 @@ def create(cls, key, account=None, *args, **kwargs):
         """
         errors = []
         obj = None
-        ip = kwargs.pop('ip', '')
+        ip = kwargs.pop("ip", "")
 
         try:
-            kwargs['desc'] = kwargs.pop('description', '')
-            kwargs['typeclass'] = kwargs.get('typeclass', cls)
+            kwargs["desc"] = kwargs.pop("description", "")
+            kwargs["typeclass"] = kwargs.get("typeclass", cls)
             obj = create.create_channel(key, *args, **kwargs)
 
             # Record creator id and creation IP
-            if ip: obj.db.creator_ip = ip
-            if account: obj.db.creator_id = account.id
+            if ip:
+                obj.db.creator_ip = ip
+            if account:
+                obj.db.creator_id = account.id
 
         except Exception as exc:
             errors.append("An error occurred while creating this '%s' object." % key)
@@ -278,10 +297,12 @@ def delete(self):
         self.aliases.clear()
         super().delete()
         from evennia.comms.channelhandler import CHANNELHANDLER
+
         CHANNELHANDLER.update()
 
-    def message_transform(self, msgobj, emit=False, prefix=True,
-                          sender_strings=None, external=False, **kwargs):
+    def message_transform(
+        self, msgobj, emit=False, prefix=True, sender_strings=None, external=False, **kwargs
+    ):
         """
         Generates the formatted string sent to listeners on a channel.
 
@@ -333,16 +354,29 @@ def distribute_message(self, msgobj, online=False, **kwargs):
             try:
                 # note our addition of the from_channel keyword here. This could be checked
                 # by a custom account.msg() to treat channel-receives differently.
-                entity.msg(msgobj.message, from_obj=msgobj.senders, options={"from_channel": self.id})
+                entity.msg(
+                    msgobj.message, from_obj=msgobj.senders, options={"from_channel": self.id}
+                )
             except AttributeError as e:
                 logger.log_trace("%s\nCannot send msg to '%s'." % (e, entity))
 
         if msgobj.keep_log:
             # log to file
-            logger.log_file(msgobj.message, self.attributes.get("log_file") or "channel_%s.log" % self.key)
-
-    def msg(self, msgobj, header=None, senders=None, sender_strings=None,
-            keep_log=None, online=False, emit=False, external=False):
+            logger.log_file(
+                msgobj.message, self.attributes.get("log_file") or "channel_%s.log" % self.key
+            )
+
+    def msg(
+        self,
+        msgobj,
+        header=None,
+        senders=None,
+        sender_strings=None,
+        keep_log=None,
+        online=False,
+        emit=False,
+        external=False,
+    ):
         """
         Send the given message to all accounts connected to channel. Note that
         no permission-checking is done here; it is assumed to have been
@@ -391,9 +425,9 @@ def msg(self, msgobj, header=None, senders=None, sender_strings=None,
         msgobj = self.pre_send_message(msgobj)
         if not msgobj:
             return False
-        msgobj = self.message_transform(msgobj, emit=emit,
-                                        sender_strings=sender_strings,
-                                        external=external)
+        msgobj = self.message_transform(
+            msgobj, emit=emit, sender_strings=sender_strings, external=external
+        )
         self.distribute_message(msgobj, online=online)
         self.post_send_message(msgobj)
         return True
@@ -427,7 +461,7 @@ def channel_prefix(self, msg=None, emit=False, **kwargs):
             prefix (str): The created channel prefix.
 
         """
-        return '' if emit else '[%s] ' % self.key
+        return "" if emit else "[%s] " % self.key
 
     def format_senders(self, senders=None, **kwargs):
         """
@@ -448,8 +482,8 @@ def format_senders(self, senders=None, **kwargs):
 
         """
         if not senders:
-            return ''
-        return ', '.join(senders)
+            return ""
+        return ", ".join(senders)
 
     def pose_transform(self, msgobj, sender_string, **kwargs):
         """
@@ -472,16 +506,16 @@ def pose_transform(self, msgobj, sender_string, **kwargs):
         pose = False
         message = msgobj.message
         message_start = message.lstrip()
-        if message_start.startswith((':', ';')):
+        if message_start.startswith((":", ";")):
             pose = True
             message = message[1:]
-            if not message.startswith((':', "'", ',')):
-                if not message.startswith(' '):
-                    message = ' ' + message
+            if not message.startswith((":", "'", ",")):
+                if not message.startswith(" "):
+                    message = " " + message
         if pose:
-            return '%s%s' % (sender_string, message)
+            return "%s%s" % (sender_string, message)
         else:
-            return '%s: %s' % (sender_string, message)
+            return "%s: %s" % (sender_string, message)
 
     def format_external(self, msgobj, senders, emit=False, **kwargs):
         """
@@ -503,7 +537,7 @@ def format_external(self, msgobj, senders, emit=False, **kwargs):
         """
         if emit or not senders:
             return msgobj.message
-        senders = ', '.join(senders)
+        senders = ", ".join(senders)
         return self.pose_transform(msgobj, senders)
 
     def format_message(self, msgobj, emit=False, **kwargs):
@@ -522,14 +556,14 @@ def format_message(self, msgobj, emit=False, **kwargs):
         """
         # We don't want to count things like external sources as senders for
         # the purpose of constructing the message string.
-        senders = [sender for sender in msgobj.senders if hasattr(sender, 'key')]
+        senders = [sender for sender in msgobj.senders if hasattr(sender, "key")]
         if not senders:
             emit = True
         if emit:
             return msgobj.message
         else:
             senders = [sender.key for sender in msgobj.senders]
-            senders = ', '.join(senders)
+            senders = ", ".join(senders)
             return self.pose_transform(msgobj, senders)
 
     def pre_join_channel(self, joiner, **kwargs):
@@ -643,8 +677,9 @@ def web_get_admin_url(self):
 
         """
         content_type = ContentType.objects.get_for_model(self.__class__)
-        return reverse("admin:%s_%s_change" % (content_type.app_label,
-                                               content_type.model), args=(self.id,))
+        return reverse(
+            "admin:%s_%s_change" % (content_type.app_label, content_type.model), args=(self.id,)
+        )
 
     @classmethod
     def web_get_create_url(cls):
@@ -673,9 +708,9 @@ def web_get_create_url(cls):
 
         """
         try:
-            return reverse('%s-create' % slugify(cls._meta.verbose_name))
+            return reverse("%s-create" % slugify(cls._meta.verbose_name))
         except:
-            return '#'
+            return "#"
 
     def web_get_detail_url(self):
         """
@@ -704,11 +739,12 @@ def web_get_detail_url(self):
 
         """
         try:
-            return reverse('%s-detail' % slugify(self._meta.verbose_name),
-               kwargs={'slug': slugify(self.db_key)})
+            return reverse(
+                "%s-detail" % slugify(self._meta.verbose_name),
+                kwargs={"slug": slugify(self.db_key)},
+            )
         except:
-            return '#'
-
+            return "#"
 
     def web_get_update_url(self):
         """
@@ -737,10 +773,12 @@ def web_get_update_url(self):
 
         """
         try:
-            return reverse('%s-update' % slugify(self._meta.verbose_name),
-               kwargs={'slug': slugify(self.db_key)})
+            return reverse(
+                "%s-update" % slugify(self._meta.verbose_name),
+                kwargs={"slug": slugify(self.db_key)},
+            )
         except:
-            return '#'
+            return "#"
 
     def web_get_delete_url(self):
         """
@@ -768,10 +806,12 @@ def web_get_delete_url(self):
 
         """
         try:
-            return reverse('%s-delete' % slugify(self._meta.verbose_name),
-               kwargs={'slug': slugify(self.db_key)})
+            return reverse(
+                "%s-delete" % slugify(self._meta.verbose_name),
+                kwargs={"slug": slugify(self.db_key)},
+            )
         except:
-            return '#'
+            return "#"
 
     # Used by Django Sites/Admin
     get_absolute_url = web_get_detail_url
diff --git a/evennia/comms/managers.py b/evennia/comms/managers.py
index 3aca802e974..2a2589dd479 100644
--- a/evennia/comms/managers.py
+++ b/evennia/comms/managers.py
@@ -6,7 +6,7 @@
 
 
 from django.db.models import Q
-from evennia.typeclasses.managers import (TypedObjectManager, TypeclassManager)
+from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
 from evennia.utils import logger
 
 _GA = object.__getattribute__
@@ -22,6 +22,7 @@ class CommError(Exception):
     """
     Raised by comm system, to allow feedback to player when caught.
     """
+
     pass
 
 
@@ -29,6 +30,7 @@ class CommError(Exception):
 # helper functions
 #
 
+
 def dbref(inp, reqhash=True):
     """
     Valid forms of dbref (database reference number) are either a
@@ -46,7 +48,7 @@ def dbref(inp, reqhash=True):
     if reqhash and not (isinstance(inp, str) and inp.startswith("#")):
         return None
     if isinstance(inp, str):
-        inp = inp.lstrip('#')
+        inp = inp.lstrip("#")
     try:
         if int(inp) < 0:
             return None
@@ -85,7 +87,7 @@ def identify_object(inp):
         return inp, None
 
 
-def to_object(inp, objtype='account'):
+def to_object(inp, objtype="account"):
     """
     Locates the object related to the given accountname or channel key.
     If input was already the correct object, return it.
@@ -101,28 +103,28 @@ def to_object(inp, objtype='account'):
     obj, typ = identify_object(inp)
     if typ == objtype:
         return obj
-    if objtype == 'account':
-        if typ == 'object':
+    if objtype == "account":
+        if typ == "object":
             return obj.account
-        if typ == 'string':
+        if typ == "string":
             return _AccountDB.objects.get(user_username__iexact=obj)
-        if typ == 'dbref':
+        if typ == "dbref":
             return _AccountDB.objects.get(id=obj)
         logger.log_err("%s %s %s %s %s" % (objtype, inp, obj, typ, type(inp)))
         raise CommError()
-    elif objtype == 'object':
-        if typ == 'account':
+    elif objtype == "object":
+        if typ == "account":
             return obj.obj
-        if typ == 'string':
+        if typ == "string":
             return _ObjectDB.objects.get(db_key__iexact=obj)
-        if typ == 'dbref':
+        if typ == "dbref":
             return _ObjectDB.objects.get(id=obj)
         logger.log_err("%s %s %s %s %s" % (objtype, inp, obj, typ, type(inp)))
         raise CommError()
-    elif objtype == 'channel':
-        if typ == 'string':
+    elif objtype == "channel":
+        if typ == "string":
             return _ChannelDB.objects.get(db_key__iexact=obj)
-        if typ == 'dbref':
+        if typ == "dbref":
             return _ChannelDB.objects.get(id=obj)
         logger.log_err("%s %s %s %s %s" % (objtype, inp, obj, typ, type(inp)))
         raise CommError()
@@ -134,6 +136,7 @@ def to_object(inp, objtype='account'):
 # Msg manager
 #
 
+
 class MsgManager(TypedObjectManager):
     """
     This MsgManager implements methods for searching and manipulating
@@ -200,19 +203,25 @@ def get_messages_by_sender(self, sender, exclude_channel_messages=False):
         obj, typ = identify_object(sender)
         if exclude_channel_messages:
             # explicitly exclude channel recipients
-            if typ == 'account':
-                return list(self.filter(db_sender_accounts=obj,
-                                        db_receivers_channels__isnull=True).exclude(db_hide_from_accounts=obj))
-            elif typ == 'object':
-                return list(self.filter(db_sender_objects=obj,
-                                        db_receivers_channels__isnull=True).exclude(db_hide_from_objects=obj))
+            if typ == "account":
+                return list(
+                    self.filter(db_sender_accounts=obj, db_receivers_channels__isnull=True).exclude(
+                        db_hide_from_accounts=obj
+                    )
+                )
+            elif typ == "object":
+                return list(
+                    self.filter(db_sender_objects=obj, db_receivers_channels__isnull=True).exclude(
+                        db_hide_from_objects=obj
+                    )
+                )
             else:
                 raise CommError
         else:
             # get everything, channel or not
-            if typ == 'account':
+            if typ == "account":
                 return list(self.filter(db_sender_accounts=obj).exclude(db_hide_from_accounts=obj))
-            elif typ == 'object':
+            elif typ == "object":
                 return list(self.filter(db_sender_objects=obj).exclude(db_hide_from_objects=obj))
             else:
                 raise CommError
@@ -232,11 +241,11 @@ def get_messages_by_receiver(self, recipient):
 
         """
         obj, typ = identify_object(recipient)
-        if typ == 'account':
+        if typ == "account":
             return list(self.filter(db_receivers_accounts=obj).exclude(db_hide_from_accounts=obj))
-        elif typ == 'object':
+        elif typ == "object":
             return list(self.filter(db_receivers_objects=obj).exclude(db_hide_from_objects=obj))
-        elif typ == 'channel':
+        elif typ == "channel":
             return list(self.filter(db_receivers_channels=obj).exclude(db_hide_from_channels=obj))
         else:
             raise CommError
@@ -287,20 +296,24 @@ def search_message(self, sender=None, receiver=None, freetext=None, dbref=None):
 
         # filter by sender
         sender, styp = identify_object(sender)
-        if styp == 'account':
+        if styp == "account":
             sender_restrict = Q(db_sender_accounts=sender) & ~Q(db_hide_from_accounts=sender)
-        elif styp == 'object':
+        elif styp == "object":
             sender_restrict = Q(db_sender_objects=sender) & ~Q(db_hide_from_objects=sender)
         else:
             sender_restrict = Q()
         # filter by receiver
         receiver, rtyp = identify_object(receiver)
-        if rtyp == 'account':
-            receiver_restrict = Q(db_receivers_accounts=receiver) & ~Q(db_hide_from_accounts=receiver)
-        elif rtyp == 'object':
+        if rtyp == "account":
+            receiver_restrict = Q(db_receivers_accounts=receiver) & ~Q(
+                db_hide_from_accounts=receiver
+            )
+        elif rtyp == "object":
             receiver_restrict = Q(db_receivers_objects=receiver) & ~Q(db_hide_from_objects=receiver)
-        elif rtyp == 'channel':
-            receiver_restrict = Q(db_receivers_channels=receiver) & ~Q(db_hide_from_channels=receiver)
+        elif rtyp == "channel":
+            receiver_restrict = Q(db_receivers_channels=receiver) & ~Q(
+                db_hide_from_channels=receiver
+            )
         else:
             receiver_restrict = Q()
         # filter by full text
@@ -310,6 +323,7 @@ def search_message(self, sender=None, receiver=None, freetext=None, dbref=None):
             fulltext_restrict = Q()
         # execute the query
         return list(self.filter(sender_restrict & receiver_restrict & fulltext_restrict))
+
     # back-compatibility alias
     message_search = search_message
 
@@ -318,6 +332,7 @@ def search_message(self, sender=None, receiver=None, freetext=None, dbref=None):
 # Channel manager
 #
 
+
 class ChannelDBManager(TypedObjectManager):
     """
     This ChannelManager implements methods for searching and
@@ -361,9 +376,10 @@ def get_channel(self, channelkey):
                 return self.get(id=dbref)
             except self.model.DoesNotExist:
                 pass
-        results = self.filter(Q(db_key__iexact=channelkey) |
-                              Q(db_tags__db_tagtype__iexact="alias",
-                                db_tags__db_key__iexact=channelkey)).distinct()
+        results = self.filter(
+            Q(db_key__iexact=channelkey)
+            | Q(db_tags__db_tagtype__iexact="alias", db_tags__db_key__iexact=channelkey)
+        ).distinct()
         return results[0] if results else None
 
     def get_subscriptions(self, subscriber):
@@ -401,14 +417,17 @@ def search_channel(self, ostring, exact=True):
             except self.model.DoesNotExist:
                 pass
         if exact:
-            channels = self.filter(Q(db_key__iexact=ostring) |
-                                   Q(db_tags__db_tagtype__iexact="alias",
-                                     db_tags__db_key__iexact=ostring)).distinct()
+            channels = self.filter(
+                Q(db_key__iexact=ostring)
+                | Q(db_tags__db_tagtype__iexact="alias", db_tags__db_key__iexact=ostring)
+            ).distinct()
         else:
-            channels = self.filter(Q(db_key__icontains=ostring) |
-                                   Q(db_tags__db_tagtype__iexact="alias",
-                                     db_tags__db_key__icontains=ostring)).distinct()
+            channels = self.filter(
+                Q(db_key__icontains=ostring)
+                | Q(db_tags__db_tagtype__iexact="alias", db_tags__db_key__icontains=ostring)
+            ).distinct()
         return channels
+
     # back-compatibility alias
     channel_search = search_channel
 
@@ -417,4 +436,5 @@ class ChannelManager(ChannelDBManager, TypeclassManager):
     """
     Wrapper to group the typeclass manager to a consistent name.
     """
+
     pass
diff --git a/evennia/comms/migrations/0001_initial.py b/evennia/comms/migrations/0001_initial.py
index ba09b62bb90..b0b2e96189d 100644
--- a/evennia/comms/migrations/0001_initial.py
+++ b/evennia/comms/migrations/0001_initial.py
@@ -6,39 +6,85 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='ChannelDB',
+            name="ChannelDB",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(max_length=255, verbose_name='key', db_index=True)),
-                ('db_typeclass_path', models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass')),
-                ('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
-                ('db_lock_storage', models.TextField(help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks', blank=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                ("db_key", models.CharField(max_length=255, verbose_name="key", db_index=True)),
+                (
+                    "db_typeclass_path",
+                    models.CharField(
+                        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                        max_length=255,
+                        null=True,
+                        verbose_name="typeclass",
+                    ),
+                ),
+                (
+                    "db_date_created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                        verbose_name="locks",
+                        blank=True,
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Channel',
-                'verbose_name_plural': 'Channels',
-            },
+            options={"verbose_name": "Channel", "verbose_name_plural": "Channels"},
             bases=(models.Model,),
         ),
         migrations.CreateModel(
-            name='Msg',
+            name="Msg",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_sender_external', models.CharField(help_text="identifier for external sender, for example a sender over an IRC connection (i.e. someone who doesn't have an exixtence in-game).", max_length=255, null=True, verbose_name='external sender', db_index=True)),
-                ('db_header', models.TextField(null=True, verbose_name='header', blank=True)),
-                ('db_message', models.TextField(verbose_name='messsage')),
-                ('db_date_sent', models.DateTimeField(auto_now_add=True, verbose_name='date sent', db_index=True)),
-                ('db_lock_storage', models.TextField(help_text='access locks on this message.', verbose_name='locks', blank=True)),
-                ('db_hide_from_channels', models.ManyToManyField(related_name='hide_from_channels_set', null=True, to='comms.ChannelDB')),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    "db_sender_external",
+                    models.CharField(
+                        help_text="identifier for external sender, for example a sender over an IRC connection (i.e. someone who doesn't have an exixtence in-game).",
+                        max_length=255,
+                        null=True,
+                        verbose_name="external sender",
+                        db_index=True,
+                    ),
+                ),
+                ("db_header", models.TextField(null=True, verbose_name="header", blank=True)),
+                ("db_message", models.TextField(verbose_name="messsage")),
+                (
+                    "db_date_sent",
+                    models.DateTimeField(
+                        auto_now_add=True, verbose_name="date sent", db_index=True
+                    ),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="access locks on this message.", verbose_name="locks", blank=True
+                    ),
+                ),
+                (
+                    "db_hide_from_channels",
+                    models.ManyToManyField(
+                        related_name="hide_from_channels_set", null=True, to="comms.ChannelDB"
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Message',
-            },
+            options={"verbose_name": "Message"},
             bases=(models.Model,),
         ),
     ]
diff --git a/evennia/comms/migrations/0002_msg_db_hide_from_objects.py b/evennia/comms/migrations/0002_msg_db_hide_from_objects.py
index 09f8ceb1181..a05a492c1c1 100644
--- a/evennia/comms/migrations/0002_msg_db_hide_from_objects.py
+++ b/evennia/comms/migrations/0002_msg_db_hide_from_objects.py
@@ -6,16 +6,15 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0001_initial'),
-        ('comms', '0001_initial'),
-    ]
+    dependencies = [("objects", "0001_initial"), ("comms", "0001_initial")]
 
     operations = [
         migrations.AddField(
-            model_name='msg',
-            name='db_hide_from_objects',
-            field=models.ManyToManyField(related_name='hide_from_objects_set', null=True, to='objects.ObjectDB'),
+            model_name="msg",
+            name="db_hide_from_objects",
+            field=models.ManyToManyField(
+                related_name="hide_from_objects_set", null=True, to="objects.ObjectDB"
+            ),
             preserve_default=True,
-        ),
+        )
     ]
diff --git a/evennia/comms/migrations/0003_auto_20140917_0756.py b/evennia/comms/migrations/0003_auto_20140917_0756.py
index c9b4a32d64c..f5bf153fd62 100644
--- a/evennia/comms/migrations/0003_auto_20140917_0756.py
+++ b/evennia/comms/migrations/0003_auto_20140917_0756.py
@@ -8,65 +8,108 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('objects', '0001_initial'),
+        ("objects", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('typeclasses', '0001_initial'),
-        ('comms', '0002_msg_db_hide_from_objects'),
+        ("typeclasses", "0001_initial"),
+        ("comms", "0002_msg_db_hide_from_objects"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='msg',
-            name='db_hide_from_accounts',
-            field=models.ManyToManyField(related_name='hide_from_accounts_set', null=True, to=settings.AUTH_USER_MODEL),
+            model_name="msg",
+            name="db_hide_from_accounts",
+            field=models.ManyToManyField(
+                related_name="hide_from_accounts_set", null=True, to=settings.AUTH_USER_MODEL
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='msg',
-            name='db_receivers_channels',
-            field=models.ManyToManyField(help_text='channel recievers', related_name='channel_set', null=True, to='comms.ChannelDB'),
+            model_name="msg",
+            name="db_receivers_channels",
+            field=models.ManyToManyField(
+                help_text="channel recievers",
+                related_name="channel_set",
+                null=True,
+                to="comms.ChannelDB",
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='msg',
-            name='db_receivers_objects',
-            field=models.ManyToManyField(help_text='object receivers', related_name='receiver_object_set', null=True, to='objects.ObjectDB'),
+            model_name="msg",
+            name="db_receivers_objects",
+            field=models.ManyToManyField(
+                help_text="object receivers",
+                related_name="receiver_object_set",
+                null=True,
+                to="objects.ObjectDB",
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='msg',
-            name='db_receivers_accounts',
-            field=models.ManyToManyField(help_text='account receivers', related_name='receiver_account_set', null=True, to=settings.AUTH_USER_MODEL),
+            model_name="msg",
+            name="db_receivers_accounts",
+            field=models.ManyToManyField(
+                help_text="account receivers",
+                related_name="receiver_account_set",
+                null=True,
+                to=settings.AUTH_USER_MODEL,
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='msg',
-            name='db_sender_objects',
-            field=models.ManyToManyField(related_name='sender_object_set', null=True, verbose_name='sender(object)', to='objects.ObjectDB', db_index=True),
+            model_name="msg",
+            name="db_sender_objects",
+            field=models.ManyToManyField(
+                related_name="sender_object_set",
+                null=True,
+                verbose_name="sender(object)",
+                to="objects.ObjectDB",
+                db_index=True,
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='msg',
-            name='db_sender_accounts',
-            field=models.ManyToManyField(related_name='sender_account_set', null=True, verbose_name='sender(account)', to=settings.AUTH_USER_MODEL, db_index=True),
+            model_name="msg",
+            name="db_sender_accounts",
+            field=models.ManyToManyField(
+                related_name="sender_account_set",
+                null=True,
+                verbose_name="sender(account)",
+                to=settings.AUTH_USER_MODEL,
+                db_index=True,
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='channeldb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True),
+            model_name="channeldb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+                null=True,
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='channeldb',
-            name='db_subscriptions',
-            field=models.ManyToManyField(related_name='subscription_set', null=True, verbose_name='subscriptions', to=settings.AUTH_USER_MODEL, db_index=True),
+            model_name="channeldb",
+            name="db_subscriptions",
+            field=models.ManyToManyField(
+                related_name="subscription_set",
+                null=True,
+                verbose_name="subscriptions",
+                to=settings.AUTH_USER_MODEL,
+                db_index=True,
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='channeldb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True),
+            model_name="channeldb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+                null=True,
+            ),
             preserve_default=True,
         ),
     ]
diff --git a/evennia/comms/migrations/0004_auto_20150118_1631.py b/evennia/comms/migrations/0004_auto_20150118_1631.py
index 2e602f9fade..7343bf77429 100644
--- a/evennia/comms/migrations/0004_auto_20150118_1631.py
+++ b/evennia/comms/migrations/0004_auto_20150118_1631.py
@@ -13,10 +13,6 @@ def convert_defaults(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0003_auto_20140917_0756'),
-    ]
+    dependencies = [("comms", "0003_auto_20140917_0756")]
 
-    operations = [
-        migrations.RunPython(convert_defaults),
-    ]
+    operations = [migrations.RunPython(convert_defaults)]
diff --git a/evennia/comms/migrations/0005_auto_20150223_1517.py b/evennia/comms/migrations/0005_auto_20150223_1517.py
index b8289f5dea7..086058e101e 100644
--- a/evennia/comms/migrations/0005_auto_20150223_1517.py
+++ b/evennia/comms/migrations/0005_auto_20150223_1517.py
@@ -17,10 +17,6 @@ def convert_channelnames(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0004_auto_20150118_1631'),
-    ]
+    dependencies = [("comms", "0004_auto_20150118_1631")]
 
-    operations = [
-        migrations.RunPython(convert_channelnames),
-    ]
+    operations = [migrations.RunPython(convert_channelnames)]
diff --git a/evennia/comms/migrations/0006_channeldb_db_object_subscriptions.py b/evennia/comms/migrations/0006_channeldb_db_object_subscriptions.py
index 10aa7625764..c780fadd24d 100644
--- a/evennia/comms/migrations/0006_channeldb_db_object_subscriptions.py
+++ b/evennia/comms/migrations/0006_channeldb_db_object_subscriptions.py
@@ -6,16 +6,19 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0004_auto_20150118_1622'),
-        ('comms', '0005_auto_20150223_1517'),
-    ]
+    dependencies = [("objects", "0004_auto_20150118_1622"), ("comms", "0005_auto_20150223_1517")]
 
     operations = [
         migrations.AddField(
-            model_name='channeldb',
-            name='db_object_subscriptions',
-            field=models.ManyToManyField(related_name='object_subscription_set', null=True, verbose_name='subscriptions', to='objects.ObjectDB', db_index=True),
+            model_name="channeldb",
+            name="db_object_subscriptions",
+            field=models.ManyToManyField(
+                related_name="object_subscription_set",
+                null=True,
+                verbose_name="subscriptions",
+                to="objects.ObjectDB",
+                db_index=True,
+            ),
             preserve_default=True,
-        ),
+        )
     ]
diff --git a/evennia/comms/migrations/0007_msg_db_tags.py b/evennia/comms/migrations/0007_msg_db_tags.py
index 570a84e57c5..1b381c7d775 100644
--- a/evennia/comms/migrations/0007_msg_db_tags.py
+++ b/evennia/comms/migrations/0007_msg_db_tags.py
@@ -7,14 +7,18 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('typeclasses', '0004_auto_20151101_1759'),
-        ('comms', '0006_channeldb_db_object_subscriptions'),
+        ("typeclasses", "0004_auto_20151101_1759"),
+        ("comms", "0006_channeldb_db_object_subscriptions"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='msg',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this message. Tags are simple string markers to identify, group and alias messages.', to='typeclasses.Tag', null=True),
-        ),
+            model_name="msg",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this message. Tags are simple string markers to identify, group and alias messages.",
+                to="typeclasses.Tag",
+                null=True,
+            ),
+        )
     ]
diff --git a/evennia/comms/migrations/0008_auto_20160905_0902.py b/evennia/comms/migrations/0008_auto_20160905_0902.py
index 4a3f2071a76..7d24aa0b5cd 100644
--- a/evennia/comms/migrations/0008_auto_20160905_0902.py
+++ b/evennia/comms/migrations/0008_auto_20160905_0902.py
@@ -7,18 +7,11 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0007_msg_db_tags'),
-    ]
+    dependencies = [("comms", "0007_msg_db_tags")]
 
     operations = [
-        migrations.AlterModelOptions(
-            name='msg',
-            options={'verbose_name': 'Msg'},
-        ),
+        migrations.AlterModelOptions(name="msg", options={"verbose_name": "Msg"}),
         migrations.RenameField(
-            model_name='msg',
-            old_name='db_date_sent',
-            new_name='db_date_created',
+            model_name="msg", old_name="db_date_sent", new_name="db_date_created"
         ),
     ]
diff --git a/evennia/comms/migrations/0009_auto_20160921_1731.py b/evennia/comms/migrations/0009_auto_20160921_1731.py
index d9a589f836f..0f8007e7910 100644
--- a/evennia/comms/migrations/0009_auto_20160921_1731.py
+++ b/evennia/comms/migrations/0009_auto_20160921_1731.py
@@ -8,59 +8,110 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0008_auto_20160905_0902'),
-    ]
+    dependencies = [("comms", "0008_auto_20160905_0902")]
 
     operations = [
         migrations.AlterField(
-            model_name='msg',
-            name='db_hide_from_channels',
-            field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_channels_set', to='comms.ChannelDB'),
+            model_name="msg",
+            name="db_hide_from_channels",
+            field=models.ManyToManyField(
+                blank=True, null=True, related_name="hide_from_channels_set", to="comms.ChannelDB"
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_hide_from_objects',
-            field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_objects_set', to='objects.ObjectDB'),
+            model_name="msg",
+            name="db_hide_from_objects",
+            field=models.ManyToManyField(
+                blank=True, null=True, related_name="hide_from_objects_set", to="objects.ObjectDB"
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_hide_from_accounts',
-            field=models.ManyToManyField(blank=True, null=True, related_name='hide_from_accounts_set', to=settings.AUTH_USER_MODEL),
+            model_name="msg",
+            name="db_hide_from_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                null=True,
+                related_name="hide_from_accounts_set",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_channels',
-            field=models.ManyToManyField(blank=True, help_text='channel recievers', null=True, related_name='channel_set', to='comms.ChannelDB'),
+            model_name="msg",
+            name="db_receivers_channels",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="channel recievers",
+                null=True,
+                related_name="channel_set",
+                to="comms.ChannelDB",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_objects',
-            field=models.ManyToManyField(blank=True, help_text='object receivers', null=True, related_name='receiver_object_set', to='objects.ObjectDB'),
+            model_name="msg",
+            name="db_receivers_objects",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="object receivers",
+                null=True,
+                related_name="receiver_object_set",
+                to="objects.ObjectDB",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_accounts',
-            field=models.ManyToManyField(blank=True, help_text='account receivers', null=True, related_name='receiver_account_set', to=settings.AUTH_USER_MODEL),
+            model_name="msg",
+            name="db_receivers_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="account receivers",
+                null=True,
+                related_name="receiver_account_set",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_external',
-            field=models.CharField(blank=True, db_index=True, help_text="identifier for external sender, for example a sender over an IRC connection (i.e. someone who doesn't have an exixtence in-game).", max_length=255, null=True, verbose_name='external sender'),
+            model_name="msg",
+            name="db_sender_external",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                help_text="identifier for external sender, for example a sender over an IRC connection (i.e. someone who doesn't have an exixtence in-game).",
+                max_length=255,
+                null=True,
+                verbose_name="external sender",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_objects',
-            field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_object_set', to='objects.ObjectDB', verbose_name='sender(object)'),
+            model_name="msg",
+            name="db_sender_objects",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                null=True,
+                related_name="sender_object_set",
+                to="objects.ObjectDB",
+                verbose_name="sender(object)",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_accounts',
-            field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name='sender(account)'),
+            model_name="msg",
+            name="db_sender_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                null=True,
+                related_name="sender_account_set",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="sender(account)",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_tags',
-            field=models.ManyToManyField(blank=True, help_text='tags on this message. Tags are simple string markers to identify, group and alias messages.', null=True, to='typeclasses.Tag'),
+            model_name="msg",
+            name="db_tags",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="tags on this message. Tags are simple string markers to identify, group and alias messages.",
+                null=True,
+                to="typeclasses.Tag",
+            ),
         ),
     ]
diff --git a/evennia/comms/migrations/0010_auto_20161206_1912.py b/evennia/comms/migrations/0010_auto_20161206_1912.py
index dfb333f4ae0..21bc60d2da9 100644
--- a/evennia/comms/migrations/0010_auto_20161206_1912.py
+++ b/evennia/comms/migrations/0010_auto_20161206_1912.py
@@ -8,19 +8,31 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0009_auto_20160921_1731'),
-    ]
+    dependencies = [("comms", "0009_auto_20160921_1731")]
 
     operations = [
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_object_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='object_subscription_set', to='objects.ObjectDB', verbose_name='subscriptions'),
+            model_name="channeldb",
+            name="db_object_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                null=True,
+                related_name="object_subscription_set",
+                to="objects.ObjectDB",
+                verbose_name="subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='subscription_set', to=settings.AUTH_USER_MODEL, verbose_name='subscriptions'),
+            model_name="channeldb",
+            name="db_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                null=True,
+                related_name="subscription_set",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="subscriptions",
+            ),
         ),
     ]
diff --git a/evennia/comms/migrations/0011_auto_20170217_2039.py b/evennia/comms/migrations/0011_auto_20170217_2039.py
index 2cdcf09b0a3..7915e1ae87d 100644
--- a/evennia/comms/migrations/0011_auto_20170217_2039.py
+++ b/evennia/comms/migrations/0011_auto_20170217_2039.py
@@ -7,20 +7,30 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0007_auto_20150403_2339'),
-        ('comms', '0010_auto_20161206_1912'),
-    ]
+    dependencies = [("scripts", "0007_auto_20150403_2339"), ("comms", "0010_auto_20161206_1912")]
 
     operations = [
         migrations.AddField(
-            model_name='msg',
-            name='db_receivers_scripts',
-            field=models.ManyToManyField(blank=True, help_text='script_receivers', null=True, related_name='receiver_script_set', to='scripts.ScriptDB'),
+            model_name="msg",
+            name="db_receivers_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="script_receivers",
+                null=True,
+                related_name="receiver_script_set",
+                to="scripts.ScriptDB",
+            ),
         ),
         migrations.AddField(
-            model_name='msg',
-            name='db_sender_scripts',
-            field=models.ManyToManyField(blank=True, db_index=True, null=True, related_name='sender_script_set', to='scripts.ScriptDB', verbose_name='sender(script)'),
+            model_name="msg",
+            name="db_sender_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                null=True,
+                related_name="sender_script_set",
+                to="scripts.ScriptDB",
+                verbose_name="sender(script)",
+            ),
         ),
     ]
diff --git a/evennia/comms/migrations/0011_auto_20170606_1731.py b/evennia/comms/migrations/0011_auto_20170606_1731.py
index f25397b248c..8c212a7befb 100644
--- a/evennia/comms/migrations/0011_auto_20170606_1731.py
+++ b/evennia/comms/migrations/0011_auto_20170606_1731.py
@@ -8,74 +8,127 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0010_auto_20161206_1912'),
-    ]
+    dependencies = [("comms", "0010_auto_20161206_1912")]
 
     operations = [
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="channeldb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_object_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='object_subscription_set', to='objects.ObjectDB', verbose_name='subscriptions'),
+            model_name="channeldb",
+            name="db_object_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="object_subscription_set",
+                to="objects.ObjectDB",
+                verbose_name="subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='subscription_set', to=settings.AUTH_USER_MODEL, verbose_name='subscriptions'),
+            model_name="channeldb",
+            name="db_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="subscription_set",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="channeldb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_hide_from_channels',
-            field=models.ManyToManyField(blank=True, related_name='hide_from_channels_set', to='comms.ChannelDB'),
+            model_name="msg",
+            name="db_hide_from_channels",
+            field=models.ManyToManyField(
+                blank=True, related_name="hide_from_channels_set", to="comms.ChannelDB"
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_hide_from_objects',
-            field=models.ManyToManyField(blank=True, related_name='hide_from_objects_set', to='objects.ObjectDB'),
+            model_name="msg",
+            name="db_hide_from_objects",
+            field=models.ManyToManyField(
+                blank=True, related_name="hide_from_objects_set", to="objects.ObjectDB"
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_hide_from_accounts',
-            field=models.ManyToManyField(blank=True, related_name='hide_from_accounts_set', to=settings.AUTH_USER_MODEL),
+            model_name="msg",
+            name="db_hide_from_accounts",
+            field=models.ManyToManyField(
+                blank=True, related_name="hide_from_accounts_set", to=settings.AUTH_USER_MODEL
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_channels',
-            field=models.ManyToManyField(blank=True, help_text='channel recievers', related_name='channel_set', to='comms.ChannelDB'),
+            model_name="msg",
+            name="db_receivers_channels",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="channel recievers",
+                related_name="channel_set",
+                to="comms.ChannelDB",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_objects',
-            field=models.ManyToManyField(blank=True, help_text='object receivers', related_name='receiver_object_set', to='objects.ObjectDB'),
+            model_name="msg",
+            name="db_receivers_objects",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="object receivers",
+                related_name="receiver_object_set",
+                to="objects.ObjectDB",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_accounts',
-            field=models.ManyToManyField(blank=True, help_text='account receivers', related_name='receiver_account_set', to=settings.AUTH_USER_MODEL),
+            model_name="msg",
+            name="db_receivers_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="account receivers",
+                related_name="receiver_account_set",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_objects',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_object_set', to='objects.ObjectDB', verbose_name='sender(object)'),
+            model_name="msg",
+            name="db_sender_objects",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_object_set",
+                to="objects.ObjectDB",
+                verbose_name="sender(object)",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_accounts',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name='sender(account)'),
+            model_name="msg",
+            name="db_sender_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_account_set",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="sender(account)",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_tags',
-            field=models.ManyToManyField(blank=True, help_text='tags on this message. Tags are simple string markers to identify, group and alias messages.', to='typeclasses.Tag'),
+            model_name="msg",
+            name="db_tags",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="tags on this message. Tags are simple string markers to identify, group and alias messages.",
+                to="typeclasses.Tag",
+            ),
         ),
     ]
diff --git a/evennia/comms/migrations/0012_merge_20170617_2017.py b/evennia/comms/migrations/0012_merge_20170617_2017.py
index 2c068286183..f9717b8d542 100644
--- a/evennia/comms/migrations/0012_merge_20170617_2017.py
+++ b/evennia/comms/migrations/0012_merge_20170617_2017.py
@@ -7,10 +7,6 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0011_auto_20170606_1731'),
-        ('comms', '0011_auto_20170217_2039'),
-    ]
+    dependencies = [("comms", "0011_auto_20170606_1731"), ("comms", "0011_auto_20170217_2039")]
 
-    operations = [
-    ]
+    operations = []
diff --git a/evennia/comms/migrations/0013_auto_20170705_1726.py b/evennia/comms/migrations/0013_auto_20170705_1726.py
index aff480a7f08..df238dd44f2 100644
--- a/evennia/comms/migrations/0013_auto_20170705_1726.py
+++ b/evennia/comms/migrations/0013_auto_20170705_1726.py
@@ -13,72 +13,131 @@ def _table_exists(db_cursor, tablename):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0007_copy_player_to_account'),
-        ('comms', '0012_merge_20170617_2017'),
+        ("accounts", "0007_copy_player_to_account"),
+        ("comms", "0012_merge_20170617_2017"),
     ]
 
     db_cursor = connection.cursor()
 
     operations = [
         migrations.AddField(
-            model_name='channeldb',
-            name='db_account_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='account_subscription_set', to='accounts.AccountDB', verbose_name='account subscriptions'),
+            model_name="channeldb",
+            name="db_account_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="account_subscription_set",
+                to="accounts.AccountDB",
+                verbose_name="account subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_object_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='object_subscription_set', to='objects.ObjectDB', verbose_name='object subscriptions'),
+            model_name="channeldb",
+            name="db_object_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="object_subscription_set",
+                to="objects.ObjectDB",
+                verbose_name="object subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_scripts',
-            field=models.ManyToManyField(blank=True, help_text='script_receivers', related_name='receiver_script_set', to='scripts.ScriptDB'),
+            model_name="msg",
+            name="db_receivers_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="script_receivers",
+                related_name="receiver_script_set",
+                to="scripts.ScriptDB",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_scripts',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_script_set', to='scripts.ScriptDB', verbose_name='sender(script)'),
+            model_name="msg",
+            name="db_sender_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_script_set",
+                to="scripts.ScriptDB",
+                verbose_name="sender(script)",
+            ),
         ),
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_object_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='object_subscription_set', to='objects.ObjectDB', verbose_name='object subscriptions'),
+            model_name="channeldb",
+            name="db_object_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="object_subscription_set",
+                to="objects.ObjectDB",
+                verbose_name="object subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_scripts',
-            field=models.ManyToManyField(blank=True, help_text='script_receivers', related_name='receiver_script_set', to='scripts.ScriptDB'),
+            model_name="msg",
+            name="db_receivers_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="script_receivers",
+                related_name="receiver_script_set",
+                to="scripts.ScriptDB",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_scripts',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_script_set', to='scripts.ScriptDB', verbose_name='sender(script)'),
+            model_name="msg",
+            name="db_sender_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_script_set",
+                to="scripts.ScriptDB",
+                verbose_name="sender(script)",
+            ),
         ),
     ]
 
-    if _table_exists(db_cursor, 'comms_msg_db_hide_from_players'):
+    if _table_exists(db_cursor, "comms_msg_db_hide_from_players"):
         # OBS - this is run BEFORE migrations are run!
         # not a migration of an existing database
         operations += [
             migrations.AddField(
-                model_name='channeldb',
-                name='db_account_subscriptions',
-                field=models.ManyToManyField(blank=True, db_index=True, related_name='account_subscription_set', to='accounts.AccountDB', verbose_name='account subscriptions'),
+                model_name="channeldb",
+                name="db_account_subscriptions",
+                field=models.ManyToManyField(
+                    blank=True,
+                    db_index=True,
+                    related_name="account_subscription_set",
+                    to="accounts.AccountDB",
+                    verbose_name="account subscriptions",
+                ),
             ),
             migrations.AddField(
-                model_name='msg',
-                name='db_hide_from_accounts',
-                field=models.ManyToManyField(blank=True, related_name='hide_from_accounts_set', to='accounts.AccountDB'),
+                model_name="msg",
+                name="db_hide_from_accounts",
+                field=models.ManyToManyField(
+                    blank=True, related_name="hide_from_accounts_set", to="accounts.AccountDB"
+                ),
             ),
             migrations.AddField(
-                model_name='msg',
-                name='db_receivers_accounts',
-                field=models.ManyToManyField(blank=True, help_text='account receivers', related_name='receiver_account_set', to='accounts.AccountDB'),
+                model_name="msg",
+                name="db_receivers_accounts",
+                field=models.ManyToManyField(
+                    blank=True,
+                    help_text="account receivers",
+                    related_name="receiver_account_set",
+                    to="accounts.AccountDB",
+                ),
             ),
             migrations.AddField(
-                model_name='msg',
-                name='db_sender_accounts',
-                field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_account_set', to='accounts.AccountDB', verbose_name='sender(account)'),
+                model_name="msg",
+                name="db_sender_accounts",
+                field=models.ManyToManyField(
+                    blank=True,
+                    db_index=True,
+                    related_name="sender_account_set",
+                    to="accounts.AccountDB",
+                    verbose_name="sender(account)",
+                ),
             ),
         ]
diff --git a/evennia/comms/migrations/0014_auto_20170705_1736.py b/evennia/comms/migrations/0014_auto_20170705_1736.py
index 224aa2dda42..dbe39353fb3 100644
--- a/evennia/comms/migrations/0014_auto_20170705_1736.py
+++ b/evennia/comms/migrations/0014_auto_20170705_1736.py
@@ -8,15 +8,16 @@
 # the player->account transition. Now it will do nothing since players.PlayerDB
 # no longer exists.
 
+
 def forwards(apps, schema_editor):
 
     try:
-        apps.get_model('players', 'PlayerDB')
+        apps.get_model("players", "PlayerDB")
     except LookupError:
         return
-    AccountDB = apps.get_model('accounts', 'AccountDB')
+    AccountDB = apps.get_model("accounts", "AccountDB")
 
-    Msg = apps.get_model('comms', 'Msg')
+    Msg = apps.get_model("comms", "Msg")
     for msg in Msg.objects.all():
         for player in msg.db_sender_players.all():
             account = AccountDB.objects.get(id=player.id)
@@ -28,7 +29,7 @@ def forwards(apps, schema_editor):
             account = AccountDB.objects.get(id=player.id)
             msg.db_hide_from_accounts.add(account)
 
-    ChannelDB = apps.get_model('comms', 'ChannelDB')
+    ChannelDB = apps.get_model("comms", "ChannelDB")
     for channel in ChannelDB.objects.all():
         for player in channel.db_subscriptions.all():
             account = AccountDB.objects.get(id=player.id)
@@ -37,10 +38,6 @@ def forwards(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0013_auto_20170705_1726'),
-    ]
+    dependencies = [("comms", "0013_auto_20170705_1726")]
 
-    operations = [
-        migrations.RunPython(forwards)
-    ]
+    operations = [migrations.RunPython(forwards)]
diff --git a/evennia/comms/migrations/0015_auto_20170706_2041.py b/evennia/comms/migrations/0015_auto_20170706_2041.py
index 58d88eab254..8d918525703 100644
--- a/evennia/comms/migrations/0015_auto_20170706_2041.py
+++ b/evennia/comms/migrations/0015_auto_20170706_2041.py
@@ -12,9 +12,7 @@ def _table_exists(db_cursor, tablename):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0014_auto_20170705_1736'),
-    ]
+    dependencies = [("comms", "0014_auto_20170705_1736")]
 
     db_cursor = connection.cursor()
 
@@ -24,15 +22,9 @@ class Migration(migrations.Migration):
     else:
         operations = [
             migrations.RemoveField(
-                model_name='channeldb',
-                name='db_subscriptions',  # this is now db_account_subscriptions
-            ),
-            migrations.RemoveField(
-                model_name='msg',
-                name='db_receivers_players',
-            ),
-            migrations.RemoveField(
-                model_name='msg',
-                name='db_sender_players',
+                model_name="channeldb",
+                name="db_subscriptions",  # this is now db_account_subscriptions
             ),
+            migrations.RemoveField(model_name="msg", name="db_receivers_players"),
+            migrations.RemoveField(model_name="msg", name="db_sender_players"),
         ]
diff --git a/evennia/comms/migrations/0016_auto_20180925_1735.py b/evennia/comms/migrations/0016_auto_20180925_1735.py
index abe19c691a1..3ae01f20601 100644
--- a/evennia/comms/migrations/0016_auto_20180925_1735.py
+++ b/evennia/comms/migrations/0016_auto_20180925_1735.py
@@ -7,18 +7,11 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0015_auto_20170706_2041'),
-    ]
+    dependencies = [("comms", "0015_auto_20170706_2041")]
 
     operations = [
-        migrations.RemoveField(
-            model_name='channeldb',
-            name='db_subscriptions',
-        ),
+        migrations.RemoveField(model_name="channeldb", name="db_subscriptions"),
         migrations.AlterField(
-            model_name='msg',
-            name='db_message',
-            field=models.TextField(verbose_name='message'),
+            model_name="msg", name="db_message", field=models.TextField(verbose_name="message")
         ),
     ]
diff --git a/evennia/comms/migrations/0017_auto_20190128_1820.py b/evennia/comms/migrations/0017_auto_20190128_1820.py
index 3937ff9da04..bceed9a0318 100644
--- a/evennia/comms/migrations/0017_auto_20190128_1820.py
+++ b/evennia/comms/migrations/0017_auto_20190128_1820.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 18:20
-from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models
@@ -8,114 +7,188 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('comms', '0016_auto_20180925_1735'),
-    ]
+    dependencies = [("comms", "0016_auto_20180925_1735")]
 
     operations = [
         migrations.AlterField(
-            model_name='channeldb',
-            name='db_account_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='account_subscription_set', to=settings.AUTH_USER_MODEL, verbose_name='account subscriptions'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='creation date'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_key',
-            field=models.CharField(db_index=True, max_length=255, verbose_name='key'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_object_subscriptions',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='object_subscription_set', to='objects.ObjectDB', verbose_name='object subscriptions'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
-        ),
-        migrations.AlterField(
-            model_name='channeldb',
-            name='db_typeclass_path',
-            field=models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_date_created',
-            field=models.DateTimeField(auto_now_add=True, db_index=True, verbose_name='date sent'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_header',
-            field=models.TextField(blank=True, null=True, verbose_name='header'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text='access locks on this message.', verbose_name='locks'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_message',
-            field=models.TextField(verbose_name='message'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_accounts',
-            field=models.ManyToManyField(blank=True, help_text='account receivers', related_name='receiver_account_set', to=settings.AUTH_USER_MODEL),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_channels',
-            field=models.ManyToManyField(blank=True, help_text='channel recievers', related_name='channel_set', to='comms.ChannelDB'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_objects',
-            field=models.ManyToManyField(blank=True, help_text='object receivers', related_name='receiver_object_set', to='objects.ObjectDB'),
-        ),
-        migrations.AlterField(
-            model_name='msg',
-            name='db_receivers_scripts',
-            field=models.ManyToManyField(blank=True, help_text='script_receivers', related_name='receiver_script_set', to='scripts.ScriptDB'),
+            model_name="channeldb",
+            name="db_account_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="account_subscription_set",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="account subscriptions",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_accounts',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_account_set', to=settings.AUTH_USER_MODEL, verbose_name='sender(account)'),
+            model_name="channeldb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_external',
-            field=models.CharField(blank=True, db_index=True, help_text="identifier for external sender, for example a sender over an IRC connection (i.e. someone who doesn't have an exixtence in-game).", max_length=255, null=True, verbose_name='external sender'),
+            model_name="channeldb",
+            name="db_date_created",
+            field=models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_objects',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_object_set', to='objects.ObjectDB', verbose_name='sender(object)'),
+            model_name="channeldb",
+            name="db_key",
+            field=models.CharField(db_index=True, max_length=255, verbose_name="key"),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_sender_scripts',
-            field=models.ManyToManyField(blank=True, db_index=True, related_name='sender_script_set', to='scripts.ScriptDB', verbose_name='sender(script)'),
+            model_name="channeldb",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True,
+                help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                verbose_name="locks",
+            ),
         ),
         migrations.AlterField(
-            model_name='msg',
-            name='db_tags',
-            field=models.ManyToManyField(blank=True, help_text='tags on this message. Tags are simple string markers to identify, group and alias messages.', to='typeclasses.Tag'),
+            model_name="channeldb",
+            name="db_object_subscriptions",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="object_subscription_set",
+                to="objects.ObjectDB",
+                verbose_name="object subscriptions",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="channeldb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="channeldb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_date_created",
+            field=models.DateTimeField(auto_now_add=True, db_index=True, verbose_name="date sent"),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_header",
+            field=models.TextField(blank=True, null=True, verbose_name="header"),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True, help_text="access locks on this message.", verbose_name="locks"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg", name="db_message", field=models.TextField(verbose_name="message")
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_receivers_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="account receivers",
+                related_name="receiver_account_set",
+                to=settings.AUTH_USER_MODEL,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_receivers_channels",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="channel recievers",
+                related_name="channel_set",
+                to="comms.ChannelDB",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_receivers_objects",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="object receivers",
+                related_name="receiver_object_set",
+                to="objects.ObjectDB",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_receivers_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="script_receivers",
+                related_name="receiver_script_set",
+                to="scripts.ScriptDB",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_sender_accounts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_account_set",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="sender(account)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_sender_external",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                help_text="identifier for external sender, for example a sender over an IRC connection (i.e. someone who doesn't have an exixtence in-game).",
+                max_length=255,
+                null=True,
+                verbose_name="external sender",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_sender_objects",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_object_set",
+                to="objects.ObjectDB",
+                verbose_name="sender(object)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_sender_scripts",
+            field=models.ManyToManyField(
+                blank=True,
+                db_index=True,
+                related_name="sender_script_set",
+                to="scripts.ScriptDB",
+                verbose_name="sender(script)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="msg",
+            name="db_tags",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="tags on this message. Tags are simple string markers to identify, group and alias messages.",
+                to="typeclasses.Tag",
+            ),
         ),
     ]
diff --git a/evennia/comms/migrations/0018_auto_20191025_0831.py b/evennia/comms/migrations/0018_auto_20191025_0831.py
new file mode 100644
index 00000000000..42a67798f18
--- /dev/null
+++ b/evennia/comms/migrations/0018_auto_20191025_0831.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.6 on 2019-10-25 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("comms", "0017_auto_20190128_1820")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="channeldb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                db_index=True,
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
+        )
+    ]
diff --git a/evennia/comms/models.py b/evennia/comms/models.py
index ee7fd176dfa..8026a664ce0 100644
--- a/evennia/comms/models.py
+++ b/evennia/comms/models.py
@@ -17,8 +17,6 @@
 connect to channels by use of a ChannelConnect object (this object is
 necessary to easily be able to delete connections on the fly).
 """
-from builtins import object
-
 from django.conf import settings
 from django.utils import timezone
 from django.db import models
@@ -39,11 +37,12 @@
 _CHANNELHANDLER = None
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Msg
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class Msg(SharedMemoryModel):
     """
@@ -70,6 +69,7 @@ class Msg(SharedMemoryModel):
     - db_lock_storage: Internal storage of lock strings.
 
     """
+
     #
     # Msg database model setup
     #
@@ -80,48 +80,94 @@ class Msg(SharedMemoryModel):
     # Sender is either an account, an object or an external sender, like
     # an IRC channel; normally there is only one, but if co-modification of
     # a message is allowed, there may be more than one "author"
-    db_sender_accounts = models.ManyToManyField("accounts.AccountDB", related_name='sender_account_set',
-                                                blank=True, verbose_name='sender(account)', db_index=True)
-
-    db_sender_objects = models.ManyToManyField("objects.ObjectDB", related_name='sender_object_set',
-                                               blank=True, verbose_name='sender(object)', db_index=True)
-    db_sender_scripts = models.ManyToManyField("scripts.ScriptDB", related_name='sender_script_set',
-                                               blank=True, verbose_name='sender(script)', db_index=True)
-    db_sender_external = models.CharField('external sender', max_length=255, null=True, blank=True, db_index=True,
-                                          help_text="identifier for external sender, for example a sender over an "
-                                          "IRC connection (i.e. someone who doesn't have an exixtence in-game).")
+    db_sender_accounts = models.ManyToManyField(
+        "accounts.AccountDB",
+        related_name="sender_account_set",
+        blank=True,
+        verbose_name="sender(account)",
+        db_index=True,
+    )
+
+    db_sender_objects = models.ManyToManyField(
+        "objects.ObjectDB",
+        related_name="sender_object_set",
+        blank=True,
+        verbose_name="sender(object)",
+        db_index=True,
+    )
+    db_sender_scripts = models.ManyToManyField(
+        "scripts.ScriptDB",
+        related_name="sender_script_set",
+        blank=True,
+        verbose_name="sender(script)",
+        db_index=True,
+    )
+    db_sender_external = models.CharField(
+        "external sender",
+        max_length=255,
+        null=True,
+        blank=True,
+        db_index=True,
+        help_text="identifier for external sender, for example a sender over an "
+        "IRC connection (i.e. someone who doesn't have an exixtence in-game).",
+    )
     # The destination objects of this message. Stored as a
     # comma-separated string of object dbrefs. Can be defined along
     # with channels below.
-    db_receivers_accounts = models.ManyToManyField('accounts.AccountDB', related_name='receiver_account_set',
-                                                   blank=True, help_text="account receivers")
-
-    db_receivers_objects = models.ManyToManyField('objects.ObjectDB', related_name='receiver_object_set',
-                                                  blank=True, help_text="object receivers")
-    db_receivers_scripts = models.ManyToManyField('scripts.ScriptDB', related_name='receiver_script_set',
-                                                  blank=True, help_text="script_receivers")
-    db_receivers_channels = models.ManyToManyField("ChannelDB", related_name='channel_set',
-                                                   blank=True, help_text="channel recievers")
+    db_receivers_accounts = models.ManyToManyField(
+        "accounts.AccountDB",
+        related_name="receiver_account_set",
+        blank=True,
+        help_text="account receivers",
+    )
+
+    db_receivers_objects = models.ManyToManyField(
+        "objects.ObjectDB",
+        related_name="receiver_object_set",
+        blank=True,
+        help_text="object receivers",
+    )
+    db_receivers_scripts = models.ManyToManyField(
+        "scripts.ScriptDB",
+        related_name="receiver_script_set",
+        blank=True,
+        help_text="script_receivers",
+    )
+    db_receivers_channels = models.ManyToManyField(
+        "ChannelDB", related_name="channel_set", blank=True, help_text="channel recievers"
+    )
 
     # header could be used for meta-info about the message if your system needs
     # it, or as a separate store for the mail subject line maybe.
-    db_header = models.TextField('header', null=True, blank=True)
+    db_header = models.TextField("header", null=True, blank=True)
     # the message body itself
-    db_message = models.TextField('message')
+    db_message = models.TextField("message")
     # send date
-    db_date_created = models.DateTimeField('date sent', editable=False, auto_now_add=True, db_index=True)
+    db_date_created = models.DateTimeField(
+        "date sent", editable=False, auto_now_add=True, db_index=True
+    )
     # lock storage
-    db_lock_storage = models.TextField('locks', blank=True,
-                                       help_text='access locks on this message.')
+    db_lock_storage = models.TextField(
+        "locks", blank=True, help_text="access locks on this message."
+    )
 
     # these can be used to filter/hide a given message from supplied objects/accounts/channels
-    db_hide_from_accounts = models.ManyToManyField("accounts.AccountDB", related_name='hide_from_accounts_set', blank=True)
-
-    db_hide_from_objects = models.ManyToManyField("objects.ObjectDB", related_name='hide_from_objects_set', blank=True)
-    db_hide_from_channels = models.ManyToManyField("ChannelDB", related_name='hide_from_channels_set', blank=True)
-
-    db_tags = models.ManyToManyField(Tag, blank=True,
-                                     help_text='tags on this message. Tags are simple string markers to identify, group and alias messages.')
+    db_hide_from_accounts = models.ManyToManyField(
+        "accounts.AccountDB", related_name="hide_from_accounts_set", blank=True
+    )
+
+    db_hide_from_objects = models.ManyToManyField(
+        "objects.ObjectDB", related_name="hide_from_objects_set", blank=True
+    )
+    db_hide_from_channels = models.ManyToManyField(
+        "ChannelDB", related_name="hide_from_channels_set", blank=True
+    )
+
+    db_tags = models.ManyToManyField(
+        Tag,
+        blank=True,
+        help_text="tags on this message. Tags are simple string markers to identify, group and alias messages.",
+    )
 
     # Database manager
     objects = managers.MsgManager()
@@ -152,15 +198,17 @@ def tags(self):
     # is the object in question).
 
     # sender property (wraps db_sender_*)
-    #@property
+    # @property
     def __senders_get(self):
         "Getter. Allows for value = self.sender"
-        return list(self.db_sender_accounts.all()) + \
-            list(self.db_sender_objects.all()) + \
-            list(self.db_sender_scripts.all()) + \
-            self.extra_senders
-
-    #@sender.setter
+        return (
+            list(self.db_sender_accounts.all())
+            + list(self.db_sender_objects.all())
+            + list(self.db_sender_scripts.all())
+            + self.extra_senders
+        )
+
+    # @sender.setter
     def __senders_set(self, senders):
         "Setter. Allows for self.sender = value"
         for sender in make_iter(senders):
@@ -181,7 +229,7 @@ def __senders_set(self, senders):
             elif clsname == "ScriptDB":
                 self.db_sender_scripts.add(sender)
 
-    #@sender.deleter
+    # @sender.deleter
     def __senders_del(self):
         "Deleter. Clears all senders"
         self.db_sender_accounts.clear()
@@ -190,6 +238,7 @@ def __senders_del(self):
         self.db_sender_external = ""
         self.extra_senders = []
         self.save()
+
     senders = property(__senders_get, __senders_set, __senders_del)
 
     def remove_sender(self, senders):
@@ -217,18 +266,20 @@ def remove_sender(self, senders):
                 self.db_sender_accounts.remove(sender)
 
     # receivers property
-    #@property
+    # @property
     def __receivers_get(self):
         """
         Getter. Allows for value = self.receivers.
         Returns four lists of receivers: accounts, objects, scripts and channels.
         """
-        return list(self.db_receivers_accounts.all()) + \
-            list(self.db_receivers_objects.all()) + \
-            list(self.db_receivers_scripts.all()) + \
-            list(self.db_receivers_channels.all())
+        return (
+            list(self.db_receivers_accounts.all())
+            + list(self.db_receivers_objects.all())
+            + list(self.db_receivers_scripts.all())
+            + list(self.db_receivers_channels.all())
+        )
 
-    #@receivers.setter
+    # @receivers.setter
     def __receivers_set(self, receivers):
         """
         Setter. Allows for self.receivers = value.
@@ -249,7 +300,7 @@ def __receivers_set(self, receivers):
             elif clsname == "ChannelDB":
                 self.db_receivers_channels.add(receiver)
 
-    #@receivers.deleter
+    # @receivers.deleter
     def __receivers_del(self):
         "Deleter. Clears all receivers"
         self.db_receivers_accounts.clear()
@@ -257,6 +308,7 @@ def __receivers_del(self):
         self.db_receivers_scripts.clear()
         self.db_receivers_channels.clear()
         self.save()
+
     receivers = property(__receivers_get, __receivers_set, __receivers_del)
 
     def remove_receiver(self, receivers):
@@ -283,12 +335,12 @@ def remove_receiver(self, receivers):
                 self.db_receivers_channels.remove(receiver)
 
     # channels property
-    #@property
+    # @property
     def __channels_get(self):
         "Getter. Allows for value = self.channels. Returns a list of channels."
         return self.db_receivers_channels.all()
 
-    #@channels.setter
+    # @channels.setter
     def __channels_set(self, value):
         """
         Setter. Allows for self.channels = value.
@@ -297,11 +349,12 @@ def __channels_set(self, value):
         for val in (v for v in make_iter(value) if v):
             self.db_receivers_channels.add(val)
 
-    #@channels.deleter
+    # @channels.deleter
     def __channels_del(self):
         "Deleter. Allows for del self.channels"
         self.db_receivers_channels.clear()
         self.save()
+
     channels = property(__channels_get, __channels_set, __channels_del)
 
     def __hide_from_get(self):
@@ -309,9 +362,13 @@ def __hide_from_get(self):
         Getter. Allows for value = self.hide_from.
         Returns 3 lists of accounts, objects and channels
         """
-        return self.db_hide_from_accounts.all(), self.db_hide_from_objects.all(), self.db_hide_from_channels.all()
+        return (
+            self.db_hide_from_accounts.all(),
+            self.db_hide_from_objects.all(),
+            self.db_hide_from_channels.all(),
+        )
 
-    #@hide_from_sender.setter
+    # @hide_from_sender.setter
     def __hide_from_set(self, hiders):
         "Setter. Allows for self.hide_from = value. Will append to hiders"
         for hider in make_iter(hiders):
@@ -327,13 +384,14 @@ def __hide_from_set(self, hiders):
             elif clsname == "ChannelDB":
                 self.db_hide_from_channels.add(hider.__dbclass__)
 
-    #@hide_from_sender.deleter
+    # @hide_from_sender.deleter
     def __hide_from_del(self):
         "Deleter. Allows for del self.hide_from_senders"
         self.db_hide_from_accounts.clear()
         self.db_hide_from_objects.clear()
         self.db_hide_from_channels.clear()
         self.save()
+
     hide_from = property(__hide_from_get, __hide_from_set, __hide_from_del)
 
     #
@@ -343,10 +401,12 @@ def __hide_from_del(self):
     def __str__(self):
         "This handles what is shown when e.g. printing the message"
         senders = ",".join(obj.key for obj in self.senders)
-        receivers = ",".join(["[%s]" % obj.key for obj in self.channels] + [obj.key for obj in self.receivers])
+        receivers = ",".join(
+            ["[%s]" % obj.key for obj in self.channels] + [obj.key for obj in self.receivers]
+        )
         return "%s->%s: %s" % (senders, receivers, crop(self.message, width=40))
 
-    def access(self, accessing_obj, access_type='read', default=False):
+    def access(self, accessing_obj, access_type="read", default=False):
         """
         Checks lock access.
 
@@ -359,14 +419,14 @@ def access(self, accessing_obj, access_type='read', default=False):
             result (bool): If access was granted or not.
 
         """
-        return self.locks.check(accessing_obj,
-                                access_type=access_type, default=default)
+        return self.locks.check(accessing_obj, access_type=access_type, default=default)
+
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # TempMsg
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class TempMsg(object):
@@ -377,7 +437,17 @@ class TempMsg(object):
 
     """
 
-    def __init__(self, senders=None, receivers=None, channels=None, message="", header="", type="", lockstring="", hide_from=None):
+    def __init__(
+        self,
+        senders=None,
+        receivers=None,
+        channels=None,
+        message="",
+        header="",
+        type="",
+        lockstring="",
+        hide_from=None,
+    ):
         """
         Creates the temp message.
 
@@ -411,7 +481,9 @@ def __str__(self):
         This handles what is shown when e.g. printing the message.
         """
         senders = ",".join(obj.key for obj in self.senders)
-        receivers = ",".join(["[%s]" % obj.key for obj in self.channels] + [obj.key for obj in self.receivers])
+        receivers = ",".join(
+            ["[%s]" % obj.key for obj in self.channels] + [obj.key for obj in self.receivers]
+        )
         return "%s->%s: %s" % (senders, receivers, crop(self.message, width=40))
 
     def remove_sender(self, sender):
@@ -442,7 +514,7 @@ def remove_receiver(self, receiver):
             except ValueError:
                 pass  # nothing to remove
 
-    def access(self, accessing_obj, access_type='read', default=False):
+    def access(self, accessing_obj, access_type="read", default=False):
         """
         Checks lock access.
 
@@ -455,15 +527,15 @@ def access(self, accessing_obj, access_type='read', default=False):
             result (bool): If access was granted or not.
 
         """
-        return self.locks.check(accessing_obj,
-                                access_type=access_type, default=default)
+        return self.locks.check(accessing_obj, access_type=access_type, default=default)
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Channel
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class SubscriptionHandler(object):
     """
@@ -484,10 +556,18 @@ def __init__(self, obj):
         self._cache = None
 
     def _recache(self):
-        self._cache = {account: True for account in self.obj.db_account_subscriptions.all()
-                       if hasattr(account, 'pk') and account.pk}
-        self._cache.update({obj: True for obj in self.obj.db_object_subscriptions.all()
-                            if hasattr(obj, 'pk') and obj.pk})
+        self._cache = {
+            account: True
+            for account in self.obj.db_account_subscriptions.all()
+            if hasattr(account, "pk") and account.pk
+        }
+        self._cache.update(
+            {
+                obj: True
+                for obj in self.obj.db_object_subscriptions.all()
+                if hasattr(obj, "pk") and obj.pk
+            }
+        )
 
     def has(self, entity):
         """
@@ -570,6 +650,7 @@ def all(self):
         if self._cache is None:
             self._recache()
         return self._cache
+
     get = all  # alias
 
     def online(self):
@@ -583,8 +664,9 @@ def online(self):
         recache_needed = False
         for obj in self.all():
             from django.core.exceptions import ObjectDoesNotExist
+
             try:
-                if hasattr(obj, 'account') and obj.account:
+                if hasattr(obj, "account") and obj.account:
                     obj = obj.account
                 if not obj.is_connected:
                     continue
@@ -619,11 +701,22 @@ class ChannelDB(TypedObject):
       - db_object_subscriptions: The Object subscriptions.
 
     """
-    db_account_subscriptions = models.ManyToManyField("accounts.AccountDB",
-                                                      related_name="account_subscription_set", blank=True, verbose_name='account subscriptions', db_index=True)
 
-    db_object_subscriptions = models.ManyToManyField("objects.ObjectDB",
-                                                     related_name="object_subscription_set", blank=True, verbose_name='object subscriptions', db_index=True)
+    db_account_subscriptions = models.ManyToManyField(
+        "accounts.AccountDB",
+        related_name="account_subscription_set",
+        blank=True,
+        verbose_name="account subscriptions",
+        db_index=True,
+    )
+
+    db_object_subscriptions = models.ManyToManyField(
+        "objects.ObjectDB",
+        related_name="object_subscription_set",
+        blank=True,
+        verbose_name="object subscriptions",
+        db_index=True,
+    )
 
     # Database manager
     objects = managers.ChannelDBManager()
diff --git a/evennia/comms/tests.py b/evennia/comms/tests.py
index d38e34544b6..73e03e6aeed 100644
--- a/evennia/comms/tests.py
+++ b/evennia/comms/tests.py
@@ -1,13 +1,12 @@
-
 from evennia.utils.test_resources import EvenniaTest
 from evennia import DefaultChannel
 
+
 class ObjectCreationTest(EvenniaTest):
-    
     def test_channel_create(self):
         description = "A place to talk about coffee."
-        
-        obj, errors = DefaultChannel.create('coffeetalk', description=description)
+
+        obj, errors = DefaultChannel.create("coffeetalk", description=description)
         self.assertTrue(obj, errors)
         self.assertFalse(errors, errors)
-        self.assertEqual(description, obj.db.desc)
\ No newline at end of file
+        self.assertEqual(description, obj.db.desc)
diff --git a/evennia/contrib/README.md b/evennia/contrib/README.md
index 1748e868e11..402c34170a7 100644
--- a/evennia/contrib/README.md
+++ b/evennia/contrib/README.md
@@ -68,8 +68,6 @@ things you want from here into your game folder and change them there.
 
 ## Contrib packages
 
-* EGI_Client (gtaylor 2016) - Client for reporting game status
-  to the Evennia game index (games.evennia.com).
 * In-game Python (Vincent Le Goff 2017) - Allow trusted builders to script
   objects and events using Python from in-game.
 * Turnbattle (FlutterSprite 2017) - A turn-based combat engine meant
diff --git a/evennia/contrib/__init__.py b/evennia/contrib/__init__.py
index 428b3afcd1a..c379bb1cf74 100644
--- a/evennia/contrib/__init__.py
+++ b/evennia/contrib/__init__.py
@@ -13,8 +13,8 @@
 # but even so, you will get clashes when both using the tutorialworld and your
 # own code, so somthing needs to be done here. See issue #766. /Griatch
 
-#import evennia
+# import evennia
 # evennia._init()
-#import barter, dice, extended_room, menu_login, talking_npc
-#import chargen, email_login, gendersub, menusystem, slow_exit
-#import tutorial_world, tutorial_examples
+# import barter, dice, extended_room, menu_login, talking_npc
+# import chargen, email_login, gendersub, menusystem, slow_exit
+# import tutorial_world, tutorial_examples
diff --git a/evennia/contrib/barter.py b/evennia/contrib/barter.py
index 3171d4e297c..3d693ea5a28 100644
--- a/evennia/contrib/barter.py
+++ b/evennia/contrib/barter.py
@@ -94,8 +94,6 @@
 
 """
 
-from builtins import object
-
 from evennia import Command, DefaultScript, CmdSet
 
 TRADE_TIMEOUT = 60  # timeout for B to accept trade
@@ -388,6 +386,7 @@ def finish(self, force=False):
 # trading commands (will go into CmdsetTrade, initialized by the
 # CmdTrade command further down).
 
+
 class CmdTradeBase(Command):
     """
     Base command for Trade commands to inherit from. Implements the
@@ -411,7 +410,7 @@ def parse(self):
         self.emote = ""
         self.str_caller = "Your trade action: %s"
         self.str_other = "%s:s trade action: " % self.caller.key + "%s"
-        if ':' in self.args:
+        if ":" in self.args:
             self.args, self.emote = [part.strip() for part in self.args.rsplit(":", 1)]
             self.str_caller = 'You say, "' + self.emote + '"\n  [%s]'
             if self.caller.has_account:
@@ -422,6 +421,7 @@ def parse(self):
 
 # trade help
 
+
 class CmdTradeHelp(CmdTradeBase):
     """
     help command for the trade system.
@@ -431,6 +431,7 @@ class CmdTradeHelp(CmdTradeBase):
 
     Displays help for the trade commands.
     """
+
     key = "trade help"
     locks = "cmd:all()"
     help_category = "Trade"
@@ -467,6 +468,7 @@ def func(self):
 
 # offer
 
+
 class CmdOffer(CmdTradeBase):
     """
     offer one or more items in trade.
@@ -477,6 +479,7 @@ class CmdOffer(CmdTradeBase):
     Offer objects in trade. This will replace the currently
     standing offer.
     """
+
     key = "offer"
     locks = "cmd:all()"
     help_category = "Trading"
@@ -493,7 +496,7 @@ def func(self):
             return
 
         # gather all offers
-        offers = [part.strip() for part in self.args.split(',')]
+        offers = [part.strip() for part in self.args.split(",")]
         offerobjs = []
         for offername in offers:
             obj = caller.search(offername)
@@ -504,7 +507,10 @@ def func(self):
 
         # output
         if len(offerobjs) > 1:
-            objnames = ", ".join("|w%s|n" % obj.key for obj in offerobjs[:-1]) + " and |w%s|n" % offerobjs[-1].key
+            objnames = (
+                ", ".join("|w%s|n" % obj.key for obj in offerobjs[:-1])
+                + " and |w%s|n" % offerobjs[-1].key
+            )
         else:
             objnames = "|w%s|n" % offerobjs[0].key
 
@@ -514,6 +520,7 @@ def func(self):
 
 # accept
 
+
 class CmdAccept(CmdTradeBase):
     """
     accept the standing offer
@@ -527,6 +534,7 @@ class CmdAccept(CmdTradeBase):
     your mind as long as the other party has not yet accepted. You can inspect
     the current offer using the 'offers' command.
     """
+
     key = "accept"
     aliases = ["agree"]
     locks = "cmd:all()"
@@ -540,17 +548,31 @@ def func(self):
             return
         if self.tradehandler.accept(self.caller):
             # deal finished. Trade ended and cleaned.
-            caller.msg(self.str_caller % "You |gaccept|n the deal. |gDeal is made and goods changed hands.|n")
-            self.msg_other(caller, self.str_other % "%s |gaccepts|n the deal."
-                                                    " |gDeal is made and goods changed hands.|n" % caller.key)
+            caller.msg(
+                self.str_caller
+                % "You |gaccept|n the deal. |gDeal is made and goods changed hands.|n"
+            )
+            self.msg_other(
+                caller,
+                self.str_other % "%s |gaccepts|n the deal."
+                " |gDeal is made and goods changed hands.|n" % caller.key,
+            )
         else:
             # a one-sided accept.
-            caller.msg(self.str_caller % "You |Gaccept|n the offer. %s must now also accept." % self.other.key)
-            self.msg_other(caller, self.str_other % "%s |Gaccepts|n the offer. You must now also accept." % caller.key)
+            caller.msg(
+                self.str_caller
+                % "You |Gaccept|n the offer. %s must now also accept."
+                % self.other.key
+            )
+            self.msg_other(
+                caller,
+                self.str_other % "%s |Gaccepts|n the offer. You must now also accept." % caller.key,
+            )
 
 
 # decline
 
+
 class CmdDecline(CmdTradeBase):
     """
     decline the standing offer
@@ -563,6 +585,7 @@ class CmdDecline(CmdTradeBase):
     has not yet accepted the deal. Also, changing the offer will automatically
     decline the old offer.
     """
+
     key = "decline"
     locks = "cmd:all()"
     help_category = "Trading"
@@ -580,8 +603,12 @@ def func(self):
         if self.tradehandler.decline(self.caller):
             # changed a previous accept
             caller.msg(self.str_caller % "You change your mind, |Rdeclining|n the current offer.")
-            self.msg_other(caller, self.str_other
-                           % "%s changes their mind, |Rdeclining|n the current offer." % caller.key)
+            self.msg_other(
+                caller,
+                self.str_other
+                % "%s changes their mind, |Rdeclining|n the current offer."
+                % caller.key,
+            )
         else:
             # no acceptance to change
             caller.msg(self.str_caller % "You |Rdecline|n the current offer.")
@@ -595,6 +622,7 @@ def func(self):
 # magical properties, ammo requirements or whatnot), then you need to add this
 # here.
 
+
 class CmdEvaluate(CmdTradeBase):
     """
     evaluate objects on offer
@@ -605,6 +633,7 @@ class CmdEvaluate(CmdTradeBase):
     This allows you to examine any object currently on offer, to
     determine if it's worth your while.
     """
+
     key = "evaluate"
     aliases = ["eval"]
     locks = "cmd:all()"
@@ -634,6 +663,7 @@ def func(self):
 
 # status
 
+
 class CmdStatus(CmdTradeBase):
     """
     show a list of the current deal
@@ -648,6 +678,7 @@ class CmdStatus(CmdTradeBase):
     change your deal. You might also want to use 'say', 'emote' etc to
     try to influence the other part in the deal.
     """
+
     key = "status"
     aliases = ["offers", "deal"]
     locks = "cmd:all()"
@@ -671,19 +702,27 @@ def func(self):
         if not part_b_offerlist:
             part_b_offerlist = "\n <nothing>"
 
-        string = "|gOffered by %s:|n%s\n|yOffered by %s:|n%s" % (self.part_a.key,
-                                                                 "".join(part_a_offerlist),
-                                                                 self.part_b.key,
-                                                                 "".join(part_b_offerlist))
+        string = "|gOffered by %s:|n%s\n|yOffered by %s:|n%s" % (
+            self.part_a.key,
+            "".join(part_a_offerlist),
+            self.part_b.key,
+            "".join(part_b_offerlist),
+        )
         accept_a = self.tradehandler.part_a_accepted and "|gYes|n" or "|rNo|n"
         accept_b = self.tradehandler.part_b_accepted and "|gYes|n" or "|rNo|n"
-        string += "\n\n%s agreed: %s, %s agreed: %s" % (self.part_a.key, accept_a, self.part_b.key, accept_b)
+        string += "\n\n%s agreed: %s, %s agreed: %s" % (
+            self.part_a.key,
+            accept_a,
+            self.part_b.key,
+            accept_b,
+        )
         string += "\n Use 'offer', 'eval' and 'accept'/'decline' to trade. See also 'trade help'."
         caller.msg(string)
 
 
 # finish
 
+
 class CmdFinish(CmdTradeBase):
     """
     end the trade prematurely
@@ -695,6 +734,7 @@ class CmdFinish(CmdTradeBase):
     This ends the trade prematurely. No trade will take place.
 
     """
+
     key = "end trade"
     aliases = "finish trade"
     locks = "cmd:all()"
@@ -705,16 +745,20 @@ def func(self):
         caller = self.caller
         self.tradehandler.finish(force=True)
         caller.msg(self.str_caller % "You |raborted|n trade. No deal was made.")
-        self.msg_other(caller, self.str_other % "%s |raborted|n trade. No deal was made." % caller.key)
+        self.msg_other(
+            caller, self.str_other % "%s |raborted|n trade. No deal was made." % caller.key
+        )
 
 
 # custom Trading cmdset
 
+
 class CmdsetTrade(CmdSet):
     """
     This cmdset is added when trade is initated. It is handled by the
     trade event handler.
     """
+
     key = "cmdset_trade"
 
     def at_cmdset_creation(self):
@@ -731,6 +775,7 @@ def at_cmdset_creation(self):
 # access command - once both have given this, this will create the
 # trading cmdset to start trade.
 
+
 class CmdTrade(Command):
     """
     Initiate trade with another party
@@ -747,6 +792,7 @@ class CmdTrade(Command):
     optional say part works like the say command and allows you to add
     info to your choice.
     """
+
     key = "trade"
     aliases = ["barter"]
     locks = "cmd:all()"
@@ -766,7 +812,7 @@ def func(self):
         # handle the emote manually here
         selfemote = ""
         theiremote = ""
-        if ':' in self.args:
+        if ":" in self.args:
             self.args, emote = [part.strip() for part in self.args.rsplit(":", 1)]
             selfemote = 'You say, "%s"\n  ' % emote
             if self.caller.has_account:
@@ -778,12 +824,12 @@ def func(self):
         # might not match the actual name in tradehandler (in the case of
         # using this command to accept/decline a trade invitation).
         part_a = self.caller
-        accept = 'accept' in self.args
-        decline = 'decline' in self.args
+        accept = "accept" in self.args
+        decline = "decline" in self.args
         if accept:
-            part_b = self.args.rstrip('accept').strip()
+            part_b = self.args.rstrip("accept").strip()
         elif decline:
-            part_b = self.args.rstrip('decline').strip()
+            part_b = self.args.rstrip("decline").strip()
         else:
             part_b = self.args
         part_b = self.caller.search(part_b)
@@ -826,7 +872,9 @@ def func(self):
             # accept a trade proposal from part_b (so roles are reversed)
             if part_a.ndb.tradehandler:
                 # already in a trade
-                part_a.msg("You are already in trade with %s. You need to end that first." % part_b.key)
+                part_a.msg(
+                    "You are already in trade with %s. You need to end that first." % part_b.key
+                )
                 return
             if part_b.ndb.tradehandler.join(part_a):
                 part_b.msg(theiremote + str_start_a % part_a.key)
diff --git a/evennia/contrib/building_menu.py b/evennia/contrib/building_menu.py
index 8b7b18343db..ea56981d48b 100644
--- a/evennia/contrib/building_menu.py
+++ b/evennia/contrib/building_menu.py
@@ -160,9 +160,10 @@ def _menu_savefunc(caller, buf):
 
 
 def _menu_quitfunc(caller):
-    caller.cmdset.add(BuildingMenuCmdSet,
-                      permanent=caller.ndb._building_menu and
-                      caller.ndb._building_menu.persistent or False)
+    caller.cmdset.add(
+        BuildingMenuCmdSet,
+        permanent=caller.ndb._building_menu and caller.ndb._building_menu.persistent or False,
+    )
     if caller.ndb._building_menu:
         caller.ndb._building_menu.move(back=True)
 
@@ -234,6 +235,7 @@ def on_leave(caller, room): # note that room will contain `obj`
 
 # Helper functions, to be used in menu choices
 
+
 def menu_setattr(menu, choice, obj, string):
     """
     Set the value at the specified attribute.
@@ -252,10 +254,16 @@ def menu_setattr(menu, choice, obj, string):
     """
     attr = getattr(choice, "attr", None) if choice else None
     if choice is None or string is None or attr is None or menu is None:
-        log_err(dedent("""
+        log_err(
+            dedent(
+                """
                 The `menu_setattr` function was called to set the attribute {} of object {} to {},
                 but the choice {} of menu {} or another information is missing.
-            """.format(attr, obj, repr(string), choice, menu)).strip("\n")).strip()
+            """.format(
+                    attr, obj, repr(string), choice, menu
+                )
+            ).strip("\n")
+        ).strip()
         return
 
     for part in attr.split(".")[:-1]:
@@ -280,8 +288,10 @@ def menu_quit(caller, menu):
 
     """
     if caller is None or menu is None:
-        log_err("The function `menu_quit` was called with missing "
-                "arguments: caller={}, menu={}".format(caller, menu))
+        log_err(
+            "The function `menu_quit` was called with missing "
+            "arguments: caller={}, menu={}".format(caller, menu)
+        )
 
     if caller.cmdset.has(BuildingMenuCmdSet):
         menu.close()
@@ -303,12 +313,19 @@ def menu_edit(caller, choice, obj):
     attr = choice.attr
     caller.db._building_menu_to_edit = (obj, attr)
     caller.cmdset.remove(BuildingMenuCmdSet)
-    EvEditor(caller, loadfunc=_menu_loadfunc, savefunc=_menu_savefunc, quitfunc=_menu_quitfunc,
-             key="editor", persistent=True)
+    EvEditor(
+        caller,
+        loadfunc=_menu_loadfunc,
+        savefunc=_menu_savefunc,
+        quitfunc=_menu_quitfunc,
+        key="editor",
+        persistent=True,
+    )
 
 
 # Building menu commands and CmdSet
 
+
 class CmdNoInput(Command):
 
     """No input has been found."""
@@ -363,7 +380,9 @@ def func(self):
                 self.caller.msg(choice.format_text())
         else:
             for choice in self.menu.relevant_choices:
-                if choice.key.lower() == raw_string.lower() or any(raw_string.lower() == alias for alias in choice.aliases):
+                if choice.key.lower() == raw_string.lower() or any(
+                    raw_string.lower() == alias for alias in choice.aliases
+                ):
                     self.menu.move(choice.key)
                     return
 
@@ -395,13 +414,26 @@ def at_cmdset_creation(self):
 
 # Menu classes
 
+
 class Choice(object):
 
     """A choice object, created by `add_choice`."""
 
-    def __init__(self, title, key=None, aliases=None, attr=None, text=None,
-                 glance=None, on_enter=None, on_nomatch=None, on_leave=None,
-                 menu=None, caller=None, obj=None):
+    def __init__(
+        self,
+        title,
+        key=None,
+        aliases=None,
+        attr=None,
+        text=None,
+        glance=None,
+        on_enter=None,
+        on_nomatch=None,
+        on_leave=None,
+        menu=None,
+        caller=None,
+        obj=None,
+    ):
         """Constructor.
 
         Args:
@@ -452,7 +484,9 @@ def format_text(self):
         """Format the choice text and return it, or an empty string."""
         text = ""
         if self.text:
-            text = _call_or_get(self.text, menu=self.menu, choice=self, string="", caller=self.caller, obj=self.obj)
+            text = _call_or_get(
+                self.text, menu=self.menu, choice=self, string="", caller=self.caller, obj=self.obj
+            )
             text = dedent(text.strip("\n"))
             text = text.format(obj=self.obj, caller=self.caller)
 
@@ -466,8 +500,14 @@ def enter(self, string):
 
         """
         if self.on_enter:
-            _call_or_get(self.on_enter, menu=self.menu, choice=self, string=string,
-                         caller=self.caller, obj=self.obj)
+            _call_or_get(
+                self.on_enter,
+                menu=self.menu,
+                choice=self,
+                string=string,
+                caller=self.caller,
+                obj=self.obj,
+            )
 
     def nomatch(self, string):
         """Called when the user entered something in the choice.
@@ -482,8 +522,14 @@ def nomatch(self, string):
 
         """
         if self.on_nomatch:
-            return _call_or_get(self.on_nomatch, menu=self.menu, choice=self,
-                                string=string, caller=self.caller, obj=self.obj)
+            return _call_or_get(
+                self.on_nomatch,
+                menu=self.menu,
+                choice=self,
+                string=string,
+                caller=self.caller,
+                obj=self.obj,
+            )
 
         return True
 
@@ -495,8 +541,14 @@ def leave(self, string):
 
         """
         if self.on_leave:
-            _call_or_get(self.on_leave, menu=self.menu, choice=self,
-                         string=string, caller=self.caller, obj=self.obj)
+            _call_or_get(
+                self.on_leave,
+                menu=self.menu,
+                choice=self,
+                string=string,
+                caller=self.caller,
+                obj=self.obj,
+            )
 
 
 class BuildingMenu(object):
@@ -527,8 +579,15 @@ class BuildingMenu(object):
     joker_key = "*"  # The special key meaning "anything" in a choice key
     min_shortcut = 1  # The minimum length of shorcuts when `key` is not set
 
-    def __init__(self, caller=None, obj=None, title="Building menu: {obj}",
-                 keys=None, parents=None, persistent=False):
+    def __init__(
+        self,
+        caller=None,
+        obj=None,
+        title="Building menu: {obj}",
+        keys=None,
+        parents=None,
+        persistent=False,
+    ):
         """Constructor, you shouldn't override.  See `init` instead.
 
         Args:
@@ -650,12 +709,12 @@ def _save(self):
 
         if self.persistent:
             self.caller.db._building_menu = {
-                    "class": type(self).__module__ + "." + type(self).__name__,
-                    "obj": self.obj,
-                    "title": self.title,
-                    "keys": self.keys,
-                    "parents": self.parents,
-                    "persistent": self.persistent,
+                "class": type(self).__module__ + "." + type(self).__name__,
+                "obj": self.obj,
+                "title": self.title,
+                "keys": self.keys,
+                "parents": self.parents,
+                "persistent": self.persistent,
             }
 
     def _add_keys_choice(self):
@@ -668,7 +727,7 @@ def _add_keys_choice(self):
                 while length <= len(title):
                     i = 0
                     while i < len(title) - length + 1:
-                        guess = title[i:i + length]
+                        guess = title[i : i + length]
                         if guess not in self.cmds:
                             choice.key = guess
                             break
@@ -698,8 +757,18 @@ def init(self, obj):
         """
         pass
 
-    def add_choice(self, title, key=None, aliases=None, attr=None, text=None, glance=None,
-                   on_enter=None, on_nomatch=None, on_leave=None):
+    def add_choice(
+        self,
+        title,
+        key=None,
+        aliases=None,
+        attr=None,
+        text=None,
+        glance=None,
+        on_enter=None,
+        on_nomatch=None,
+        on_leave=None,
+    ):
         """
         Add a choice, a valid sub-menu, in the current builder menu.
 
@@ -762,8 +831,10 @@ def init(self):
             on_nomatch = menu_setattr
 
         if key and key in self.cmds:
-            raise ValueError("A conflict exists between {} and {}, both use "
-                             "key or alias {}".format(self.cmds[key], title, repr(key)))
+            raise ValueError(
+                "A conflict exists between {} and {}, both use "
+                "key or alias {}".format(self.cmds[key], title, repr(key))
+            )
 
         if attr:
             if glance is None:
@@ -777,12 +848,24 @@ def init(self):
                         Use |y{back}|n to go back to the main menu.
 
                         Current value: |c{{{obj_attr}}}|n
-                """.format(attr=attr, obj_attr="obj." + attr,
-                           back="|n or |y".join(self.keys_go_back))
-
-        choice = Choice(title, key=key, aliases=aliases, attr=attr, text=text, glance=glance,
-                        on_enter=on_enter, on_nomatch=on_nomatch, on_leave=on_leave,
-                        menu=self, caller=self.caller, obj=self.obj)
+                """.format(
+                    attr=attr, obj_attr="obj." + attr, back="|n or |y".join(self.keys_go_back)
+                )
+
+        choice = Choice(
+            title,
+            key=key,
+            aliases=aliases,
+            attr=attr,
+            text=text,
+            glance=glance,
+            on_enter=on_enter,
+            on_nomatch=on_nomatch,
+            on_leave=on_leave,
+            menu=self,
+            caller=self.caller,
+            obj=self.obj,
+        )
         self.choices.append(choice)
         if key:
             self.cmds[key] = choice
@@ -792,8 +875,15 @@ def init(self):
 
         return choice
 
-    def add_choice_edit(self, title="description", key="d", aliases=None, attr="db.desc",
-                        glance="\n   {obj.db.desc}", on_enter=None):
+    def add_choice_edit(
+        self,
+        title="description",
+        key="d",
+        aliases=None,
+        attr="db.desc",
+        glance="\n   {obj.db.desc}",
+        on_enter=None,
+    ):
         """
         Add a simple choice to edit a given attribute in the EvEditor.
 
@@ -817,8 +907,9 @@ def add_choice_edit(self, title="description", key="d", aliases=None, attr="db.d
 
         """
         on_enter = on_enter or menu_edit
-        return self.add_choice(title, key=key, aliases=aliases, attr=attr,
-                               glance=glance, on_enter=on_enter, text="")
+        return self.add_choice(
+            title, key=key, aliases=aliases, attr=attr, glance=glance, on_enter=on_enter, text=""
+        )
 
     def add_choice_quit(self, title="quit the menu", key="q", aliases=None, on_enter=None):
         """
@@ -883,17 +974,20 @@ def open_parent_menu(self):
             try:
                 menu_class = class_from_module(parent_class)
             except Exception:
-                log_trace("BuildingMenu: attempting to load class {} failed".format(
-                    repr(parent_class)))
+                log_trace(
+                    "BuildingMenu: attempting to load class {} failed".format(repr(parent_class))
+                )
                 return
 
             # Create the parent menu
             try:
-                building_menu = menu_class(self.caller, parent_obj,
-                                           keys=parent_keys, parents=tuple(parents))
+                building_menu = menu_class(
+                    self.caller, parent_obj, keys=parent_keys, parents=tuple(parents)
+                )
             except Exception:
-                log_trace("An error occurred while creating building menu {}".format(
-                    repr(parent_class)))
+                log_trace(
+                    "An error occurred while creating building menu {}".format(repr(parent_class))
+                )
                 return
             else:
                 return building_menu.open()
@@ -928,14 +1022,18 @@ def open_submenu(self, submenu_class, submenu_obj, parent_keys=None):
         try:
             menu_class = class_from_module(submenu_class)
         except Exception:
-            log_trace("BuildingMenu: attempting to load class {} failed".format(repr(submenu_class)))
+            log_trace(
+                "BuildingMenu: attempting to load class {} failed".format(repr(submenu_class))
+            )
             return
 
         # Create the submenu
         try:
             building_menu = menu_class(self.caller, submenu_obj, parents=parents)
         except Exception:
-            log_trace("An error occurred while creating building menu {}".format(repr(submenu_class)))
+            log_trace(
+                "An error occurred while creating building menu {}".format(repr(submenu_class))
+            )
             return
         else:
             return building_menu.open()
@@ -975,7 +1073,9 @@ def move(self, key=None, back=False, quiet=False, string=""):
             self.keys.append(key)
         else:  # Move backward
             if not self.keys:
-                raise ValueError("you already are at the top of the tree, you cannot move backward.")
+                raise ValueError(
+                    "you already are at the top of the tree, you cannot move backward."
+                )
 
             del self.keys[-1]
 
@@ -999,7 +1099,9 @@ def close(self):
     # Display methods.  Override for customization
     def display_title(self):
         """Return the menu title to be displayed."""
-        return _call_or_get(self.title, menu=self, obj=self.obj, caller=self.caller).format(obj=self.obj)
+        return _call_or_get(self.title, menu=self, obj=self.obj, caller=self.caller).format(
+            obj=self.obj
+        )
 
     def display_choice(self, choice):
         """Display the specified choice.
@@ -1008,18 +1110,21 @@ def display_choice(self, choice):
             choice (Choice): the menu choice.
 
         """
-        title = _call_or_get(choice.title, menu=self, choice=choice, obj=self.obj, caller=self.caller)
+        title = _call_or_get(
+            choice.title, menu=self, choice=choice, obj=self.obj, caller=self.caller
+        )
         clear_title = title.lower()
         pos = clear_title.find(choice.key.lower())
         ret = " "
         if pos >= 0:
-            ret += title[:pos] + "[|y" + choice.key.title() + "|n]" + title[pos + len(choice.key):]
+            ret += title[:pos] + "[|y" + choice.key.title() + "|n]" + title[pos + len(choice.key) :]
         else:
             ret += "[|y" + choice.key.title() + "|n] " + title
 
         if choice.glance:
-            glance = _call_or_get(choice.glance, menu=self, choice=choice,
-                                  caller=self.caller, string="", obj=self.obj)
+            glance = _call_or_get(
+                choice.glance, menu=self, choice=choice, caller=self.caller, string="", obj=self.obj
+            )
             glance = glance.format(obj=self.obj, caller=self.caller)
 
             ret += ": " + glance
@@ -1054,14 +1159,18 @@ def restore(caller):
         if menu:
             class_name = menu.get("class")
             if not class_name:
-                log_err("BuildingMenu: on caller {}, a persistent attribute holds building menu "
-                        "data, but no class could be found to restore the menu".format(caller))
+                log_err(
+                    "BuildingMenu: on caller {}, a persistent attribute holds building menu "
+                    "data, but no class could be found to restore the menu".format(caller)
+                )
                 return
 
             try:
                 menu_class = class_from_module(class_name)
             except Exception:
-                log_trace("BuildingMenu: attempting to load class {} failed".format(repr(class_name)))
+                log_trace(
+                    "BuildingMenu: attempting to load class {} failed".format(repr(class_name))
+                )
                 return
 
             # Create the menu
@@ -1071,10 +1180,13 @@ def restore(caller):
             parents = menu.get("parents")
             persistent = menu.get("persistent", False)
             try:
-                building_menu = menu_class(caller, obj, title=title, keys=keys,
-                                           parents=parents, persistent=persistent)
+                building_menu = menu_class(
+                    caller, obj, title=title, keys=keys, parents=parents, persistent=persistent
+                )
             except Exception:
-                log_trace("An error occurred while creating building menu {}".format(repr(class_name)))
+                log_trace(
+                    "An error occurred while creating building menu {}".format(repr(class_name))
+                )
                 return
 
             return building_menu
@@ -1102,7 +1214,12 @@ def init(self, obj):
             call `add_choice_quit` to add this choice with different options.
 
         """
-        self.add_choice("key", key="k", attr="key", glance="{obj.key}", text="""
+        self.add_choice(
+            "key",
+            key="k",
+            attr="key",
+            glance="{obj.key}",
+            text="""
                 -------------------------------------------------------------------------------
                 Editing the key of {{obj.key}}(#{{obj.id}})
 
@@ -1110,7 +1227,10 @@ def init(self, obj):
                 Use |y{back}|n to go back to the main menu.
 
                 Current key: |c{{obj.key}}|n
-        """.format(back="|n or |y".join(self.keys_go_back)))
+        """.format(
+                back="|n or |y".join(self.keys_go_back)
+            ),
+        )
         self.add_choice_edit("description", key="d", attr="db.desc")
 
 
diff --git a/evennia/contrib/chargen.py b/evennia/contrib/chargen.py
index 9bbeded6e00..06ee4e68bf9 100644
--- a/evennia/contrib/chargen.py
+++ b/evennia/contrib/chargen.py
@@ -81,7 +81,9 @@ def func(self):
                 if not avail_chars:
                     self.caller.msg("You have no characters to look at. Why not create one?")
                     return
-                objs = managers.objects.get_objs_with_key_and_typeclass(self.args.strip(), CHARACTER_TYPECLASS)
+                objs = managers.objects.get_objs_with_key_and_typeclass(
+                    self.args.strip(), CHARACTER_TYPECLASS
+                )
                 objs = [obj for obj in objs if obj.id in avail_chars]
                 if not objs:
                     self.caller.msg("You cannot see this Character.")
@@ -101,15 +103,17 @@ def func(self):
                 charlist += "\n\n   Use |w@ic <character name>|n to switch to that Character."
             else:
                 charlist = "You have no Characters."
-            string = \
-                """   You, %s, are an |wOOC ghost|n without form. The world is hidden
+            string = """   You, %s, are an |wOOC ghost|n without form. The world is hidden
    from you and besides chatting on channels your options are limited.
    You need to have a Character in order to interact with the world.
 
    %s
 
    Use |wcreate <name>|n to create a new character and |whelp|n for a
-   list of available commands.""" % (self.caller.key, charlist)
+   list of available commands.""" % (
+                self.caller.key,
+                charlist,
+            )
             self.caller.msg(string)
 
         else:
@@ -159,11 +163,15 @@ def func(self):
 
         new_character = create_object(CHARACTER_TYPECLASS, key=charname)
         if not new_character:
-            self.caller.msg("|rThe Character couldn't be created. This is a bug. Please contact an admin.")
+            self.caller.msg(
+                "|rThe Character couldn't be created. This is a bug. Please contact an admin."
+            )
             return
         # make sure to lock the character to only be puppeted by this account
-        new_character.locks.add("puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)" %
-                                (new_character.id, self.caller.id))
+        new_character.locks.add(
+            "puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)"
+            % (new_character.id, self.caller.id)
+        )
 
         # save dbref
         avail_chars = self.caller.db._character_dbrefs
diff --git a/evennia/contrib/clothing.py b/evennia/contrib/clothing.py
index 608fa0aa054..73bd9c20a76 100644
--- a/evennia/contrib/clothing.py
+++ b/evennia/contrib/clothing.py
@@ -51,18 +51,25 @@
 
     class Character(ClothedCharacter):
 
-And do the same with the ClothedCharacterCmdSet in your game's
-default_cmdsets.py:
+And then add ClothedCharacterCmdSet in your character set in your
+game's commands/default_cmdsets.py:
 
     from evennia.contrib.clothing import ClothedCharacterCmdSet
 
     class CharacterCmdSet(default_cmds.CharacterCmdSet):
+         ...
+         at_cmdset_creation(self):
+
+             super().at_cmdset_creation()
+             ...
+             self.add(ClothedCharacterCmdSet)    # <-- add this
 
 From here, you can use the default builder commands to create clothes
 with which to test the system:
 
     @create a pretty shirt : evennia.contrib.clothing.Clothing
     @set shirt/clothing_type = 'top'
+    wear shirt
 
 """
 
@@ -84,15 +91,21 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet):
 
 # The order in which clothing types appear on the description. Untyped clothing or clothing
 # with a type not given in this list goes last.
-CLOTHING_TYPE_ORDER = ['hat', 'jewelry', 'top', 'undershirt', 'gloves', 'fullbody', 'bottom',
-                       'underpants', 'socks', 'shoes', 'accessory']
+CLOTHING_TYPE_ORDER = [
+    "hat",
+    "jewelry",
+    "top",
+    "undershirt",
+    "gloves",
+    "fullbody",
+    "bottom",
+    "underpants",
+    "socks",
+    "shoes",
+    "accessory",
+]
 # The maximum number of each type of clothes that can be worn. Unlimited if untyped or not specified.
-CLOTHING_TYPE_LIMIT = {
-    'hat': 1,
-    'gloves': 1,
-    'socks': 1,
-    'shoes': 1
-}
+CLOTHING_TYPE_LIMIT = {"hat": 1, "gloves": 1, "socks": 1, "shoes": 1}
 # The maximum number of clothing items that can be worn, or None for unlimited.
 CLOTHING_OVERALL_LIMIT = 20
 # What types of clothes will automatically cover what other types of clothes when worn.
@@ -100,17 +113,18 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet):
 # on that auto-covers it - for example, it's perfectly possible to have your underpants
 # showing if you put them on after your pants!
 CLOTHING_TYPE_AUTOCOVER = {
-    'top': ['undershirt'],
-    'bottom': ['underpants'],
-    'fullbody': ['undershirt', 'underpants'],
-    'shoes': ['socks']
+    "top": ["undershirt"],
+    "bottom": ["underpants"],
+    "fullbody": ["undershirt", "underpants"],
+    "shoes": ["socks"],
 }
 # Types of clothes that can't be used to cover other clothes.
-CLOTHING_TYPE_CANT_COVER_WITH = ['jewelry']
+CLOTHING_TYPE_CANT_COVER_WITH = ["jewelry"]
 
 
 # HELPER FUNCTIONS START HERE
 
+
 def order_clothes_list(clothes_list):
     """
     Orders a given clothes list by the order specified in CLOTHING_TYPE_ORDER.
@@ -215,7 +229,6 @@ def single_type_count(clothes_list, type):
 
 
 class Clothing(DefaultObject):
-
     def wear(self, wearer, wearstyle, quiet=False):
         """
         Sets clothes to 'worn' and optionally echoes to the room.
@@ -239,8 +252,10 @@ def wear(self, wearer, wearstyle, quiet=False):
         to_cover = []
         if self.db.clothing_type and self.db.clothing_type in CLOTHING_TYPE_AUTOCOVER:
             for garment in get_worn_clothes(wearer):
-                if garment.db.clothing_type and garment.db.clothing_type \
-                        in CLOTHING_TYPE_AUTOCOVER[self.db.clothing_type]:
+                if (
+                    garment.db.clothing_type
+                    and garment.db.clothing_type in CLOTHING_TYPE_AUTOCOVER[self.db.clothing_type]
+                ):
                     to_cover.append(garment)
                     garment.db.covered_by = self
         # Return if quiet
@@ -275,7 +290,11 @@ def remove(self, wearer, quiet=False):
                 thing.db.covered_by = False
                 uncovered_list.append(thing.name)
         if len(uncovered_list) > 0:
-            remove_message = "%s removes %s, revealing %s." % (wearer, self.name, list_to_string(uncovered_list))
+            remove_message = "%s removes %s, revealing %s." % (
+                wearer,
+                self.name,
+                list_to_string(uncovered_list),
+            )
         # Echo a message to the room
         if not quiet:
             wearer.location.msg_contents(remove_message)
@@ -338,6 +357,7 @@ def return_appearance(self, looker):
 
 # COMMANDS START HERE
 
+
 class CmdWear(MuxCommand):
     """
     Puts on an item of clothing you are holding.
@@ -367,8 +387,9 @@ def func(self):
         clothing = self.caller.search(self.arglist[0], candidates=self.caller.contents)
         wearstyle = True
         if not clothing:
+            self.caller.msg("Thing to wear must be in your inventory.")
             return
-        if not clothing.is_typeclass("evennia.contrib.clothing.Clothing"):
+        if not clothing.is_typeclass("evennia.contrib.clothing.Clothing", exact=False):
             self.caller.msg("That's not clothes!")
             return
 
@@ -382,7 +403,10 @@ def func(self):
             type_count = single_type_count(get_worn_clothes(self.caller), clothing.db.clothing_type)
             if clothing.db.clothing_type in list(CLOTHING_TYPE_LIMIT.keys()):
                 if type_count >= CLOTHING_TYPE_LIMIT[clothing.db.clothing_type]:
-                    self.caller.msg("You can't wear any more clothes of the type '%s'." % clothing.db.clothing_type)
+                    self.caller.msg(
+                        "You can't wear any more clothes of the type '%s'."
+                        % clothing.db.clothing_type
+                    )
                     return
 
         if clothing.db.worn and len(self.arglist) == 1:
@@ -391,9 +415,16 @@ def func(self):
         if len(self.arglist) > 1:  # If wearstyle arguments given
             wearstyle_list = self.arglist  # Split arguments into a list of words
             del wearstyle_list[0]  # Leave first argument (the clothing item) out of the wearstyle
-            wearstring = ' '.join(str(e) for e in wearstyle_list)  # Join list of args back into one string
-            if WEARSTYLE_MAXLENGTH and len(wearstring) > WEARSTYLE_MAXLENGTH:  # If length of wearstyle exceeds limit
-                self.caller.msg("Please keep your wear style message to less than %i characters." % WEARSTYLE_MAXLENGTH)
+            wearstring = " ".join(
+                str(e) for e in wearstyle_list
+            )  # Join list of args back into one string
+            if (
+                WEARSTYLE_MAXLENGTH and len(wearstring) > WEARSTYLE_MAXLENGTH
+            ):  # If length of wearstyle exceeds limit
+                self.caller.msg(
+                    "Please keep your wear style message to less than %i characters."
+                    % WEARSTYLE_MAXLENGTH
+                )
             else:
                 wearstyle = wearstring
         clothing.wear(self.caller, wearstyle)
@@ -420,6 +451,7 @@ def func(self):
         """
         clothing = self.caller.search(self.args, candidates=self.caller.contents)
         if not clothing:
+            self.caller.msg("Thing to remove must be carried or worn.")
             return
         if not clothing.db.worn:
             self.caller.msg("You're not wearing that!")
@@ -460,10 +492,10 @@ def func(self):
         cover_with = self.caller.search(self.arglist[1], candidates=self.caller.contents)
         if not to_cover or not cover_with:
             return
-        if not to_cover.is_typeclass("evennia.contrib.clothing.Clothing"):
+        if not to_cover.is_typeclass("evennia.contrib.clothing.Clothing", exact=False):
             self.caller.msg("%s isn't clothes!" % to_cover.name)
             return
-        if not cover_with.is_typeclass("evennia.contrib.clothing.Clothing"):
+        if not cover_with.is_typeclass("evennia.contrib.clothing.Clothing", exact=False):
             self.caller.msg("%s isn't clothes!" % cover_with.name)
             return
         if cover_with.db.clothing_type:
@@ -480,11 +512,17 @@ def func(self):
             self.caller.msg("%s is covered by something else!" % cover_with.name)
             return
         if to_cover.db.covered_by:
-            self.caller.msg("%s is already covered by %s." % (cover_with.name, to_cover.db.covered_by.name))
+            self.caller.msg(
+                "%s is already covered by %s." % (cover_with.name, to_cover.db.covered_by.name)
+            )
             return
         if not cover_with.db.worn:
-            cover_with.wear(self.caller, True)  # Put on the item to cover with if it's not on already
-        self.caller.location.msg_contents("%s covers %s with %s." % (self.caller, to_cover.name, cover_with.name))
+            cover_with.wear(
+                self.caller, True
+            )  # Put on the item to cover with if it's not on already
+        self.caller.location.msg_contents(
+            "%s covers %s with %s." % (self.caller, to_cover.name, cover_with.name)
+        )
         to_cover.db.covered_by = cover_with
 
 
@@ -555,9 +593,12 @@ def func(self):
 
         # Because the DROP command by definition looks for items
         # in inventory, call the search function using location = caller
-        obj = caller.search(self.args, location=caller,
-                            nofound_string="You aren't carrying %s." % self.args,
-                            multimatch_string="You carry more than one %s:" % self.args)
+        obj = caller.search(
+            self.args,
+            location=caller,
+            nofound_string="You aren't carrying %s." % self.args,
+            multimatch_string="You carry more than one %s:" % self.args,
+        )
         if not obj:
             return
 
@@ -572,9 +613,7 @@ def func(self):
 
         obj.move_to(caller.location, quiet=True)
         caller.msg("You drop %s." % (obj.name,))
-        caller.location.msg_contents("%s drops %s." %
-                                     (caller.name, obj.name),
-                                     exclude=caller)
+        caller.location.msg_contents("%s drops %s." % (caller.name, obj.name), exclude=caller)
         # Call the object script's at_drop() method.
         obj.at_drop(caller)
 
@@ -589,6 +628,7 @@ class CmdGive(MuxCommand):
     Gives an items from your inventory to another character,
     placing it in their inventory.
     """
+
     key = "give"
     locks = "cmd:all()"
     arg_regex = r"\s|$"
@@ -600,9 +640,12 @@ def func(self):
         if not self.args or not self.rhs:
             caller.msg("Usage: give <inventory object> = <target>")
             return
-        to_give = caller.search(self.lhs, location=caller,
-                                nofound_string="You aren't carrying %s." % self.lhs,
-                                multimatch_string="You carry more than one %s:" % self.lhs)
+        to_give = caller.search(
+            self.lhs,
+            location=caller,
+            nofound_string="You aren't carrying %s." % self.lhs,
+            multimatch_string="You carry more than one %s:" % self.lhs,
+        )
         target = caller.search(self.rhs)
         if not (to_give and target):
             return
@@ -614,7 +657,9 @@ def func(self):
             return
         # This is new! Can't give away something that's worn.
         if to_give.db.covered_by:
-            caller.msg("You can't give that away because it's covered by %s." % to_give.db.covered_by)
+            caller.msg(
+                "You can't give that away because it's covered by %s." % to_give.db.covered_by
+            )
             return
         # Remove clothes if they're given.
         if to_give.db.worn:
@@ -638,6 +683,7 @@ class CmdInventory(MuxCommand):
 
     Shows your inventory.
     """
+
     # Alternate version of the inventory command which separates
     # worn and carried items.
 
@@ -678,6 +724,7 @@ class ClothedCharacterCmdSet(default_cmds.CharacterCmdSet):
     version of 'inventory' that differentiates between carried and worn
     items.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
diff --git a/evennia/contrib/color_markups.py b/evennia/contrib/color_markups.py
index 4d3e7a887dc..6a8f8c99101 100644
--- a/evennia/contrib/color_markups.py
+++ b/evennia/contrib/color_markups.py
@@ -110,70 +110,65 @@
 #############################################################
 
 CURLY_COLOR_ANSI_EXTRA_MAP = [
-    (r'{n', _ANSI_NORMAL),          # reset
-    (r'{/', _ANSI_RETURN),          # line break
-    (r'{-', _ANSI_TAB),             # tab
-    (r'{_', _ANSI_SPACE),           # space
-    (r'{*', _ANSI_INVERSE),         # invert
-    (r'{^', _ANSI_BLINK),           # blinking text (very annoying and not supported by all clients)
-    (r'{u', _ANSI_UNDERLINE),       # underline
-
-    (r'{r', _ANSI_HILITE + _ANSI_RED),
-    (r'{g', _ANSI_HILITE + _ANSI_GREEN),
-    (r'{y', _ANSI_HILITE + _ANSI_YELLOW),
-    (r'{b', _ANSI_HILITE + _ANSI_BLUE),
-    (r'{m', _ANSI_HILITE + _ANSI_MAGENTA),
-    (r'{c', _ANSI_HILITE + _ANSI_CYAN),
-    (r'{w', _ANSI_HILITE + _ANSI_WHITE),  # pure white
-    (r'{x', _ANSI_HILITE + _ANSI_BLACK),  # dark grey
-
-    (r'{R', _ANSI_HILITE + _ANSI_RED),
-    (r'{G', _ANSI_HILITE + _ANSI_GREEN),
-    (r'{Y', _ANSI_HILITE + _ANSI_YELLOW),
-    (r'{B', _ANSI_HILITE + _ANSI_BLUE),
-    (r'{M', _ANSI_HILITE + _ANSI_MAGENTA),
-    (r'{C', _ANSI_HILITE + _ANSI_CYAN),
-    (r'{W', _ANSI_HILITE + _ANSI_WHITE),  # light grey
-    (r'{X', _ANSI_HILITE + _ANSI_BLACK),  # pure black
-
+    (r"{n", _ANSI_NORMAL),  # reset
+    (r"{/", _ANSI_RETURN),  # line break
+    (r"{-", _ANSI_TAB),  # tab
+    (r"{_", _ANSI_SPACE),  # space
+    (r"{*", _ANSI_INVERSE),  # invert
+    (r"{^", _ANSI_BLINK),  # blinking text (very annoying and not supported by all clients)
+    (r"{u", _ANSI_UNDERLINE),  # underline
+    (r"{r", _ANSI_HILITE + _ANSI_RED),
+    (r"{g", _ANSI_HILITE + _ANSI_GREEN),
+    (r"{y", _ANSI_HILITE + _ANSI_YELLOW),
+    (r"{b", _ANSI_HILITE + _ANSI_BLUE),
+    (r"{m", _ANSI_HILITE + _ANSI_MAGENTA),
+    (r"{c", _ANSI_HILITE + _ANSI_CYAN),
+    (r"{w", _ANSI_HILITE + _ANSI_WHITE),  # pure white
+    (r"{x", _ANSI_HILITE + _ANSI_BLACK),  # dark grey
+    (r"{R", _ANSI_HILITE + _ANSI_RED),
+    (r"{G", _ANSI_HILITE + _ANSI_GREEN),
+    (r"{Y", _ANSI_HILITE + _ANSI_YELLOW),
+    (r"{B", _ANSI_HILITE + _ANSI_BLUE),
+    (r"{M", _ANSI_HILITE + _ANSI_MAGENTA),
+    (r"{C", _ANSI_HILITE + _ANSI_CYAN),
+    (r"{W", _ANSI_HILITE + _ANSI_WHITE),  # light grey
+    (r"{X", _ANSI_HILITE + _ANSI_BLACK),  # pure black
     # hilight-able colors
-    (r'{h', _ANSI_HILITE),
-    (r'{H', _ANSI_UNHILITE),
-
-    (r'{!R', _ANSI_RED),
-    (r'{!G', _ANSI_GREEN),
-    (r'{!Y', _ANSI_YELLOW),
-    (r'{!B', _ANSI_BLUE),
-    (r'{!M', _ANSI_MAGENTA),
-    (r'{!C', _ANSI_CYAN),
-    (r'{!W', _ANSI_WHITE),  # light grey
-    (r'{!X', _ANSI_BLACK),  # pure black
-
+    (r"{h", _ANSI_HILITE),
+    (r"{H", _ANSI_UNHILITE),
+    (r"{!R", _ANSI_RED),
+    (r"{!G", _ANSI_GREEN),
+    (r"{!Y", _ANSI_YELLOW),
+    (r"{!B", _ANSI_BLUE),
+    (r"{!M", _ANSI_MAGENTA),
+    (r"{!C", _ANSI_CYAN),
+    (r"{!W", _ANSI_WHITE),  # light grey
+    (r"{!X", _ANSI_BLACK),  # pure black
     # normal ANSI backgrounds
-    (r'{[R', _ANSI_BACK_RED),
-    (r'{[G', _ANSI_BACK_GREEN),
-    (r'{[Y', _ANSI_BACK_YELLOW),
-    (r'{[B', _ANSI_BACK_BLUE),
-    (r'{[M', _ANSI_BACK_MAGENTA),
-    (r'{[C', _ANSI_BACK_CYAN),
-    (r'{[W', _ANSI_BACK_WHITE),    # light grey background
-    (r'{[X', _ANSI_BACK_BLACK),     # pure black background
+    (r"{[R", _ANSI_BACK_RED),
+    (r"{[G", _ANSI_BACK_GREEN),
+    (r"{[Y", _ANSI_BACK_YELLOW),
+    (r"{[B", _ANSI_BACK_BLUE),
+    (r"{[M", _ANSI_BACK_MAGENTA),
+    (r"{[C", _ANSI_BACK_CYAN),
+    (r"{[W", _ANSI_BACK_WHITE),  # light grey background
+    (r"{[X", _ANSI_BACK_BLACK),  # pure black background
 ]
 
-CURLY_COLOR_XTERM256_EXTRA_FG = [r'\{([0-5])([0-5])([0-5])']     # |123 - foreground colour
-CURLY_COLOR_XTERM256_EXTRA_BG = [r'\{\[([0-5])([0-5])([0-5])']   # |[123 - background colour
-CURLY_COLOR_XTERM256_EXTRA_GFG = [r'\{=([a-z])']      # |=a - greyscale foreground
-CURLY_COLOR_XTERM256_EXTRA_GBG = [r'\{\[=([a-z])']    # |[=a - greyscale background
+CURLY_COLOR_XTERM256_EXTRA_FG = [r"\{([0-5])([0-5])([0-5])"]  # |123 - foreground colour
+CURLY_COLOR_XTERM256_EXTRA_BG = [r"\{\[([0-5])([0-5])([0-5])"]  # |[123 - background colour
+CURLY_COLOR_XTERM256_EXTRA_GFG = [r"\{=([a-z])"]  # |=a - greyscale foreground
+CURLY_COLOR_XTERM256_EXTRA_GBG = [r"\{\[=([a-z])"]  # |[=a - greyscale background
 
 CURLY_COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP = [
-    (r'{[r', r'{[500'),
-    (r'{[g', r'{[050'),
-    (r'{[y', r'{[550'),
-    (r'{[b', r'{[005'),
-    (r'{[m', r'{[505'),
-    (r'{[c', r'{[055'),
-    (r'{[w', r'{[555'),     # white background
-    (r'{[x', r'{[222'),     # dark grey background
+    (r"{[r", r"{[500"),
+    (r"{[g", r"{[050"),
+    (r"{[y", r"{[550"),
+    (r"{[b", r"{[005"),
+    (r"{[m", r"{[505"),
+    (r"{[c", r"{[055"),
+    (r"{[w", r"{[555"),  # white background
+    (r"{[x", r"{[222"),  # dark grey background
 ]
 
 
@@ -191,48 +186,46 @@
 #############################################################
 
 MUX_COLOR_ANSI_EXTRA_MAP = [
-    (r'%cn', _ANSI_NORMAL),  # reset
-    (r'%ch', _ANSI_HILITE),  # highlight
-    (r'%r', _ANSI_RETURN),   # line break
-    (r'%R', _ANSI_RETURN),   #
-    (r'%t', _ANSI_TAB),      # tab
-    (r'%T', _ANSI_TAB),      #
-    (r'%b', _ANSI_SPACE),    # space
-    (r'%B', _ANSI_SPACE),
-    (r'%cf', _ANSI_BLINK),    # annoying and not supported by all clients
-    (r'%ci', _ANSI_INVERSE),  # invert
-
-    (r'%cr', _ANSI_RED),
-    (r'%cg', _ANSI_GREEN),
-    (r'%cy', _ANSI_YELLOW),
-    (r'%cb', _ANSI_BLUE),
-    (r'%cm', _ANSI_MAGENTA),
-    (r'%cc', _ANSI_CYAN),
-    (r'%cw', _ANSI_WHITE),
-    (r'%cx', _ANSI_BLACK),
-
-    (r'%cR', _ANSI_BACK_RED),
-    (r'%cG', _ANSI_BACK_GREEN),
-    (r'%cY', _ANSI_BACK_YELLOW),
-    (r'%cB', _ANSI_BACK_BLUE),
-    (r'%cM', _ANSI_BACK_MAGENTA),
-    (r'%cC', _ANSI_BACK_CYAN),
-    (r'%cW', _ANSI_BACK_WHITE),
-    (r'%cX', _ANSI_BACK_BLACK)
+    (r"%cn", _ANSI_NORMAL),  # reset
+    (r"%ch", _ANSI_HILITE),  # highlight
+    (r"%r", _ANSI_RETURN),  # line break
+    (r"%R", _ANSI_RETURN),  #
+    (r"%t", _ANSI_TAB),  # tab
+    (r"%T", _ANSI_TAB),  #
+    (r"%b", _ANSI_SPACE),  # space
+    (r"%B", _ANSI_SPACE),
+    (r"%cf", _ANSI_BLINK),  # annoying and not supported by all clients
+    (r"%ci", _ANSI_INVERSE),  # invert
+    (r"%cr", _ANSI_RED),
+    (r"%cg", _ANSI_GREEN),
+    (r"%cy", _ANSI_YELLOW),
+    (r"%cb", _ANSI_BLUE),
+    (r"%cm", _ANSI_MAGENTA),
+    (r"%cc", _ANSI_CYAN),
+    (r"%cw", _ANSI_WHITE),
+    (r"%cx", _ANSI_BLACK),
+    (r"%cR", _ANSI_BACK_RED),
+    (r"%cG", _ANSI_BACK_GREEN),
+    (r"%cY", _ANSI_BACK_YELLOW),
+    (r"%cB", _ANSI_BACK_BLUE),
+    (r"%cM", _ANSI_BACK_MAGENTA),
+    (r"%cC", _ANSI_BACK_CYAN),
+    (r"%cW", _ANSI_BACK_WHITE),
+    (r"%cX", _ANSI_BACK_BLACK),
 ]
 
-MUX_COLOR_XTERM256_EXTRA_FG = [r'%c([0-5])([0-5])([0-5])']     # %c123 - foreground colour
-MUX_COLOR_XTERM256_EXTRA_BG = [r'%c\[([0-5])([0-5])([0-5])']   # %c[123 - background colour
-MUX_COLOR_XTERM256_EXTRA_GFG = [r'%c=([a-z])']      # %c=a - greyscale foreground
-MUX_COLOR_XTERM256_EXTRA_GBG = [r'%c\[=([a-z])']    # %c[=a - greyscale background
+MUX_COLOR_XTERM256_EXTRA_FG = [r"%c([0-5])([0-5])([0-5])"]  # %c123 - foreground colour
+MUX_COLOR_XTERM256_EXTRA_BG = [r"%c\[([0-5])([0-5])([0-5])"]  # %c[123 - background colour
+MUX_COLOR_XTERM256_EXTRA_GFG = [r"%c=([a-z])"]  # %c=a - greyscale foreground
+MUX_COLOR_XTERM256_EXTRA_GBG = [r"%c\[=([a-z])"]  # %c[=a - greyscale background
 
 MUX_COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP = [
-    (r'%ch%cR', r'%c[500'),
-    (r'%ch%cG', r'%c[050'),
-    (r'%ch%cY', r'%c[550'),
-    (r'%ch%cB', r'%c[005'),
-    (r'%ch%cM', r'%c[505'),
-    (r'%ch%cC', r'%c[055'),
-    (r'%ch%cW', r'%c[555'),     # white background
-    (r'%ch%cX', r'%c[222'),     # dark grey background
+    (r"%ch%cR", r"%c[500"),
+    (r"%ch%cG", r"%c[050"),
+    (r"%ch%cY", r"%c[550"),
+    (r"%ch%cB", r"%c[005"),
+    (r"%ch%cM", r"%c[505"),
+    (r"%ch%cC", r"%c[055"),
+    (r"%ch%cW", r"%c[555"),  # white background
+    (r"%ch%cX", r"%c[222"),  # dark grey background
 ]
diff --git a/evennia/contrib/custom_gametime.py b/evennia/contrib/custom_gametime.py
index 42a53d1386e..e1065add386 100644
--- a/evennia/contrib/custom_gametime.py
+++ b/evennia/contrib/custom_gametime.py
@@ -38,22 +38,28 @@
 from evennia import DefaultScript
 from evennia.utils.create import create_script
 from evennia.utils import gametime
+
 # The game time speedup  / slowdown relative real time
 TIMEFACTOR = settings.TIME_FACTOR
 
 # These are the unit names understood by the scheduler.
 # Each unit must be consistent and expressed in seconds.
-UNITS = getattr(settings, "TIME_UNITS", {
-    # default custom calendar
-    "sec": 1,
-    "min": 60,
-    "hr": 60 * 60,
-    "hour": 60 * 60,
-    "day": 60 * 60 * 24,
-    "week": 60 * 60 * 24 * 7,
-    "month": 60 * 60 * 24 * 7 * 4,
-    "yr": 60 * 60 * 24 * 7 * 4 * 12,
-    "year": 60 * 60 * 24 * 7 * 4 * 12, })
+UNITS = getattr(
+    settings,
+    "TIME_UNITS",
+    {
+        # default custom calendar
+        "sec": 1,
+        "min": 60,
+        "hr": 60 * 60,
+        "hour": 60 * 60,
+        "day": 60 * 60 * 24,
+        "week": 60 * 60 * 24 * 7,
+        "month": 60 * 60 * 24 * 7 * 4,
+        "yr": 60 * 60 * 24 * 7 * 4 * 12,
+        "year": 60 * 60 * 24 * 7 * 4 * 12,
+    },
+)
 
 
 def time_to_tuple(seconds, *divisors):
@@ -111,8 +117,7 @@ def gametime_to_realtime(format=False, **kwargs):
             name = name[:-1]
 
         if name not in UNITS:
-            raise ValueError("the unit {} isn't defined as a valid "
-                             "game time unit".format(name))
+            raise ValueError("the unit {} isn't defined as a valid " "game time unit".format(name))
         rtime += value * UNITS[name]
     rtime /= TIMEFACTOR
     if format:
@@ -120,8 +125,7 @@ def gametime_to_realtime(format=False, **kwargs):
     return rtime
 
 
-def realtime_to_gametime(secs=0, mins=0, hrs=0, days=0, weeks=0,
-                         months=0, yrs=0, format=False):
+def realtime_to_gametime(secs=0, mins=0, hrs=0, days=0, weeks=0, months=0, yrs=0, format=False):
     """
     This method calculates how much in-game time a real-world time
     interval would correspond to. This is usually a lot less
@@ -139,8 +143,15 @@ def realtime_to_gametime(secs=0, mins=0, hrs=0, days=0, weeks=0,
       realtime_to_gametime(days=2) -> number of game-world seconds
 
     """
-    gtime = TIMEFACTOR * (secs + mins * 60 + hrs * 3600 + days * 86400 +
-                          weeks * 604800 + months * 2628000 + yrs * 31536000)
+    gtime = TIMEFACTOR * (
+        secs
+        + mins * 60
+        + hrs * 3600
+        + days * 86400
+        + weeks * 604800
+        + months * 2628000
+        + yrs * 31536000
+    )
     if format:
         units = sorted(set(UNITS.values()), reverse=True)
         # Remove seconds from the tuple
@@ -258,14 +269,19 @@ def schedule(callback, repeat=False, **kwargs):
 
     """
     seconds = real_seconds_until(**kwargs)
-    script = create_script("evennia.contrib.custom_gametime.GametimeScript",
-                           key="GametimeScript", desc="A timegame-sensitive script",
-                           interval=seconds, start_delay=True,
-                           repeats=-1 if repeat else 1)
+    script = create_script(
+        "evennia.contrib.custom_gametime.GametimeScript",
+        key="GametimeScript",
+        desc="A timegame-sensitive script",
+        interval=seconds,
+        start_delay=True,
+        repeats=-1 if repeat else 1,
+    )
     script.db.callback = callback
     script.db.gametime = kwargs
     return script
 
+
 # Scripts dealing in gametime (use `schedule`  to create it)
 
 
diff --git a/evennia/contrib/dice.py b/evennia/contrib/dice.py
index 374acc01f43..73285e60fc9 100644
--- a/evennia/contrib/dice.py
+++ b/evennia/contrib/dice.py
@@ -29,8 +29,6 @@
 After a reload the dice (or roll) command will be available in-game.
 
 """
-from builtins import range
-
 import re
 from random import randint
 from evennia import default_cmds, CmdSet
@@ -97,7 +95,7 @@ def roll_dice(dicenum, dicetype, modifier=None, conditional=None, return_tuple=F
     if modifier:
         # make sure to check types well before eval
         mod, modvalue = modifier
-        if mod not in ('+', '-', '*', '/'):
+        if mod not in ("+", "-", "*", "/"):
             raise TypeError("Non-supported dice modifier: %s" % mod)
         modvalue = int(modvalue)  # for safety
         result = eval("%s %s %s" % (result, mod, modvalue))
@@ -105,7 +103,7 @@ def roll_dice(dicenum, dicetype, modifier=None, conditional=None, return_tuple=F
     if conditional:
         # make sure to check types well before eval
         cond, condvalue = conditional
-        if cond not in ('>', '<', '>=', '<=', '!=', '=='):
+        if cond not in (">", "<", ">=", "<=", "!=", "=="):
             raise TypeError("Non-supported dice result conditional: %s" % conditional)
         condvalue = int(condvalue)  # for safety
         outcome = eval("%s %s %s" % (result, cond, condvalue))  # True/False
@@ -168,9 +166,11 @@ def func(self):
         modifier = None
         conditional = None
 
-        if len_parts < 3 or parts[1] != 'd':
-            self.caller.msg("You must specify the die roll(s) as <nr>d<sides>."
-                            " For example, 2d6 means rolling a 6-sided die 2 times.")
+        if len_parts < 3 or parts[1] != "d":
+            self.caller.msg(
+                "You must specify the die roll(s) as <nr>d<sides>."
+                " For example, 2d6 means rolling a 6-sided die 2 times."
+            )
             return
 
         # Limit the number of dice and sides a character can roll to prevent server slow down and crashes
@@ -186,7 +186,7 @@ def func(self):
             pass
         elif len_parts == 5:
             # either e.g. 1d6 + 3  or something like 1d6 > 3
-            if parts[3] in ('+', '-', '*', '/'):
+            if parts[3] in ("+", "-", "*", "/"):
                 modifier = (parts[3], parts[4])
             else:  # assume it is a conditional
                 conditional = (parts[3], parts[4])
@@ -200,14 +200,14 @@ def func(self):
             return
         # do the roll
         try:
-            result, outcome, diff, rolls = roll_dice(ndice,
-                                                     nsides,
-                                                     modifier=modifier,
-                                                     conditional=conditional,
-                                                     return_tuple=True)
+            result, outcome, diff, rolls = roll_dice(
+                ndice, nsides, modifier=modifier, conditional=conditional, return_tuple=True
+            )
         except ValueError:
-            self.caller.msg("You need to enter valid integer numbers, modifiers and operators."
-                            " |w%s|n was not understood." % self.args)
+            self.caller.msg(
+                "You need to enter valid integer numbers, modifiers and operators."
+                " |w%s|n was not understood." % self.args
+            )
             return
         # format output
         if len(rolls) > 1:
@@ -224,13 +224,13 @@ def func(self):
         roomrollstring = "%s rolls %s%s."
         resultstring = " Roll(s): %s. Total result is |w%s|n."
 
-        if 'secret' in self.switches:
+        if "secret" in self.switches:
             # don't echo to the room at all
             string = yourollstring % (argstring, " (secret, not echoed)")
             string += "\n" + resultstring % (rolls, result)
             string += outcomestring + " (not echoed)"
             self.caller.msg(string)
-        elif 'hidden' in self.switches:
+        elif "hidden" in self.switches:
             # announce the roll to the room, result only to caller
             string = yourollstring % (argstring, " (hidden)")
             self.caller.msg(string)
diff --git a/evennia/contrib/email_login.py b/evennia/contrib/email_login.py
index aeb34cd7269..cb18e65e3ca 100644
--- a/evennia/contrib/email_login.py
+++ b/evennia/contrib/email_login.py
@@ -39,11 +39,18 @@
 from evennia.utils import logger, utils, ansi
 from evennia.commands.default.muxcommand import MuxCommand
 from evennia.commands.cmdhandler import CMD_LOGINSTART
-from evennia.commands.default import unloggedin as default_unloggedin  # Used in CmdUnconnectedCreate
+from evennia.commands.default import (
+    unloggedin as default_unloggedin,
+)  # Used in CmdUnconnectedCreate
 
 # limit symbol import for API
-__all__ = ("CmdUnconnectedConnect", "CmdUnconnectedCreate",
-           "CmdUnconnectedQuit", "CmdUnconnectedLook", "CmdUnconnectedHelp")
+__all__ = (
+    "CmdUnconnectedConnect",
+    "CmdUnconnectedCreate",
+    "CmdUnconnectedQuit",
+    "CmdUnconnectedLook",
+    "CmdUnconnectedHelp",
+)
 
 MULTISESSION_MODE = settings.MULTISESSION_MODE
 CONNECTION_SCREEN_MODULE = settings.CONNECTION_SCREEN_MODULE
@@ -54,8 +61,10 @@
     # malformed connection screen or no screen given
     pass
 if not CONNECTION_SCREEN:
-    CONNECTION_SCREEN = "\nEvennia: Error in CONNECTION_SCREEN MODULE" \
-                        " (randomly picked connection screen variable is not a string). \nEnter 'help' for aid."
+    CONNECTION_SCREEN = (
+        "\nEvennia: Error in CONNECTION_SCREEN MODULE"
+        " (randomly picked connection screen variable is not a string). \nEnter 'help' for aid."
+    )
 
 
 class CmdUnconnectedConnect(MuxCommand):
@@ -67,6 +76,7 @@ class CmdUnconnectedConnect(MuxCommand):
 
     Use the create command to first create an account before logging in.
     """
+
     key = "connect"
     aliases = ["conn", "con", "co"]
     locks = "cmd:all()"  # not really needed
@@ -105,8 +115,10 @@ def func(self):
 
         # Check IP and/or name bans
         bans = ServerConfig.objects.conf("server_bans")
-        if bans and (any(tup[0] == account.name for tup in bans) or
-                     any(tup[2].match(session.address[0]) for tup in bans if tup[2])):
+        if bans and (
+            any(tup[0] == account.name for tup in bans)
+            or any(tup[2].match(session.address[0]) for tup in bans if tup[2])
+        ):
             # this is a banned IP or name!
             string = "|rYou have been banned and cannot continue from here."
             string += "\nIf you feel this ban is in error, please email an admin.|x"
@@ -128,6 +140,7 @@ class CmdUnconnectedCreate(MuxCommand):
     This creates a new account account.
 
     """
+
     key = "create"
     aliases = ["cre", "cr"]
     locks = "cmd:all()"
@@ -152,7 +165,7 @@ def parse(self):
         else:
             accountname, email, password = self.arglist
 
-        accountname = accountname.replace('"', '')  # remove "
+        accountname = accountname.replace('"', "")  # remove "
         accountname = accountname.replace("'", "")
         self.accountinfo = (accountname, email, password)
 
@@ -163,7 +176,7 @@ def func(self):
         try:
             accountname, email, password = self.accountinfo
         except ValueError:
-            string = "\n\r Usage (without <>): create \"<accountname>\" <email> <password>"
+            string = '\n\r Usage (without <>): create "<accountname>" <email> <password>'
             session.msg(string)
             return
         if not email or not password:
@@ -192,24 +205,32 @@ def func(self):
             session.msg("Sorry, there is already an account with that email address.")
             return
         # Reserve accountnames found in GUEST_LIST
-        if settings.GUEST_LIST and accountname.lower() in (guest.lower() for guest in settings.GUEST_LIST):
+        if settings.GUEST_LIST and accountname.lower() in (
+            guest.lower() for guest in settings.GUEST_LIST
+        ):
             string = "\n\r That name is reserved. Please choose another Accountname."
             session.msg(string)
             return
         if not re.findall(r"^[\w. @+\-']+$", password) or not (3 < len(password)):
-            string = "\n\r Password should be longer than 3 characters. Letters, spaces, digits and @/./+/-/_/' only." \
-                     "\nFor best security, make it longer than 8 characters. You can also use a phrase of" \
-                     "\nmany words if you enclose the password in double quotes."
+            string = (
+                "\n\r Password should be longer than 3 characters. Letters, spaces, digits and @/./+/-/_/' only."
+                "\nFor best security, make it longer than 8 characters. You can also use a phrase of"
+                "\nmany words if you enclose the password in double quotes."
+            )
             session.msg(string)
             return
 
         # Check IP and/or name bans
         bans = ServerConfig.objects.conf("server_bans")
-        if bans and (any(tup[0] == accountname.lower() for tup in bans) or
-                     any(tup[2].match(session.address) for tup in bans if tup[2])):
+        if bans and (
+            any(tup[0] == accountname.lower() for tup in bans)
+            or any(tup[2].match(session.address) for tup in bans if tup[2])
+        ):
             # this is a banned IP or name!
-            string = "|rYou have been banned and cannot continue from here." \
-                     "\nIf you feel this ban is in error, please email an admin.|x"
+            string = (
+                "|rYou have been banned and cannot continue from here."
+                "\nIf you feel this ban is in error, please email an admin.|x"
+            )
             session.msg(string)
             session.sessionhandler.disconnect(session, "Good bye! Disconnecting.")
             return
@@ -218,15 +239,21 @@ def func(self):
         try:
             permissions = settings.PERMISSION_ACCOUNT_DEFAULT
             typeclass = settings.BASE_CHARACTER_TYPECLASS
-            new_account = default_unloggedin._create_account(session, accountname, password, permissions, email=email)
+            new_account = default_unloggedin._create_account(
+                session, accountname, password, permissions, email=email
+            )
             if new_account:
                 if MULTISESSION_MODE < 2:
                     default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME)
-                    default_unloggedin._create_character(session, new_account, typeclass, default_home, permissions)
+                    default_unloggedin._create_character(
+                        session, new_account, typeclass, default_home, permissions
+                    )
                 # tell the caller everything went well.
                 string = "A new account '%s' was created. Welcome!"
                 if " " in accountname:
-                    string += "\n\nYou can now log in with the command 'connect \"%s\" <your password>'."
+                    string += (
+                        "\n\nYou can now log in with the command 'connect \"%s\" <your password>'."
+                    )
                 else:
                     string += "\n\nYou can now log with the command 'connect %s <your password>'."
                 session.msg(string % (accountname, email))
@@ -246,6 +273,7 @@ class CmdUnconnectedQuit(MuxCommand):
     here for unconnected accounts for the sake of simplicity. The logged in
     version is a bit more complicated.
     """
+
     key = "quit"
     aliases = ["q", "qu"]
     locks = "cmd:all()"
@@ -263,6 +291,7 @@ class CmdUnconnectedLook(MuxCommand):
     This is called by the server and kicks everything in gear.
     All it does is display the connect screen.
     """
+
     key = CMD_LOGINSTART
     aliases = ["look", "l"]
     locks = "cmd:all()"
@@ -277,6 +306,7 @@ class CmdUnconnectedHelp(MuxCommand):
     This is an unconnected version of the help command,
     for simplicity. It shows a pane of info.
     """
+
     key = "help"
     aliases = ["h", "?"]
     locks = "cmd:all()"
@@ -284,8 +314,7 @@ class CmdUnconnectedHelp(MuxCommand):
     def func(self):
         """Shows help"""
 
-        string = \
-            """
+        string = """
 You are not yet logged into the game. Commands available at this point:
   |wcreate, connect, look, help, quit|n
 
@@ -316,10 +345,12 @@ def func(self):
 
 # command set for the mux-like login
 
+
 class UnloggedinCmdSet(CmdSet):
     """
     Sets up the unlogged cmdset.
     """
+
     key = "Unloggedin"
     priority = 0
 
diff --git a/evennia/contrib/evscaperoom/commands.py b/evennia/contrib/evscaperoom/commands.py
index 8bd65d2e1f0..15695e7caa7 100644
--- a/evennia/contrib/evscaperoom/commands.py
+++ b/evennia/contrib/evscaperoom/commands.py
@@ -35,7 +35,7 @@
 from evennia.utils import variable_from_module
 from .utils import create_evscaperoom_object
 
-_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
 
 _RE_ARGSPLIT = re.compile(r"\s(with|on|to|in|at)\s", re.I + re.U)
 _RE_EMOTE_SPEECH = re.compile(r"(\".*?\")|(\'.*?\')")
@@ -111,6 +111,7 @@ class CmdEvscapeRoom(Command):
        command [<obj1>|<arg1>] [<prep> <obj2>|<arg2>]
 
     """
+
     # always separate the command from any args with a space
     arg_regex = r"(/\w+?(\s|$))|\s|$"
     help_category = "Evscaperoom"
@@ -210,6 +211,7 @@ class CmdGiveUp(CmdEvscapeRoom):
     Abandons your attempts at escaping and of ever winning the pie-eating contest.
 
     """
+
     key = "give up"
     aliases = ("abort", "chicken out", "quit", "q")
 
@@ -224,10 +226,10 @@ def func(self):
             warning = _QUIT_WARNING_CAN_COME_BACK.format(roomname=self.room.name)
             warning = _QUIT_WARNING.format(warning=warning)
 
-        ret = yield(warning)
+        ret = yield (warning)
         if ret.upper() == "QUIT":
             self.msg("|R ... Oh. Okay then. Off you go.|n\n")
-            yield(1)
+            yield (1)
 
             self.room.log(f"QUIT: {self.caller.key} used the quit command")
 
@@ -250,6 +252,7 @@ class CmdLook(CmdEvscapeRoom):
       look [obj]
 
     """
+
     key = "look"
     aliases = ["l", "ls"]
     obj1_search = None
@@ -276,6 +279,7 @@ class CmdWho(CmdEvscapeRoom, default_cmds.CmdWho):
     server as a whole.
 
     """
+
     key = "who"
 
     obj1_search = False
@@ -285,7 +289,7 @@ def func(self):
 
         caller = self.caller
 
-        if self.args == 'all':
+        if self.args == "all":
             table = self.style_table("|wName", "|wRoom")
             sessions = SESSION_HANDLER.get_sessions()
             for session in sessions:
@@ -298,15 +302,19 @@ def func(self):
                     account = session.get_account()
                     table.add_row(account.get_display_name(caller), "(OOC)")
 
-            txt = (f"|cPlayers active on this server|n:\n{table}\n"
-                   "(use 'who' to see only those in your room)")
+            txt = (
+                f"|cPlayers active on this server|n:\n{table}\n"
+                "(use 'who' to see only those in your room)"
+            )
 
         else:
-            chars = [f"{obj.get_display_name(caller)} - {obj.db.desc.strip()}"
-                     for obj in self.room.get_all_characters()
-                     if obj != caller]
+            chars = [
+                f"{obj.get_display_name(caller)} - {obj.db.desc.strip()}"
+                for obj in self.room.get_all_characters()
+                if obj != caller
+            ]
             chars = "\n".join([f"{caller.key} - {caller.db.desc.strip()} (you)"] + chars)
-            txt = (f"|cPlayers in this room (room-name '{self.room.name}')|n:\n  {chars}")
+            txt = f"|cPlayers in this room (room-name '{self.room.name}')|n:\n  {chars}"
         caller.msg(txt)
 
 
@@ -320,6 +328,7 @@ class CmdSpeak(Command):
       shout
 
     """
+
     key = "say"
     aliases = [";", "shout", "whisper"]
     arg_regex = r"\w|\s|$"
@@ -329,7 +338,7 @@ def func(self):
         args = self.args.strip()
         caller = self.caller
         action = self.cmdname
-        action = "say" if action == ';' else action
+        action = "say" if action == ";" else action
         room = self.caller.location
 
         if not self.args:
@@ -365,6 +374,7 @@ class CmdEmote(Command):
         emote /me points to /box and /lever.
 
     """
+
     key = "emote"
     aliases = [":", "pose"]
     arg_regex = r"\w|\s|$"
@@ -379,7 +389,7 @@ def func(self):
         emote = self.args.strip()
 
         if not emote:
-            self.caller.msg("Usage: emote /me points to /door, saying \"look over there!\"")
+            self.caller.msg('Usage: emote /me points to /door, saying "look over there!"')
             return
 
         speech_clr = "|c"
@@ -438,6 +448,7 @@ class CmdFocus(CmdEvscapeRoom):
     looks and what actions is available.
 
     """
+
     key = "focus"
     aliases = ["examine", "e", "ex", "unfocus"]
 
@@ -454,7 +465,9 @@ def func(self):
                 return
 
             if self.focus != self.obj1:
-                self.room.msg_room(self.caller, f"~You ~examine *{self.obj1.key}.", skip_caller=True)
+                self.room.msg_room(
+                    self.caller, f"~You ~examine *{self.obj1.key}.", skip_caller=True
+                )
             self.focus = self.obj1
             self.obj1.at_focus(self.caller)
         elif not self.focus:
@@ -473,11 +486,13 @@ class CmdOptions(CmdEvscapeRoom):
       options
 
     """
+
     key = "options"
     aliases = ["option"]
 
     def func(self):
         from .menu import run_option_menu
+
         run_option_menu(self.caller, self.session)
 
 
@@ -486,6 +501,7 @@ class CmdGet(CmdEvscapeRoom):
     Use focus / examine instead.
 
     """
+
     key = "get"
     aliases = ["inventory", "i", "inv", "give"]
 
@@ -501,6 +517,7 @@ class CmdRerouter(default_cmds.MuxCommand):
        <action> [arg]
 
     """
+
     # reroute commands from the default cmdset to the catch-all
     # focus function where needed. This allows us to override
     # individual default commands without replacing the entire
@@ -512,9 +529,10 @@ class CmdRerouter(default_cmds.MuxCommand):
     def func(self):
         # reroute to another command
         from evennia.commands import cmdhandler
-        cmdhandler.cmdhandler(self.session, self.raw_string,
-                              cmdobj=CmdFocusInteraction(),
-                              cmdobj_key=self.cmdname)
+
+        cmdhandler.cmdhandler(
+            self.session, self.raw_string, cmdobj=CmdFocusInteraction(), cmdobj_key=self.cmdname
+        )
 
 
 class CmdFocusInteraction(CmdEvscapeRoom):
@@ -532,6 +550,7 @@ class CmdFocusInteraction(CmdEvscapeRoom):
     as keys into the method.
 
     """
+
     # all commands not matching something else goes here.
     key = syscmdkeys.CMD_NOMATCH
 
@@ -571,19 +590,18 @@ class CmdStand(CmdEvscapeRoom):
     Stand up from whatever position you had.
 
     """
+
     key = "stand"
 
     def func(self):
 
         # Positionable objects will set this flag on you.
-        pos = self.caller.attributes.get(
-            "position", category=self.room.tagcategory)
+        pos = self.caller.attributes.get("position", category=self.room.tagcategory)
 
         if pos:
             # we have a position, clean up.
             obj, position = pos
-            self.caller.attributes.remove(
-                "position", category=self.room.tagcategory)
+            self.caller.attributes.remove("position", category=self.room.tagcategory)
             del obj.db.positions[self.caller]
             self.room.msg_room(self.caller, "~You ~are back standing on the floor again.")
         else:
@@ -598,8 +616,9 @@ class CmdHelp(CmdEvscapeRoom, default_cmds.CmdHelp):
       help <topic> or <command>
 
     """
-    key = 'help'
-    aliases = ['?']
+
+    key = "help"
+    aliases = ["?"]
 
     def func(self):
         if self.obj1:
@@ -608,8 +627,10 @@ def func(self):
                 if not helptxt:
                     helptxt = f"There is no help to be had about {self.obj1.get_display_name(self.caller)}."
             else:
-                helptxt = (f"|y{self.obj1.get_display_name(self.caller)}|n is "
-                           "likely |rnot|n part of any of the Jester's trickery.")
+                helptxt = (
+                    f"|y{self.obj1.get_display_name(self.caller)}|n is "
+                    "likely |rnot|n part of any of the Jester's trickery."
+                )
         elif self.arg1:
             # fall back to the normal help command
             super().func()
@@ -621,6 +642,7 @@ def func(self):
 
 # Debug/help command
 
+
 class CmdCreateObj(CmdEvscapeRoom):
     """
     Create command, only for Admins during debugging.
@@ -631,6 +653,7 @@ class CmdCreateObj(CmdEvscapeRoom):
     Here, :typeclass is a class in evscaperoom.commands
 
     """
+
     key = "createobj"
     aliases = ["cobj"]
     locks = "cmd:perm(Admin)"
@@ -668,6 +691,7 @@ class CmdSetFlag(CmdEvscapeRoom):
       flag <obj> with <flagname>
 
     """
+
     key = "flag"
     aliases = ["setflag"]
     locks = "cmd:perm(Admin)"
@@ -700,6 +724,7 @@ class CmdJumpState(CmdEvscapeRoom):
       jumpstate <statename>
 
     """
+
     key = "jumpstate"
     locks = "cmd:perm(Admin)"
 
@@ -713,22 +738,26 @@ def func(self):
 
 # Helper command to start the Evscaperoom menu
 
+
 class CmdEvscapeRoomStart(Command):
     """
     Go to the Evscaperoom start menu
 
     """
+
     key = "evscaperoom"
     help_category = "EvscapeRoom"
 
     def func(self):
         # need to import here to break circular import
         from .menu import run_evscaperoom_menu
+
         run_evscaperoom_menu(self.caller)
 
 
 # command sets
 
+
 class CmdSetEvScapeRoom(CmdSet):
     priority = 1
 
diff --git a/evennia/contrib/evscaperoom/menu.py b/evennia/contrib/evscaperoom/menu.py
index 5fabcf6df0a..4ee71480555 100644
--- a/evennia/contrib/evscaperoom/menu.py
+++ b/evennia/contrib/evscaperoom/menu.py
@@ -55,7 +55,7 @@ def _move_to_room(caller, raw_string, **kwargs):
     Helper to move a user to a room
 
     """
-    room = kwargs['room']
+    room = kwargs["room"]
     room.msg_char(caller, f"Entering room |c'{room.name}'|n ...")
     room.msg_room(caller, f"~You |c~were just tricked in here too!|n")
     # we do a manual move since we don't want all hooks to fire.
@@ -78,7 +78,9 @@ def _create_new_room(caller, raw_string, **kwargs):
     _move_to_room(caller, "", room=room)
 
     nrooms = EvscapeRoom.objects.all().count()
-    logger.log_info(f"Evscaperoom: {caller.key} created room '{key}' (#{room.id}). Now {nrooms} room(s) active.")
+    logger.log_info(
+        f"Evscaperoom: {caller.key} created room '{key}' (#{room.id}). Now {nrooms} room(s) active."
+    )
 
     room.log(f"JOIN: {caller.key} created and joined room")
     return "node_quit", {"quiet": True}
@@ -96,10 +98,12 @@ def _get_all_rooms(caller):
         if not room.pk or room.db.deleting:
             continue
         stats = room.db.stats or {"progress": 0}
-        progress = int(stats['progress'])
+        progress = int(stats["progress"])
         nplayers = len(room.get_all_characters())
-        desc = (f"Join room |c'{room.get_display_name(caller)}'|n "
-                f"(complete: {progress}%, players: {nplayers})")
+        desc = (
+            f"Join room |c'{room.get_display_name(caller)}'|n "
+            f"(complete: {progress}%, players: {nplayers})"
+        )
         room_map[desc] = room
         room_option_descs.append(desc)
     caller.ndb._menutree.room_map = room_map
@@ -121,24 +125,34 @@ def node_start(caller, raw_string, **kwargs):
 
     # build a list of available rooms
     options = (
-        {"key": ("|y[s]et your description|n", "set your description",
-                 "set", "desc", "description", "s"),
-         "goto": "node_set_desc"},
-        {"key": ("|y[c]reate/join a new room|n", "create a new room", "create", "c"),
-         "goto": "node_create_room"},
-        {"key": ("|r[q]uit the challenge", "quit", "q"),
-         "goto": "node_quit"})
+        {
+            "key": (
+                "|y[s]et your description|n",
+                "set your description",
+                "set",
+                "desc",
+                "description",
+                "s",
+            ),
+            "goto": "node_set_desc",
+        },
+        {
+            "key": ("|y[c]reate/join a new room|n", "create a new room", "create", "c"),
+            "goto": "node_create_room",
+        },
+        {"key": ("|r[q]uit the challenge", "quit", "q"), "goto": "node_quit"},
+    )
 
     return text, options
 
 
 def node_set_desc(caller, raw_string, **kwargs):
 
-    current_desc = kwargs.get('desc', caller.db.desc)
+    current_desc = kwargs.get("desc", caller.db.desc)
 
-    text = ("Your current description is\n\n "
-            f"   \"{current_desc}\""
-            "\n\nEnter your new description!")
+    text = (
+        "Your current description is\n\n " f'   "{current_desc}"' "\n\nEnter your new description!"
+    )
 
     def _temp_description(caller, raw_string, **kwargs):
         desc = raw_string.strip()
@@ -154,12 +168,10 @@ def _set_description(caller, raw_string, **kwargs):
         return "node_start"
 
     options = (
-        {"key": "_default",
-         "goto": _temp_description},
-        {"key": ("|g[a]ccept", "a"),
-         "goto": (_set_description, {"desc": current_desc})},
-        {"key": ("|r[c]ancel", "c"),
-         "goto": "node_start"})
+        {"key": "_default", "goto": _temp_description},
+        {"key": ("|g[a]ccept", "a"), "goto": (_set_description, {"desc": current_desc})},
+        {"key": ("|r[c]ancel", "c"), "goto": "node_start"},
+    )
     return text, options
 
 
@@ -168,34 +180,31 @@ def node_create_room(caller, raw_string, **kwargs):
     text = _CREATE_ROOM_TEXT
 
     options = (
-        {"key": ("|g[c]reate new room and start game|n", "c"),
-         "goto": _create_new_room},
-        {"key": ("|r[a]bort and go back|n", "a"),
-         "goto": "node_start"})
+        {"key": ("|g[c]reate new room and start game|n", "c"), "goto": _create_new_room},
+        {"key": ("|r[a]bort and go back|n", "a"), "goto": "node_start"},
+    )
 
     return text, options
 
 
 def node_join_room(caller, raw_string, **kwargs):
 
-    room = kwargs['room']
+    room = kwargs["room"]
     stats = room.db.stats or {"progress": 0}
 
     players = [char.key for char in room.get_all_characters()]
     text = _JOIN_EXISTING_ROOM_TEXT.format(
         roomname=room.get_display_name(caller),
-        percent=int(stats['progress']),
+        percent=int(stats["progress"]),
         nplayers=len(players),
-        players=list_to_string(players)
+        players=list_to_string(players),
     )
 
     options = (
-        {"key": ("|g[a]ccept|n (default)", "a"),
-         "goto": (_move_to_room, kwargs)},
-        {"key": ("|r[c]ancel|n", "c"),
-         "goto": "node_start"},
-        {"key": "_default",
-         "goto": (_move_to_room, kwargs)})
+        {"key": ("|g[a]ccept|n (default)", "a"), "goto": (_move_to_room, kwargs)},
+        {"key": ("|r[c]ancel|n", "c"), "goto": "node_start"},
+        {"key": "_default", "goto": (_move_to_room, kwargs)},
+    )
 
     return text, options
 
@@ -210,9 +219,10 @@ def node_quit(caller, raw_string, **kwargs):
         if caller.db.evscaperoom_standalone:
             from evennia.commands import cmdhandler
             from evennia import default_cmds
-            cmdhandler.cmdhandler(caller.ndb._menutree._session, "",
-                                  cmdobj=default_cmds.CmdQuit(),
-                                  cmdobj_key="@quit")
+
+            cmdhandler.cmdhandler(
+                caller.ndb._menutree._session, "", cmdobj=default_cmds.CmdQuit(), cmdobj_key="@quit"
+            )
 
     return text, None  # empty options exit the menu
 
@@ -222,10 +232,11 @@ class EvscaperoomMenu(EvMenu):
     Custom menu with a different formatting of options.
 
     """
+
     node_border_char = "~"
 
     def nodetext_formatter(self, text):
-        return justify(text.strip("\n").rstrip(), align='c', indent=1)
+        return justify(text.strip("\n").rstrip(), align="c", indent=1)
 
     def options_formatter(self, optionlist):
         main_options = []
@@ -237,9 +248,7 @@ def options_formatter(self, optionlist):
                 main_options.append(key)
         main_options = " | ".join(main_options)
         room_choices = super().options_formatter(room_choices)
-        return "{}{}{}".format(main_options,
-                               "\n\n" if room_choices else "",
-                               room_choices)
+        return "{}{}{}".format(main_options, "\n\n" if room_choices else "", room_choices)
 
 
 # access function
@@ -248,20 +257,22 @@ def run_evscaperoom_menu(caller):
     Run room selection menu
 
     """
-    menutree = {"node_start": node_start,
-                "node_quit": node_quit,
-                "node_set_desc": node_set_desc,
-                "node_create_room": node_create_room,
-                "node_join_room": node_join_room}
+    menutree = {
+        "node_start": node_start,
+        "node_quit": node_quit,
+        "node_set_desc": node_set_desc,
+        "node_create_room": node_create_room,
+        "node_join_room": node_join_room,
+    }
 
-    EvscaperoomMenu(caller, menutree, startnode="node_start",
-                    cmd_on_exit=None, auto_quit=True)
+    EvscaperoomMenu(caller, menutree, startnode="node_start", cmd_on_exit=None, auto_quit=True)
 
 
 # ------------------------------------------------------------
 # In-game Options menu
 # ------------------------------------------------------------
 
+
 def _set_thing_style(caller, raw_string, **kwargs):
     room = caller.location
     options = caller.attributes.get("options", category=room.tagcategory, default={})
@@ -272,7 +283,7 @@ def _set_thing_style(caller, raw_string, **kwargs):
 
 def _toggle_screen_reader(caller, raw_string, **kwargs):
 
-    session = kwargs['session']
+    session = kwargs["session"]
     # flip old setting
     session.protocol_flags["SCREENREADER"] = not session.protocol_flags.get("SCREENREADER", False)
     # sync setting with portal
@@ -287,22 +298,33 @@ def node_options(caller, raw_string, **kwargs):
     options = caller.attributes.get("options", category=room.tagcategory, default={})
     things_style = options.get("things_style", 2)
 
-    session = kwargs['session']  # we give this as startnode_input when starting menu
+    session = kwargs["session"]  # we give this as startnode_input when starting menu
     screenreader = session.protocol_flags.get("SCREENREADER", False)
 
     options = (
-        {"desc": "{}No item markings (hard mode)".format(
-            "|g(*)|n " if things_style == 0 else "( ) "),
-         "goto": (_set_thing_style, {"value": 0, 'session': session})},
-        {"desc": "{}Items marked as |yitem|n (with color)".format(
-            "|g(*)|n " if things_style == 1 else "( ) "),
-         "goto": (_set_thing_style, {"value": 1, 'session': session})},
-        {"desc": "{}Items are marked as |y[item]|n (screenreader friendly)".format(
-            "|g(*)|n " if things_style == 2 else "( ) "),
-         "goto": (_set_thing_style, {"value": 2, 'session': session})},
-        {"desc": "{}Screenreader mode".format(
-            "(*) " if screenreader else "( ) "),
-         "goto": (_toggle_screen_reader, kwargs)})
+        {
+            "desc": "{}No item markings (hard mode)".format(
+                "|g(*)|n " if things_style == 0 else "( ) "
+            ),
+            "goto": (_set_thing_style, {"value": 0, "session": session}),
+        },
+        {
+            "desc": "{}Items marked as |yitem|n (with color)".format(
+                "|g(*)|n " if things_style == 1 else "( ) "
+            ),
+            "goto": (_set_thing_style, {"value": 1, "session": session}),
+        },
+        {
+            "desc": "{}Items are marked as |y[item]|n (screenreader friendly)".format(
+                "|g(*)|n " if things_style == 2 else "( ) "
+            ),
+            "goto": (_set_thing_style, {"value": 2, "session": session}),
+        },
+        {
+            "desc": "{}Screenreader mode".format("(*) " if screenreader else "( ) "),
+            "goto": (_toggle_screen_reader, kwargs),
+        },
+    )
     return text, options
 
 
@@ -310,6 +332,7 @@ class OptionsMenu(EvMenu):
     """
     Custom display of Option menu
     """
+
     def node_formatter(self, nodetext, optionstext):
         return f"{nodetext}\n\n{optionstext}"
 
@@ -321,5 +344,11 @@ def run_option_menu(caller, session):
     """
     menutree = {"node_start": node_options}
 
-    OptionsMenu(caller, menutree, startnode="node_start",
-                cmd_on_exit="look", auto_quit=True, startnode_input=("", {"session": session}))
+    OptionsMenu(
+        caller,
+        menutree,
+        startnode="node_start",
+        cmd_on_exit="look",
+        auto_quit=True,
+        startnode_input=("", {"session": session}),
+    )
diff --git a/evennia/contrib/evscaperoom/objects.py b/evennia/contrib/evscaperoom/objects.py
index ed3cc698c54..a7201c1389b 100644
--- a/evennia/contrib/evscaperoom/objects.py
+++ b/evennia/contrib/evscaperoom/objects.py
@@ -56,6 +56,7 @@ class EvscaperoomObject(DefaultObject):
     Default object base for all objects related to the contrib.
 
     """
+
     # these will be automatically filtered out by self.parse for
     # focus-commands using arguments like (`combine [with] object`)
     # override this per-class as necessary.
@@ -63,10 +64,7 @@ class EvscaperoomObject(DefaultObject):
 
     # this mapping allows for prettier descriptions of our current
     # position
-    position_prep_map = {"sit": "sitting",
-                         "kneel": "kneeling",
-                         "lie": "lying",
-                         "climb": "standing"}
+    position_prep_map = {"sit": "sitting", "kneel": "kneeling", "lie": "lying", "climb": "standing"}
 
     def at_object_creation(self):
         """
@@ -86,8 +84,9 @@ def at_object_creation(self):
     @property
     def tagcategory(self):
         if not self._tagcategory:
-            self._tagcategory = (self.location.db.tagcategory
-                                 if self.location else self.db.tagcategory)
+            self._tagcategory = (
+                self.location.db.tagcategory if self.location else self.db.tagcategory
+            )
         return self._tagcategory
 
     @property
@@ -162,16 +161,15 @@ def msg_room(self, caller, string, skip_caller=False):
         you = caller.key if caller else "they"
         first_person, third_person = parse_for_perspectives(string, you=you)
         for char in self.room.get_all_characters():
-            options = char.attributes.get(
-                "options", category=self.room.tagcategory, default={})
+            options = char.attributes.get("options", category=self.room.tagcategory, default={})
             style = options.get("things_style", 2)
             if char == caller:
                 if not skip_caller:
                     txt = parse_for_things(first_person, things_style=style)
-                    char.msg((txt, {'type': 'your_action'}))
+                    char.msg((txt, {"type": "your_action"}))
             else:
                 txt = parse_for_things(third_person, things_style=style)
-                char.msg((txt, {'type': 'others_action'}))
+                char.msg((txt, {"type": "others_action"}))
 
     def msg_char(self, caller, string, client_type="your_action"):
         """
@@ -180,8 +178,7 @@ def msg_char(self, caller, string, client_type="your_action"):
         """
         # we must clean away markers
         first_person, _ = parse_for_perspectives(string)
-        options = caller.attributes.get(
-            "options", category=self.room.tagcategory, default={})
+        options = caller.attributes.get("options", category=self.room.tagcategory, default={})
         style = options.get("things_style", 2)
         txt = parse_for_things(first_person, things_style=style)
         caller.msg((txt, {"type": client_type}))
@@ -227,8 +224,7 @@ def set_position(self, caller, new_position):
         """
         if new_position is None:
             # reset position
-            caller.attributes.remove(
-                "position", category=self.tagcategory)
+            caller.attributes.remove("position", category=self.tagcategory)
             if caller in self.db.positions:
                 del self.db.positions[caller]
         else:
@@ -279,8 +275,9 @@ def parse(self, args):
         here.
 
         """
-        args = re.sub(r"|".join(r"^{}\s".format(prep) for prep in self.action_prepositions),
-                      "", args)
+        args = re.sub(
+            r"|".join(r"^{}\s".format(prep) for prep in self.action_prepositions), "", args
+        )
         return args
 
     def get_cmd_signatures(self):
@@ -307,11 +304,11 @@ def get_cmd_signatures(self):
         command_signatures = sorted(command_signatures)
 
         if len(command_signatures) == 1:
-            helpstr = (f"It looks like {self.key} may be "
-                       "suitable to {callsigns}.")
+            helpstr = f"It looks like {self.key} may be " "suitable to {callsigns}."
         else:
-            helpstr = (f"At first glance, it looks like {self.key} might be "
-                       "suitable to {callsigns}.")
+            helpstr = (
+                f"At first glance, it looks like {self.key} might be " "suitable to {callsigns}."
+            )
         return command_signatures, helpstr
 
     def get_short_desc(self, full_desc):
@@ -319,7 +316,7 @@ def get_short_desc(self, full_desc):
         Extract the first sentence from the desc and use as the short desc.
 
         """
-        mat = re.match(r"(^.*?[.?!])", full_desc.strip(), re.M+re.U+re.I+re.S)
+        mat = re.match(r"(^.*?[.?!])", full_desc.strip(), re.M + re.U + re.I + re.S)
         if mat:
             return mat.group(0).strip()
         return full_desc
@@ -336,8 +333,7 @@ def get_help(self, caller):
         callsigns = list_to_string(["*" + sig for sig in command_signatures], endsep="or")
 
         # parse for *thing markers (use these as items)
-        options = caller.attributes.get(
-            "options", category=self.room.tagcategory, default={})
+        options = caller.attributes.get("options", category=self.room.tagcategory, default={})
         style = options.get("things_style", 2)
 
         helpstr = helpstr.format(callsigns=callsigns)
@@ -354,7 +350,7 @@ def return_appearance(self, looker, **kwargs):
         # accept a custom desc
         desc = kwargs.get("desc", self.db.desc)
 
-        if kwargs.get('unfocused', False):
+        if kwargs.get("unfocused", False):
             # use the shorter description
             focused = ""
             desc = self.get_short_desc(desc)
@@ -364,8 +360,11 @@ def return_appearance(self, looker, **kwargs):
             helptxt = kwargs.get("helptxt", f"\n\n({self.get_help(looker)})")
 
         obj, pos = self.get_position(looker)
-        pos = (f" |w({self.position_prep_map[pos]} on "
-               f"{obj.get_display_name(looker)})" if obj else "")
+        pos = (
+            f" |w({self.position_prep_map[pos]} on " f"{obj.get_display_name(looker)})"
+            if obj
+            else ""
+        )
 
         return f" ~~ |y{self.get_display_name(looker)}|n{focused}{pos}|n ~~\n\n{desc}{helptxt}"
 
@@ -375,6 +374,7 @@ class Feelable(EvscaperoomObject):
     Any object that you can feel the surface of.
 
     """
+
     def at_focus_feel(self, caller, **kwargs):
         self.msg_char(caller, f"You feel *{self.key}.")
 
@@ -384,6 +384,7 @@ class Listenable(EvscaperoomObject):
     Any object one can listen to.
 
     """
+
     def at_focus_listen(self, caller, **kwargs):
         self.msg_char(caller, f"You listen to *{self.key}")
 
@@ -393,6 +394,7 @@ class Smellable(EvscaperoomObject):
     Any object you can smell.
 
     """
+
     def at_focus_smell(self, caller, **kwargs):
         self.msg_char(caller, f"You smell *{self.key}.")
 
@@ -402,6 +404,7 @@ class Rotatable(EvscaperoomObject):
     Any object that you can lift up and look at from different angles
 
     """
+
     rotate_flag = "rotatable"
     start_rotatable = True
 
@@ -417,6 +420,7 @@ def at_focus_rotate(self, caller, **kwargs):
             self.at_rotate(caller)
         else:
             self.at_cannot_rotate(caller)
+
     at_focus_turn = at_focus_rotate
 
     def at_rotate(self, caller):
@@ -432,6 +436,7 @@ class Openable(EvscaperoomObject):
     a flag.
 
     """
+
     # this flag must be set for item to open. None for unlocked.
     unlock_flag = "unlocked"
     open_flag = "open"
@@ -482,6 +487,7 @@ class Readable(EvscaperoomObject):
     from a flag.
 
     """
+
     # this must be set to be able to read. None to
     # always be able to read.
 
@@ -515,11 +521,7 @@ class IndexReadable(Readable):
     """
 
     # keys should be lower-key
-    index = {
-        "page1": "This is page1",
-        "page2": "This is page2",
-        "page two": "page2"  # alias
-    }
+    index = {"page1": "This is page1", "page2": "This is page2", "page two": "page2"}  # alias
 
     def at_focus_read(self, caller, **kwargs):
 
@@ -536,8 +538,10 @@ def at_focus_read(self, caller, **kwargs):
             self.at_read(caller, topic, entry)
 
     def get_cmd_signatures(self):
-        txt = (f"You don't have the time to read this from beginning to end. "
-               "Use *read <topic> to look up something in particular.")
+        txt = (
+            f"You don't have the time to read this from beginning to end. "
+            "Use *read <topic> to look up something in particular."
+        )
         return [], txt
 
     def at_cannot_read(self, caller, topic, *args, **kwargs):
@@ -556,10 +560,10 @@ class Movable(EvscaperoomObject):
     change.
 
     """
+
     # these are the possible locations (or directions) to move to
     # name: callable
-    move_positions = {"left": "at_left",
-                      "right": "at_right"}
+    move_positions = {"left": "at_left", "right": "at_right"}
     start_position = "left"
 
     def at_object_creation(self):
@@ -571,7 +575,7 @@ def get_cmd_signatures(self):
         return ["move", "push", "shove left/right"], txt
 
     def at_focus_move(self, caller, **kwargs):
-        pos = self.parse(kwargs['args'])
+        pos = self.parse(kwargs["args"])
         callfunc_name = self.move_positions.get(pos)
 
         if callfunc_name:
@@ -610,6 +614,7 @@ class BaseConsumable(EvscaperoomObject):
     a custom object if needed).
 
     """
+
     consume_flag = "consume"
     # may only consume once
     one_consume_only = True
@@ -647,6 +652,7 @@ class Edible(BaseConsumable):
     Any object specifically possible to eat.
 
     """
+
     consume_flag = "eat"
 
     def at_focus_eat(self, caller, **kwargs):
@@ -658,6 +664,7 @@ class Drinkable(BaseConsumable):
     Any object specifically possible to drink.
 
     """
+
     consume_flag = "drink"
 
     def at_focus_drink(self, caller, **kwargs):
@@ -679,6 +686,7 @@ class BaseApplicable(EvscaperoomObject):
     This acts an an abstract base class.
 
     """
+
     # the target object this is to be used with must
     # have this flag. It'll likely be unique to this
     # object combination.
@@ -689,7 +697,7 @@ def handle_apply(self, caller, action, **kwargs):
         Wrap this with the at_focus methods in the child classes
 
         """
-        args = self.parse(kwargs['args'])
+        args = self.parse(kwargs["args"])
         if not args:
             self.msg_char(caller, "You need to specify a target.")
             return
@@ -717,6 +725,7 @@ class Usable(BaseApplicable):
     Any object that can be used with another object.
 
     """
+
     target_flag = "usable"
 
     def at_focus_use(self, caller, **kwargs):
@@ -736,6 +745,7 @@ class Insertable(BaseApplicable):
     This would cover a key, for example.
 
     """
+
     # this would likely be a custom name
     target_flag = "insertable"
 
@@ -759,6 +769,7 @@ class Combinable(BaseApplicable):
     a new one.
 
     """
+
     # the other object must have this flag to be able to be combined
     # (this is likely unique for a given combination)
     target_flag = "combinable"
@@ -767,7 +778,8 @@ class Combinable(BaseApplicable):
     new_create_dict = {
         "typeclass": "evscaperoom.objects.Combinable",
         "key": "sword",
-        "aliases": ["combined"]}
+        "aliases": ["combined"],
+    }
     # if set, destroy the two components used to make the new one
     destroy_components = True
 
@@ -784,11 +796,12 @@ def at_cannot_apply(self, caller, action, obj):
     def at_apply(self, caller, action, other_obj):
         create_dict = self.new_create_dict
         if "location" not in create_dict:
-            create_dict['location'] = self.location
+            create_dict["location"] = self.location
         new_obj = create_evscaperoom_object(**create_dict)
         if new_obj and self.destroy_components:
-            self.msg_char(caller,
-                f"You combine *{self.key} with {other_obj.key} to make {new_obj.key}!")
+            self.msg_char(
+                caller, f"You combine *{self.key} with {other_obj.key} to make {new_obj.key}!"
+            )
             other_obj.delete()
             self.delete()
 
@@ -800,14 +813,11 @@ class Mixable(EvscaperoomObject):
     the ingredients should be 'used' with this object in order
     mix, calling at_mix when they do.
     """
+
     # ingredients can check for this before they allow to mix at all
     mixer_flag = "mixer"
     # ingredients must have these flags and this order
-    ingredient_recipe = [
-        "ingredient1",
-        "ingredient2",
-        "ingredient3"
-    ]
+    ingredient_recipe = ["ingredient1", "ingredient2", "ingredient3"]
 
     def at_object_creation(self):
         super().at_object_creation()
@@ -847,7 +857,9 @@ def handle_mix(self, caller, ingredient, **kwargs):
             if self.check_mixture():
                 self.at_mix_success(caller, ingredient, **kwargs)
             else:
-                self.room.log(f"{self.name} mix failure: Tried {' + '.join([ing.key for ing in self.db.ingredients if ing])}")
+                self.room.log(
+                    f"{self.name} mix failure: Tried {' + '.join([ing.key for ing in self.db.ingredients if ing])}"
+                )
                 self.db.ingredients = []
                 self.at_mix_failure(caller, ingredient, **kwargs)
 
@@ -866,25 +878,31 @@ class HasButtons(EvscaperoomObject):
     Any object with buttons to push/press
 
     """
+
     # mapping keys/aliases to calling method
-    buttons = {'green button': "at_green_button",
-               'green': "at_green_button",
-               'red button': "at_red_button",
-               'red': "at_red_button"}
+    buttons = {
+        "green button": "at_green_button",
+        "green": "at_green_button",
+        "red button": "at_red_button",
+        "red": "at_red_button",
+    }
 
     def get_cmd_signatures(self):
-        helptxt = ("It looks like you should be able to operate "
-                   f"*{self.key} by means of "
-                   "{callsigns}.")
+        helptxt = (
+            "It looks like you should be able to operate "
+            f"*{self.key} by means of "
+            "{callsigns}."
+        )
         return ["push", "press red/green button"], helptxt
 
     def at_focus_press(self, caller, **kwargs):
-        arg = self.parse(kwargs['args'])
+        arg = self.parse(kwargs["args"])
         callfunc_name = self.buttons.get(arg)
         if callfunc_name:
             getattr(self, callfunc_name)(caller)
         else:
             self.at_nomatch(caller)
+
     at_focus_push = at_focus_press
 
     def at_nomatch(self, caller):
@@ -903,6 +921,7 @@ class CodeInput(EvscaperoomObject):
     to have an effect happen.
 
     """
+
     # the code of this
     code = "PASSWORD"
     code_hint = "eight letters A-Z"
@@ -912,7 +931,7 @@ class CodeInput(EvscaperoomObject):
 
     def at_focus_code(self, caller, **kwargs):
 
-        args = self.parse(kwargs['args'].strip())
+        args = self.parse(kwargs["args"].strip())
 
         if not args:
             self.at_no_code(caller)
@@ -967,6 +986,7 @@ class BasePositionable(EvscaperoomObject):
     object or not.
 
     """
+
     def at_object_creation(self):
         super().at_object_creation()
         # mapping {object: position}.
@@ -992,11 +1012,16 @@ def handle_position(self, caller, new_pos, **kwargs):
             self.at_position(caller, new_pos)
 
     def at_cannot_position(self, caller, position, old_obj, old_pos):
-        self.msg_char(caller, f"You can't; you are currently {self.position_prep_map[old_pos]} on *{old_obj.key} "
-                   "(better |wstand|n first).")
+        self.msg_char(
+            caller,
+            f"You can't; you are currently {self.position_prep_map[old_pos]} on *{old_obj.key} "
+            "(better |wstand|n first).",
+        )
 
     def at_again_position(self, caller, position):
-        self.msg_char(caller, f"But you are already {self.position_prep_map[position]} on *{self.key}?")
+        self.msg_char(
+            caller, f"But you are already {self.position_prep_map[position]} on *{self.key}?"
+        )
 
     def at_position(self, caller, position):
         self.msg_room(caller, f"~You ~{position} on *{self.key}.")
@@ -1017,6 +1042,7 @@ class Liable(BasePositionable):
     Any object you can lie down on.
 
     """
+
     def at_focus_lie(self, caller, **kwargs):
         super().handle_position(caller, "lie", **kwargs)
 
@@ -1026,6 +1052,7 @@ class Kneelable(BasePositionable):
     Any object you can kneel on.
 
     """
+
     def at_focus_kneel(self, caller, **kwargs):
         super().handle_position(caller, "kneel", **kwargs)
 
@@ -1037,6 +1064,7 @@ class Climbable(BasePositionable):
     command, which resets your position.
 
     """
+
     def at_focus_climb(self, caller, **kwargs):
         super().handle_position(caller, "climb", **kwargs)
 
@@ -1047,6 +1075,7 @@ class Positionable(Sittable, Liable, Kneelable, Climbable):
     supported ways (sit, lie, kneel or climb)
 
     """
+
     def get_cmd_signatures(self):
         txt = "It looks like you can {callsigns} on it."
         return ["sit", "lie", "kneel", "climb"], txt
diff --git a/evennia/contrib/evscaperoom/room.py b/evennia/contrib/evscaperoom/room.py
index 10dd2b6a80e..d591c348d0a 100644
--- a/evennia/contrib/evscaperoom/room.py
+++ b/evennia/contrib/evscaperoom/room.py
@@ -32,7 +32,7 @@ def at_object_creation(self):
         super().at_object_creation()
 
         # starting state
-        self.db.state = None   # name
+        self.db.state = None  # name
         self.db.prev_state = None
 
         # this is used for tagging of all objects belonging to this
@@ -43,11 +43,11 @@ def at_object_creation(self):
         # room progress statistics
         self.db.stats = {
             "progress": 0,  # in percent
-            "score": {},   # reason: score
+            "score": {},  # reason: score
             "max_score": 100,
             "hints_used": 0,  # total across all states
             "hints_total": 41,
-            "total_achievements": 14
+            "total_achievements": 14,
         }
 
         self.cmdset.add(CmdSetEvScapeRoom, permanent=True)
@@ -69,21 +69,21 @@ def log(self, message, caller=None):
         caller = f"[caller.key]: " if caller else ""
 
         logger.log_file(
-            strip_ansi(f"{caller}{message.strip()}"),
-            filename=self.tagcategory + ".log")
+            strip_ansi(f"{caller}{message.strip()}"), filename=self.tagcategory + ".log"
+        )
 
     def score(self, new_score, reason):
         """
         We don't score individually but for everyone in room together.
         You can only be scored for a given reason once."""
-        if reason not in self.db.stats['score']:
+        if reason not in self.db.stats["score"]:
             self.log(f"score: {reason} ({new_score}pts)")
-            self.db.stats['score'][reason] = new_score
+            self.db.stats["score"][reason] = new_score
 
     def progress(self, new_progress):
         "Progress is what we set it to be (0-100%)"
         self.log(f"progress: {new_progress}%")
-        self.db.stats['progress'] = new_progress
+        self.db.stats["progress"] = new_progress
 
     def achievement(self, caller, achievement, subtext=""):
         """
@@ -96,8 +96,7 @@ def achievement(self, caller, achievement, subtext=""):
             subtext (str, optional): Eventual subtext/explanation
                 of the achievement.
         """
-        achievements = caller.attributes.get(
-            "achievements", category=self.tagcategory)
+        achievements = caller.attributes.get("achievements", category=self.tagcategory)
         if not achievements:
             achievements = {}
         if achievement not in achievements:
@@ -173,6 +172,7 @@ def character_exit(self, char):
         """
         self.log(f"EXIT: {char} left room")
         from .menu import run_evscaperoom_menu
+
         self.character_cleanup(char)
         char.location = char.home
 
@@ -223,15 +223,18 @@ def delete(self):
 
     def return_appearance(self, looker, **kwargs):
         obj, pos = self.get_position(looker)
-        pos = (f"\n|x[{self.position_prep_map[pos]} on "
-               f"{obj.get_display_name(looker)}]|n" if obj else "")
+        pos = (
+            f"\n|x[{self.position_prep_map[pos]} on " f"{obj.get_display_name(looker)}]|n"
+            if obj
+            else ""
+        )
 
         admin_only = ""
         if self.check_perm(looker, "Admin"):
             # only for admins
-            objs = DefaultObject.objects.filter_family(
-                db_location=self).exclude(id=looker.id)
-            admin_only = "\n|xAdmin only: " + \
-                list_to_string([obj.get_display_name(looker) for obj in objs])
+            objs = DefaultObject.objects.filter_family(db_location=self).exclude(id=looker.id)
+            admin_only = "\n|xAdmin only: " + list_to_string(
+                [obj.get_display_name(looker) for obj in objs]
+            )
 
         return f"{self.db.desc}{pos}{admin_only}"
diff --git a/evennia/contrib/evscaperoom/scripts.py b/evennia/contrib/evscaperoom/scripts.py
index 34960d590a3..6aeb4dfc8c6 100644
--- a/evennia/contrib/evscaperoom/scripts.py
+++ b/evennia/contrib/evscaperoom/scripts.py
@@ -13,7 +13,6 @@
 
 
 class CleanupScript(DefaultScript):
-
     def at_script_creation(self):
 
         self.key = "evscaperoom_cleanup"
diff --git a/evennia/contrib/evscaperoom/state.py b/evennia/contrib/evscaperoom/state.py
index 64c666307e4..b238643981f 100644
--- a/evennia/contrib/evscaperoom/state.py
+++ b/evennia/contrib/evscaperoom/state.py
@@ -35,11 +35,13 @@
 
 # handler for managing states on room
 
+
 class StateHandler(object):
     """
     This sits on the room and is used to progress through the states.
 
     """
+
     def __init__(self, room):
         self.room = room
         self.current_state_name = room.db.state or _FIRST_STATE
@@ -109,12 +111,14 @@ def next_state(self, next_state=None):
 
 # base state class
 
+
 class BaseState(object):
     """
     Base object holding all callables for a state. This is here to
     allow easy overriding for child states.
 
     """
+
     next_state = "unset"
     # a sequence of hints to describe this state.
     hints = []
@@ -144,15 +148,20 @@ def _catch_errors(self, method):
         Wrapper handling state method errors.
 
         """
+
         @wraps(method)
         def decorator(*args, **kwargs):
             try:
                 return method(*args, **kwargs)
             except Exception:
                 logger.log_trace(f"Error in State {__name__}")
-                self.room.msg_room(None, f"|rThere was an unexpected error in State {__name__}. "
-                                   "Please |wreport|r this as an issue.|n")
+                self.room.msg_room(
+                    None,
+                    f"|rThere was an unexpected error in State {__name__}. "
+                    "Please |wreport|r this as an issue.|n",
+                )
                 raise  # TODO
+
         return decorator
 
     def __getattribute__(self, key):
@@ -176,8 +185,10 @@ def get_hint(self):
             # return the next hint in the sequence.
             self.room.db.state_hint_level = next_level
             self.room.db.stats["hints_used"] += 1
-            self.room.log(f"HINT: {self.name.split('.')[-1]}, level {next_level + 1} "
-                          f"(total used: {self.room.db.stats['hints_used']})")
+            self.room.log(
+                f"HINT: {self.name.split('.')[-1]}, level {next_level + 1} "
+                f"(total used: {self.room.db.stats['hints_used']})"
+            )
             return self.hints[next_level]
         else:
             # no more hints for this state
@@ -191,8 +202,7 @@ def msg(self, message, target=None, borders=False, cinematic=False):
         if cinematic:
             message = msg_cinematic(message, borders=borders)
         if target:
-            options = target.attributes.get(
-                "options", category=self.room.tagcategory, default={})
+            options = target.attributes.get("options", category=self.room.tagcategory, default={})
             style = options.get("things_style", 2)
             # we assume this is a char
             target.msg(parse_for_things(message, things_style=style))
@@ -205,7 +215,7 @@ def cinematic(self, message, target=None):
         """
         self.msg(message, target=target, borders=True, cinematic=True)
 
-    def create_object(self, typeclass=None, key='testobj', location=None, **kwargs):
+    def create_object(self, typeclass=None, key="testobj", location=None, **kwargs):
         """
         This is a convenience-wrapper for quickly building EvscapeRoom objects.
 
@@ -223,8 +233,12 @@ def create_object(self, typeclass=None, key='testobj', location=None, **kwargs):
         if not location:
             location = self.room
         return create_evscaperoom_object(
-            typeclass=typeclass, key=key, location=location,
-            tags=[("room", self.room.tagcategory.lower())], **kwargs)
+            typeclass=typeclass,
+            key=key,
+            location=location,
+            tags=[("room", self.room.tagcategory.lower())],
+            **kwargs,
+        )
 
     def get_object(self, key):
         """
@@ -237,7 +251,8 @@ def get_object(self, key):
 
         """
         match = EvscaperoomObject.objects.filter_family(
-            db_key__iexact=key, db_tags__db_category=self.room.tagcategory.lower())
+            db_key__iexact=key, db_tags__db_category=self.room.tagcategory.lower()
+        )
         if not match:
             logger.log_err(f"get_object: No match for '{key}' in state ")
             return None
diff --git a/evennia/contrib/evscaperoom/states/README.md b/evennia/contrib/evscaperoom/states/README.md
index 8547fb9a711..ac2c75bdcde 100644
--- a/evennia/contrib/evscaperoom/states/README.md
+++ b/evennia/contrib/evscaperoom/states/README.md
@@ -15,7 +15,7 @@ system but they don't necessarily need to follow each other in the exact
 sequence.
 
 Each state module must make a class `State` available in the global scope. This
-should be a child of `evennia.contribs.evscaperoom.state.BaseState`. The
+should be a child of `evennia.contrib.evscaperoom.state.BaseState`. The
 methods on this class will be called to initialize the state and clean up etc.
 There are no other restrictions on the module.
 
diff --git a/evennia/contrib/evscaperoom/states/state_001_start.py b/evennia/contrib/evscaperoom/states/state_001_start.py
index e35de01ba99..66dfbae8d4c 100644
--- a/evennia/contrib/evscaperoom/states/state_001_start.py
+++ b/evennia/contrib/evscaperoom/states/state_001_start.py
@@ -40,6 +40,7 @@ class Door(objects.Openable):
     The door leads out of the room.
 
     """
+
     start_open = False
 
     def at_object_creation(self):
@@ -108,7 +109,6 @@ def get_cmd_signatures(self):
 
 
 class HelpButton(objects.EvscaperoomObject):
-
     def at_focus_push(self, caller, **kwargs):
         "this adds the 'push' action to the button"
 
@@ -116,8 +116,9 @@ def at_focus_push(self, caller, **kwargs):
         if hint is None:
             self.msg_char(caller, "There are no more hints to be had.")
         else:
-            self.msg_room(caller, f"{caller.key} pushes *button and gets the "
-                                  f"hint:\n \"{hint.strip()}\"|n")
+            self.msg_room(
+                caller, f"{caller.key} pushes *button and gets the " f'hint:\n "{hint.strip()}"|n'
+            )
 
 
 # state
@@ -144,9 +145,7 @@ class State(BaseState):
     """
 
     # this makes these hints available to the .get_hint method.
-    hints = [STATE_HINT_LVL1,
-             STATE_HINT_LVL2,
-             STATE_HINT_LVL3]
+    hints = [STATE_HINT_LVL1, STATE_HINT_LVL2, STATE_HINT_LVL3]
 
     def character_enters(self, char):
         "Called when char enters room at this state"
@@ -159,16 +158,13 @@ def init(self):
         self.room.db.desc = ROOM_DESC
 
         # create the room objects
-        door = self.create_object(
-            Door, key="door to the cabin", aliases=["door"])
+        door = self.create_object(Door, key="door to the cabin", aliases=["door"])
         door.db.desc = DOOR_DESC.strip()
 
-        key = self.create_object(
-            Key, key="key", aliases=["room key"])
+        key = self.create_object(Key, key="key", aliases=["room key"])
         key.db.desc = KEY_DESC.strip()
 
-        button = self.create_object(
-            HelpButton, key="button", aliases=["help button"])
+        button = self.create_object(HelpButton, key="button", aliases=["help button"])
         button.db.desc = BUTTON_DESC.strip()
 
     def clean(self):
diff --git a/evennia/contrib/evscaperoom/tests.py b/evennia/contrib/evscaperoom/tests.py
index ebee45dd58d..16f7aecef26 100644
--- a/evennia/contrib/evscaperoom/tests.py
+++ b/evennia/contrib/evscaperoom/tests.py
@@ -16,11 +16,9 @@
 
 
 class TestEvscaperoomCommands(CommandTest):
-
     def setUp(self):
         super().setUp()
-        self.room1 = utils.create_evscaperoom_object(
-            "evscaperoom.room.EvscapeRoom", key='Testroom')
+        self.room1 = utils.create_evscaperoom_object("evscaperoom.room.EvscapeRoom", key="Testroom")
         self.char1.location = self.room1
         self.obj1.location = self.room1
 
@@ -114,7 +112,7 @@ def test_base_parse(self):
 
         self.assertEqual(cmd.obj1, None)
         self.assertEqual(cmd.obj2, self.obj1)
-        self.assertEqual(cmd.arg1, 'foo')
+        self.assertEqual(cmd.arg1, "foo")
         self.assertEqual(cmd.arg2, None)
 
         cmd = commands.CmdEvscapeRoom()
@@ -127,7 +125,7 @@ def test_base_parse(self):
         self.assertEqual(cmd.obj1, self.obj1)
         self.assertEqual(cmd.obj2, None)
         self.assertEqual(cmd.arg1, None)
-        self.assertEqual(cmd.arg2, 'foo')
+        self.assertEqual(cmd.arg2, "foo")
 
         cmd = commands.CmdEvscapeRoom()
         cmd.caller = self.char1
@@ -152,21 +150,20 @@ def test_set_focus(self):
         cmd.caller = self.char1
         cmd.room = self.room1
         cmd.focus = self.obj1
-        self.assertEqual(self.char1.attributes.get(
-            "focus", category=self.room1.tagcategory), self.obj1)
+        self.assertEqual(
+            self.char1.attributes.get("focus", category=self.room1.tagcategory), self.obj1
+        )
 
     def test_focus(self):
         # don't focus on a non-room object
         self.call(commands.CmdFocus(), "obj")
-        self.assertEqual(self.char1.attributes.get(
-            "focus", category=self.room1.tagcategory), None)
+        self.assertEqual(self.char1.attributes.get("focus", category=self.room1.tagcategory), None)
         # should focus correctly
         myobj = utils.create_evscaperoom_object(
-            objects.EvscaperoomObject, "mytestobj", location=self.room1)
+            objects.EvscaperoomObject, "mytestobj", location=self.room1
+        )
         self.call(commands.CmdFocus(), "mytestobj")
-        self.assertEqual(self.char1.attributes.get(
-            "focus", category=self.room1.tagcategory), myobj)
-
+        self.assertEqual(self.char1.attributes.get("focus", category=self.room1.tagcategory), myobj)
 
     def test_look(self):
         self.call(commands.CmdLook(), "at obj", "Obj")
@@ -181,31 +178,31 @@ def test_speech(self):
         self.call(commands.CmdSpeak(), "Hi.", "You whisper: Hi.", cmdstring="whisper")
         self.call(commands.CmdSpeak(), "HELLO!", "You shout: HELLO!", cmdstring="shout")
 
-        self.call(commands.CmdSpeak(), "Hello to obj",
-                  "You say: Hello", cmdstring="say")
-        self.call(commands.CmdSpeak(), "Hello to obj",
-                  "You shout: Hello", cmdstring="shout")
+        self.call(commands.CmdSpeak(), "Hello to obj", "You say: Hello", cmdstring="say")
+        self.call(commands.CmdSpeak(), "Hello to obj", "You shout: Hello", cmdstring="shout")
 
     def test_emote(self):
-        self.call(commands.CmdEmote(),
-                  "/me smiles to /obj",
-                  f"Char(#{self.char1.id}) smiles to Obj(#{self.obj1.id})")
+        self.call(
+            commands.CmdEmote(),
+            "/me smiles to /obj",
+            f"Char(#{self.char1.id}) smiles to Obj(#{self.obj1.id})",
+        )
 
     def test_focus_interaction(self):
         self.call(commands.CmdFocusInteraction(), "", "Hm?")
 
 
 class TestUtils(EvenniaTest):
-
     def test_overwrite(self):
-        room = utils.create_evscaperoom_object(
-            "evscaperoom.room.EvscapeRoom", key='Testroom')
+        room = utils.create_evscaperoom_object("evscaperoom.room.EvscapeRoom", key="Testroom")
         obj1 = utils.create_evscaperoom_object(
-            objects.EvscaperoomObject, key="testobj", location=room)
+            objects.EvscaperoomObject, key="testobj", location=room
+        )
         id1 = obj1.id
 
         obj2 = utils.create_evscaperoom_object(
-            objects.EvscaperoomObject, key="testobj", location=room)
+            objects.EvscaperoomObject, key="testobj", location=room
+        )
         id2 = obj2.id
 
         # we should have created a new object, deleting the old same-named one
@@ -231,14 +228,12 @@ def test_parse_for_things(self):
         self.assertEqual(utils.parse_for_things(string, 2), "Looking at |y[book]|n and |y[key]|n.")
 
 
-
 class TestEvScapeRoom(EvenniaTest):
-
     def setUp(self):
         super().setUp()
         self.room = utils.create_evscaperoom_object(
-            "evscaperoom.room.EvscapeRoom", key='Testroom',
-            home=self.room1)
+            "evscaperoom.room.EvscapeRoom", key="Testroom", home=self.room1
+        )
         self.roomtag = "evscaperoom_{}".format(self.room.key)
 
     def tearDown(self):
@@ -253,24 +248,21 @@ def test_room_methods(self):
         self.assertEqual(list(room.get_all_characters()), [self.char1])
 
         room.tag_character(self.char1, "opened_door")
-        self.assertEqual(self.char1.tags.get(
-            "opened_door", category=self.roomtag), "opened_door")
+        self.assertEqual(self.char1.tags.get("opened_door", category=self.roomtag), "opened_door")
 
         room.tag_all_characters("tagged_all")
-        self.assertEqual(self.char1.tags.get(
-            "tagged_all", category=self.roomtag), "tagged_all")
+        self.assertEqual(self.char1.tags.get("tagged_all", category=self.roomtag), "tagged_all")
 
         room.character_cleanup(self.char1)
         self.assertEqual(self.char1.tags.get(category=self.roomtag), None)
 
 
 class TestStates(EvenniaTest):
-
     def setUp(self):
         super().setUp()
         self.room = utils.create_evscaperoom_object(
-            "evscaperoom.room.EvscapeRoom", key='Testroom',
-            home=self.room1)
+            "evscaperoom.room.EvscapeRoom", key="Testroom", home=self.room1
+        )
         self.roomtag = "evscaperoom_#{}".format(self.room.id)
 
     def tearDown(self):
@@ -280,7 +272,8 @@ def _get_all_state_modules(self):
         dirname = path.join(path.dirname(__file__), "states")
         states = []
         for imp, module, ispackage in pkgutil.walk_packages(
-                path=[dirname], prefix="evscaperoom.states."):
+            path=[dirname], prefix="evscaperoom.states."
+        ):
             mod = mod_import(module)
             states.append(mod)
         return states
diff --git a/evennia/contrib/evscaperoom/utils.py b/evennia/contrib/evscaperoom/utils.py
index d9c0e3ee2d2..8dea6942af1 100644
--- a/evennia/contrib/evscaperoom/utils.py
+++ b/evennia/contrib/evscaperoom/utils.py
@@ -12,12 +12,13 @@
 from evennia.utils import justify, inherits_from
 
 _BASE_TYPECLASS_PATH = "evscaperoom.objects."
-_RE_PERSPECTIVE = re.compile(r"~(\w+)", re.I+re.U+re.M)
-_RE_THING = re.compile(r"\*(\w+)", re.I+re.U+re.M)
+_RE_PERSPECTIVE = re.compile(r"~(\w+)", re.I + re.U + re.M)
+_RE_THING = re.compile(r"\*(\w+)", re.I + re.U + re.M)
 
 
-def create_evscaperoom_object(typeclass=None, key="testobj", location=None,
-                              delete_duplicates=True, **kwargs):
+def create_evscaperoom_object(
+    typeclass=None, key="testobj", location=None, delete_duplicates=True, **kwargs
+):
     """
     This is a convenience-wrapper for quickly building EvscapeRoom objects. This
     is called from the helper-method create_object on states, but is also useful
@@ -38,25 +39,29 @@ def create_evscaperoom_object(typeclass=None, key="testobj", location=None,
 
 
     """
-    if not (callable(typeclass) or
-            typeclass.startswith("evennia") or
-            typeclass.startswith("typeclasses") or
-            typeclass.startswith("evscaperoom")):
+    if not (
+        callable(typeclass)
+        or typeclass.startswith("evennia")
+        or typeclass.startswith("typeclasses")
+        or typeclass.startswith("evscaperoom")
+    ):
         # unless we specify a full typeclass path or the class itself,
         # auto-complete it
         typeclass = _BASE_TYPECLASS_PATH + typeclass
 
     if delete_duplicates:
-        old_objs = [obj for obj in search_object(key)
-                    if not inherits_from(obj, "evennia.objects.objects.DefaultCharacter")]
+        old_objs = [
+            obj
+            for obj in search_object(key)
+            if not inherits_from(obj, "evennia.objects.objects.DefaultCharacter")
+        ]
         if location:
             # delete only matching objects in the given location
             [obj.delete() for obj in old_objs if obj.location == location]
         else:
             [obj.delete() for obj in old_objs]
 
-    new_obj = create_object(typeclass=typeclass, key=key,
-                            location=location, **kwargs)
+    new_obj = create_object(typeclass=typeclass, key=key, location=location, **kwargs)
     return new_obj
 
 
@@ -74,9 +79,11 @@ def create_fantasy_word(length=5, capitalize=True):
     if not length:
         return ""
 
-    phonemes = ("ea oh ae aa eh ah ao aw ai er ey ow ia ih iy oy ua "
-                "uh uw a e i u y p b t d f v t dh "
-                "s z sh zh ch jh k ng g m n l r w").split()
+    phonemes = (
+        "ea oh ae aa eh ah ao aw ai er ey ow ia ih iy oy ua "
+        "uh uw a e i u y p b t d f v t dh "
+        "s z sh zh ch jh k ng g m n l r w"
+    ).split()
     word = [choice(phonemes)]
     while len(word) < length:
         word.append(choice(phonemes))
@@ -113,6 +120,7 @@ def parse_for_perspectives(string, you=None):
         "~You ~open"
         ->  "You open", "Bob opens"
     """
+
     def _replace_third_person(match):
         match = match.group(1)
         lmatch = match.lower()
@@ -122,7 +130,7 @@ def _replace_third_person(match):
             if match[0].isupper():
                 return irregulars[lmatch].capitalize()
             return irregulars[lmatch]
-        elif lmatch[-1] == 's':
+        elif lmatch[-1] == "s":
             return match + "es"
         else:
             return match + "s"  # simple, most normal form
@@ -181,7 +189,7 @@ def msg_cinematic(text, borders=True):
 
     """
     text = text.strip()
-    text = justify(text, align='c', indent=1)
+    text = justify(text, align="c", indent=1)
     if borders:
         text = add_msg_borders(text)
     return text
diff --git a/evennia/contrib/extended_room.py b/evennia/contrib/extended_room.py
index 8f33e5dd5b0..c75ee35ec0a 100644
--- a/evennia/contrib/extended_room.py
+++ b/evennia/contrib/extended_room.py
@@ -94,7 +94,7 @@ def at_cmdset_creation(self):
 from evennia import CmdSet
 
 # error return function, needed by Extended Look command
-_AT_SEARCH_RESULT = utils.variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+_AT_SEARCH_RESULT = utils.variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
 
 # regexes for in-desc replacements
 RE_MORNING = re.compile(r"<morning>(.*?)</morning>", re.IGNORECASE)
@@ -103,10 +103,12 @@ def at_cmdset_creation(self):
 RE_NIGHT = re.compile(r"<night>(.*?)</night>", re.IGNORECASE)
 # this map is just a faster way to select the right regexes (the first
 # regex in each tuple will be parsed, the following will always be weeded out)
-REGEXMAP = {"morning": (RE_MORNING, RE_AFTERNOON, RE_EVENING, RE_NIGHT),
-            "afternoon": (RE_AFTERNOON, RE_MORNING, RE_EVENING, RE_NIGHT),
-            "evening": (RE_EVENING, RE_MORNING, RE_AFTERNOON, RE_NIGHT),
-            "night": (RE_NIGHT, RE_MORNING, RE_AFTERNOON, RE_EVENING)}
+REGEXMAP = {
+    "morning": (RE_MORNING, RE_AFTERNOON, RE_EVENING, RE_NIGHT),
+    "afternoon": (RE_AFTERNOON, RE_MORNING, RE_EVENING, RE_NIGHT),
+    "evening": (RE_EVENING, RE_MORNING, RE_AFTERNOON, RE_NIGHT),
+    "night": (RE_NIGHT, RE_MORNING, RE_AFTERNOON, RE_EVENING),
+}
 
 # set up the seasons and time slots. This assumes gametime started at the
 # beginning of the year (so month 1 is equivalent to January), and that
@@ -119,6 +121,7 @@ def at_cmdset_creation(self):
 
 # implements the Extended Room
 
+
 class ExtendedRoom(DefaultRoom):
     """
     This room implements a more advanced `look` functionality depending on
@@ -265,7 +268,6 @@ def del_detail(self, detailkey, description):
         if self.db.details and detailkey.lower() in self.db.details:
             del self.db.details[detailkey.lower()]
 
-
     def return_appearance(self, looker, **kwargs):
         """
         This is called when e.g. the look command wants to retrieve
@@ -321,6 +323,7 @@ def update_current_description(self):
 # Custom Look command supporting Room details. Add this to
 # the Default cmdset to use.
 
+
 class CmdExtendedRoomLook(default_cmds.CmdLook):
     """
     look
@@ -341,15 +344,21 @@ def func(self):
         caller = self.caller
         args = self.args
         if args:
-            looking_at_obj = caller.search(args,
-                                           candidates=caller.location.contents + caller.contents,
-                                           use_nicks=True,
-                                           quiet=True)
+            looking_at_obj = caller.search(
+                args,
+                candidates=caller.location.contents + caller.contents,
+                use_nicks=True,
+                quiet=True,
+            )
             if not looking_at_obj:
                 # no object found. Check if there is a matching
                 # detail at location.
                 location = caller.location
-                if location and hasattr(location, "return_detail") and callable(location.return_detail):
+                if (
+                    location
+                    and hasattr(location, "return_detail")
+                    and callable(location.return_detail)
+                ):
                     detail = location.return_detail(args)
                     if detail:
                         # we found a detail instead. Show that.
@@ -367,7 +376,7 @@ def func(self):
                 caller.msg("You have no location to look at!")
                 return
 
-        if not hasattr(looking_at_obj, 'return_appearance'):
+        if not hasattr(looking_at_obj, "return_appearance"):
             # this is likely due to us having an account instead
             looking_at_obj = looking_at_obj.character
         if not looking_at_obj.access(caller, "view"):
@@ -382,6 +391,7 @@ def func(self):
 # Custom build commands for setting seasonal descriptions
 # and detailing extended rooms.
 
+
 class CmdExtendedRoomDesc(default_cmds.CmdDesc):
     """
     `desc` - describe an object or room.
@@ -411,6 +421,7 @@ class CmdExtendedRoomDesc(default_cmds.CmdDesc):
     version of the `desc` command.
 
     """
+
     aliases = ["describe"]
     switch_options = ()  # Inherits from default_cmds.CmdDesc, but unused here
 
@@ -442,13 +453,13 @@ def func(self):
             if not location:
                 caller.msg("No location was found!")
                 return
-            if switch == 'spring':
+            if switch == "spring":
                 location.db.spring_desc = self.args
-            elif switch == 'summer':
+            elif switch == "summer":
                 location.db.summer_desc = self.args
-            elif switch == 'autumn':
+            elif switch == "autumn":
                 location.db.autumn_desc = self.args
-            elif switch == 'winter':
+            elif switch == "winter":
                 location.db.winter_desc = self.args
             # clear flag to force an update
             self.reset_times(location)
@@ -498,6 +509,7 @@ class CmdExtendedRoomDetail(default_cmds.MuxCommand):
     To remove one or several details, use the @detail/del switch.
 
     """
+
     key = "@detail"
     locks = "cmd:perm(Builder)"
     help_category = "Building"
@@ -537,6 +549,7 @@ def func(self):
 
 # Simple command to view the current time and season
 
+
 class CmdExtendedRoomGameTime(default_cmds.MuxCommand):
     """
     Check the game time
@@ -546,6 +559,7 @@ class CmdExtendedRoomGameTime(default_cmds.MuxCommand):
 
     Shows the current in-game time and season.
     """
+
     key = "time"
     locks = "cmd:all()"
     help_category = "General"
@@ -565,11 +579,13 @@ def func(self):
 
 # CmdSet for easily install all commands
 
+
 class ExtendedRoomCmdSet(CmdSet):
     """
     Groups the extended-room commands.
 
     """
+
     def at_cmdset_creation(self):
         self.add(CmdExtendedRoomLook)
         self.add(CmdExtendedRoomDesc)
diff --git a/evennia/contrib/fieldfill.py b/evennia/contrib/fieldfill.py
index b20f64cd669..e2a5970ffed 100644
--- a/evennia/contrib/fieldfill.py
+++ b/evennia/contrib/fieldfill.py
@@ -166,9 +166,18 @@ def node_formatter(self, nodetext, optionstext):
         return nodetext
 
 
-def init_fill_field(formtemplate, caller, formcallback, pretext="", posttext="",
-                    submitcmd="submit", borderstyle="cells", formhelptext=None,
-                    persistent=False, initial_formdata=None):
+def init_fill_field(
+    formtemplate,
+    caller,
+    formcallback,
+    pretext="",
+    posttext="",
+    submitcmd="submit",
+    borderstyle="cells",
+    formhelptext=None,
+    persistent=False,
+    initial_formdata=None,
+):
     """
     Initializes a menu presenting a player with a fillable form - once the form
     is submitted, the data will be passed as a dictionary to your chosen
@@ -201,13 +210,14 @@ def init_fill_field(formtemplate, caller, formcallback, pretext="", posttext="",
     # Provide default help text if none given
     if formhelptext is None:
         formhelptext = (
-             "Available commands:|/"
-             "|w<field> = <new value>:|n Set given field to new value, replacing the old value|/"
-             "|wclear <field>:|n Clear the value in the given field, making it blank|/"
-             "|wlook|n: Show the form's current values|/"
-             "|whelp|n: Display this help screen|/"
-             "|wquit|n: Quit the form menu without submitting|/"
-             "|w%s|n: Submit this form and quit the menu" % submitcmd)
+            "Available commands:|/"
+            "|w<field> = <new value>:|n Set given field to new value, replacing the old value|/"
+            "|wclear <field>:|n Clear the value in the given field, making it blank|/"
+            "|wlook|n: Show the form's current values|/"
+            "|whelp|n: Display this help screen|/"
+            "|wquit|n: Quit the form menu without submitting|/"
+            "|w%s|n: Submit this form and quit the menu" % submitcmd
+        )
 
     # Pass kwargs to store data needed in the menu
     kwargs = {
@@ -218,12 +228,18 @@ def init_fill_field(formtemplate, caller, formcallback, pretext="", posttext="",
         "posttext": posttext,
         "submitcmd": submitcmd,
         "borderstyle": borderstyle,
-        "formhelptext": formhelptext
+        "formhelptext": formhelptext,
     }
 
     # Initialize menu of selections
-    FieldEvMenu(caller, "evennia.contrib.fieldfill", startnode="menunode_fieldfill",
-                auto_look=False, persistent=persistent, **kwargs)
+    FieldEvMenu(
+        caller,
+        "evennia.contrib.fieldfill",
+        startnode="menunode_fieldfill",
+        auto_look=False,
+        persistent=persistent,
+        **kwargs,
+    )
 
 
 def menunode_fieldfill(caller, raw_string, **kwargs):
@@ -254,13 +270,19 @@ def menunode_fieldfill(caller, raw_string, **kwargs):
         formhelptext = caller.db._menutree.formhelptext
 
     # Syntax error
-    syntax_err = "Syntax: <field> = <new value>|/Or: clear <field>, help, look, quit|/'%s' to submit form" % submitcmd
+    syntax_err = (
+        "Syntax: <field> = <new value>|/Or: clear <field>, help, look, quit|/'%s' to submit form"
+        % submitcmd
+    )
 
     # Display current form data
-    text = (display_formdata(formtemplate, formdata, pretext=pretext,
-            posttext=posttext, borderstyle=borderstyle), formhelptext)
-    options = ({"key": "_default",
-               "goto": "menunode_fieldfill"})
+    text = (
+        display_formdata(
+            formtemplate, formdata, pretext=pretext, posttext=posttext, borderstyle=borderstyle
+        ),
+        formhelptext,
+    )
+    options = {"key": "_default", "goto": "menunode_fieldfill"}
 
     if raw_string:
         # Test for given 'submit' command
@@ -275,7 +297,10 @@ def menunode_fieldfill(caller, raw_string, **kwargs):
                         blank_and_required.append(field["fieldname"])
             if len(blank_and_required) > 0:
                 # List the required fields left empty to the player
-                caller.msg("The following blank fields require a value: %s" % list_to_string(blank_and_required))
+                caller.msg(
+                    "The following blank fields require a value: %s"
+                    % list_to_string(blank_and_required)
+                )
                 text = (None, formhelptext)
                 return text, options
 
@@ -377,12 +402,18 @@ def menunode_fieldfill(caller, raw_string, **kwargs):
             # Test for max/min
             if max_value is not None:
                 if len(newvalue) > max_value:
-                    caller.msg("Field '%s' has a maximum length of %i characters." % (matched_field, max_value))
+                    caller.msg(
+                        "Field '%s' has a maximum length of %i characters."
+                        % (matched_field, max_value)
+                    )
                     text = (None, formhelptext)
                     return text, options
             if min_value is not None:
                 if len(newvalue) < min_value:
-                    caller.msg("Field '%s' reqiures a minimum length of %i characters." % (matched_field, min_value))
+                    caller.msg(
+                        "Field '%s' reqiures a minimum length of %i characters."
+                        % (matched_field, min_value)
+                    )
                     text = (None, formhelptext)
                     return text, options
 
@@ -402,14 +433,18 @@ def menunode_fieldfill(caller, raw_string, **kwargs):
                     return text, options
             if min_value is not None:
                 if newvalue < min_value:
-                    caller.msg("Field '%s' reqiures a minimum value of %i." % (matched_field, min_value))
+                    caller.msg(
+                        "Field '%s' reqiures a minimum value of %i." % (matched_field, min_value)
+                    )
                     text = (None, formhelptext)
                     return text, options
 
         # Field type bool verification
         if fieldtype == "bool":
             if newvalue.lower() != truestr.lower() and newvalue.lower() != falsestr.lower():
-                caller.msg("Please enter '%s' or '%s' for field '%s'." % (truestr, falsestr, matched_field))
+                caller.msg(
+                    "Please enter '%s' or '%s' for field '%s'." % (truestr, falsestr, matched_field)
+                )
                 text = (None, formhelptext)
                 return text, options
             if newvalue.lower() == truestr.lower():
@@ -474,8 +509,7 @@ def form_template_to_dict(formtemplate):
     return formdata
 
 
-def display_formdata(formtemplate, formdata,
-                     pretext="", posttext="", borderstyle="cells"):
+def display_formdata(formtemplate, formdata, pretext="", posttext="", borderstyle="cells"):
     """
     Displays a form's current data as a table. Used in the form menu.
 
@@ -568,35 +602,40 @@ def verify_online_player(caller, value):
     # besides strings and integers in the 'formdata' dictionary this way!
     return matched_character
 
+
 # Form template for the example 'delayed message' form
 SAMPLE_FORM = [
-    {"fieldname": "Character",
-     "fieldtype": "text",
-     "max": 30,
-     "blankmsg": "(Name of an online player)",
-     "required": True,
-     "verifyfunc": verify_online_player
-     },
-    {"fieldname": "Delay",
-     "fieldtype": "number",
-     "min": 3,
-     "max": 30,
-     "default": 10,
-     "cantclear": True
-     },
-    {"fieldname": "Message",
-     "fieldtype": "text",
-     "min": 3,
-     "max": 200,
-     "blankmsg": "(Message up to 200 characters)"
-     },
-    {"fieldname": "Anonymous",
-     "fieldtype": "bool",
-     "truestr": "Yes",
-     "falsestr": "No",
-     "default": False
-     }
-    ]
+    {
+        "fieldname": "Character",
+        "fieldtype": "text",
+        "max": 30,
+        "blankmsg": "(Name of an online player)",
+        "required": True,
+        "verifyfunc": verify_online_player,
+    },
+    {
+        "fieldname": "Delay",
+        "fieldtype": "number",
+        "min": 3,
+        "max": 30,
+        "default": 10,
+        "cantclear": True,
+    },
+    {
+        "fieldname": "Message",
+        "fieldtype": "text",
+        "min": 3,
+        "max": 200,
+        "blankmsg": "(Message up to 200 characters)",
+    },
+    {
+        "fieldname": "Anonymous",
+        "fieldtype": "bool",
+        "truestr": "Yes",
+        "falsestr": "No",
+        "default": False,
+    },
+]
 
 
 class CmdTestMenu(Command):
@@ -621,15 +660,25 @@ def func(self):
         """
         This performs the actual command.
         """
-        pretext = "|cSend a delayed message to another player ---------------------------------------|n"
-        posttext = ("|c--------------------------------------------------------------------------------|n|/"
-                    "Syntax: type |c<field> = <new value>|n to change the values of the form. Given|/"
-                    "player must be currently logged in, delay is given in seconds. When you are|/"
-                    "finished, type '|csend|n' to send the message.|/")
-
-        init_fill_field(SAMPLE_FORM, self.caller, init_delayed_message,
-                        pretext=pretext, posttext=posttext,
-                        submitcmd="send", borderstyle="none")
+        pretext = (
+            "|cSend a delayed message to another player ---------------------------------------|n"
+        )
+        posttext = (
+            "|c--------------------------------------------------------------------------------|n|/"
+            "Syntax: type |c<field> = <new value>|n to change the values of the form. Given|/"
+            "player must be currently logged in, delay is given in seconds. When you are|/"
+            "finished, type '|csend|n' to send the message.|/"
+        )
+
+        init_fill_field(
+            SAMPLE_FORM,
+            self.caller,
+            init_delayed_message,
+            pretext=pretext,
+            posttext=posttext,
+            submitcmd="send",
+            borderstyle="none",
+        )
 
 
 def sendmessage(obj, text):
diff --git a/evennia/contrib/gendersub.py b/evennia/contrib/gendersub.py
index f4bdefbd936..09d8a2a0062 100644
--- a/evennia/contrib/gendersub.py
+++ b/evennia/contrib/gendersub.py
@@ -33,24 +33,13 @@
 
 # gender maps
 
-_GENDER_PRONOUN_MAP = {"male": {"s": "he",
-                                "o": "him",
-                                "p": "his",
-                                "a": "his"},
-                       "female": {"s": "she",
-                                  "o": "her",
-                                  "p": "her",
-                                  "a": "hers"},
-                       "neutral": {"s": "it",
-                                   "o": "it",
-                                   "p": "its",
-                                   "a": "its"},
-                       "ambiguous": {"s": "they",
-                                     "o": "them",
-                                     "p": "their",
-                                     "a": "theirs"}
-                       }
-_RE_GENDER_PRONOUN = re.compile(r'(?<!\|)\|(?!\|)[sSoOpPaA]')
+_GENDER_PRONOUN_MAP = {
+    "male": {"s": "he", "o": "him", "p": "his", "a": "his"},
+    "female": {"s": "she", "o": "her", "p": "her", "a": "hers"},
+    "neutral": {"s": "it", "o": "it", "p": "its", "a": "its"},
+    "ambiguous": {"s": "they", "o": "them", "p": "their", "a": "theirs"},
+}
+_RE_GENDER_PRONOUN = re.compile(r"(?<!\|)\|(?!\|)[sSoOpPaA]")
 
 # in-game command for setting the gender
 
@@ -63,6 +52,7 @@ class SetGender(Command):
       @gender male||female||neutral||ambiguous
 
     """
+
     key = "@gender"
     aliases = "@sex"
     locks = "call:all()"
@@ -82,6 +72,7 @@ def func(self):
 
 # Gender-aware character class
 
+
 class GenderCharacter(DefaultCharacter):
     """
     This is a Character class aware of gender.
diff --git a/evennia/contrib/health_bar.py b/evennia/contrib/health_bar.py
index 5ccfa1acbdf..db6bd2212bc 100644
--- a/evennia/contrib/health_bar.py
+++ b/evennia/contrib/health_bar.py
@@ -22,11 +22,19 @@
 values displayed within.
 """
 
-def display_meter(cur_value, max_value, 
-                  length=30, fill_color=["R", "Y", "G"],
-                  empty_color="B", text_color="w",
-                  align="left", pre_text="", post_text="",
-                  show_values=True):
+
+def display_meter(
+    cur_value,
+    max_value,
+    length=30,
+    fill_color=["R", "Y", "G"],
+    empty_color="B",
+    text_color="w",
+    align="left",
+    pre_text="",
+    post_text="",
+    show_values=True,
+):
     """
     Represents a current and maximum value given as a "bar" rendered with
     ANSI or xterm256 background colors.
@@ -70,34 +78,43 @@ def display_meter(cur_value, max_value,
         bar_base_str = bar_base_str.center(length, " ")
     else:
         bar_base_str = bar_base_str.ljust(length, " ")
-    
-    if max_value < 1: # Prevent divide by zero
-      max_value = 1
-    if cur_value < 0: # Prevent weirdly formatted 'negative bars'
-      cur_value = 0
-    if cur_value > max_value: # Display overfull bars correctly
-      cur_value = max_value
-    
+
+    if max_value < 1:  # Prevent divide by zero
+        max_value = 1
+    if cur_value < 0:  # Prevent weirdly formatted 'negative bars'
+        cur_value = 0
+    if cur_value > max_value:  # Display overfull bars correctly
+        cur_value = max_value
+
     # Now it's time to determine where to put the color codes.
     percent_full = float(cur_value) / float(max_value)
     split_index = round(float(length) * percent_full)
     # Determine point at which to split the bar
     split_index = int(split_index)
-    
+
     # Separate the bar string into full and empty portions
     full_portion = bar_base_str[:split_index]
     empty_portion = bar_base_str[split_index:]
-    
+
     # Pick which fill color to use based on how full the bar is
-    fillcolor_index = (float(len(fill_color)) * percent_full)
+    fillcolor_index = float(len(fill_color)) * percent_full
     fillcolor_index = max(0, int(round(fillcolor_index)) - 1)
     fillcolor_code = "|[" + fill_color[fillcolor_index]
-    
+
     # Make color codes for empty bar portion and text_color
     emptycolor_code = "|[" + empty_color
     textcolor_code = "|" + text_color
-    
+
     # Assemble the final bar
-    final_bar = fillcolor_code + textcolor_code + full_portion + "|n" + emptycolor_code + textcolor_code + empty_portion + "|n"
-    
+    final_bar = (
+        fillcolor_code
+        + textcolor_code
+        + full_portion
+        + "|n"
+        + emptycolor_code
+        + textcolor_code
+        + empty_portion
+        + "|n"
+    )
+
     return final_bar
diff --git a/evennia/contrib/ingame_python/callbackhandler.py b/evennia/contrib/ingame_python/callbackhandler.py
index 625bfa182b5..a7b020708a0 100644
--- a/evennia/contrib/ingame_python/callbackhandler.py
+++ b/evennia/contrib/ingame_python/callbackhandler.py
@@ -99,8 +99,11 @@ def add(self, callback_name, code, author=None, valid=False, parameters=""):
         """
         handler = type(self).script
         if handler:
-            return self.format_callback(handler.add_callback(self.obj, callback_name, code,
-                                                             author=author, valid=valid, parameters=parameters))
+            return self.format_callback(
+                handler.add_callback(
+                    self.obj, callback_name, code, author=author, valid=valid, parameters=parameters
+                )
+            )
 
     def edit(self, callback_name, number, code, author=None, valid=False):
         """
@@ -122,8 +125,11 @@ def edit(self, callback_name, number, code, author=None, valid=False):
         """
         handler = type(self).script
         if handler:
-            return self.format_callback(handler.edit_callback(self.obj, callback_name,
-                                                              number, code, author=author, valid=valid))
+            return self.format_callback(
+                handler.edit_callback(
+                    self.obj, callback_name, number, code, author=author, valid=valid
+                )
+            )
 
     def remove(self, callback_name, number):
         """
@@ -202,5 +208,18 @@ def format_callback(callback):
         return Callback(**callback)
 
 
-Callback = namedtuple("Callback", ("obj", "name", "number", "code", "author",
-                                   "valid", "parameters", "created_on", "updated_by", "updated_on"))
+Callback = namedtuple(
+    "Callback",
+    (
+        "obj",
+        "name",
+        "number",
+        "code",
+        "author",
+        "valid",
+        "parameters",
+        "created_on",
+        "updated_by",
+        "updated_on",
+    ),
+)
diff --git a/evennia/contrib/ingame_python/commands.py b/evennia/contrib/ingame_python/commands.py
index b1e01473b68..9fe57c88564 100644
--- a/evennia/contrib/ingame_python/commands.py
+++ b/evennia/contrib/ingame_python/commands.py
@@ -16,8 +16,7 @@
 
 # Permissions
 WITH_VALIDATION = getattr(settings, "callbackS_WITH_VALIDATION", None)
-WITHOUT_VALIDATION = getattr(settings, "callbackS_WITHOUT_VALIDATION",
-                             "developer")
+WITHOUT_VALIDATION = getattr(settings, "callbackS_WITHOUT_VALIDATION", "developer")
 VALIDATING = getattr(settings, "callbackS_VALIDATING", "developer")
 
 # Split help text
@@ -38,13 +37,9 @@
     "tasks  - show the list of differed tasks",
 ]
 
-VALIDATOR_USAGES = [
-    "@call/accept [object name = <callback name> [callback number]]",
-]
+VALIDATOR_USAGES = ["@call/accept [object name = <callback name> [callback number]]"]
 
-VALIDATOR_SWITCHES = [
-    "accept - show callbacks to be validated or accept one",
-]
+VALIDATOR_SWITCHES = ["accept - show callbacks to be validated or accept one"]
 
 BASIC_TEXT = """
 This command is used to manipulate callbacks.  A callback can be linked to
@@ -129,8 +124,7 @@ def func(self):
         caller = self.caller
         lock = "perm({}) or perm(events_validating)".format(VALIDATING)
         validator = caller.locks.check_lockstring(caller, lock)
-        lock = "perm({}) or perm(events_without_validation)".format(
-            WITHOUT_VALIDATION)
+        lock = "perm({}) or perm(events_without_validation)".format(WITHOUT_VALIDATION)
         autovalid = caller.locks.check_lockstring(caller, lock)
 
         # First and foremost, get the callback handler and set other variables
@@ -142,8 +136,7 @@ def func(self):
         self.is_validator = validator
         self.autovalid = autovalid
         if self.handler is None:
-            caller.msg("The event handler is not running, can't "
-                       "access the event system.")
+            caller.msg("The event handler is not running, can't " "access the event system.")
             return
 
         # Before the equal sign, there is an object name or nothing
@@ -171,8 +164,7 @@ def func(self):
         elif switch in ["tasks", "task"]:
             self.list_tasks()
         else:
-            caller.msg("Mutually exclusive or invalid switches were "
-                       "used, cannot proceed.")
+            caller.msg("Mutually exclusive or invalid switches were " "used, cannot proceed.")
 
     def list_callbacks(self):
         """Display the list of callbacks connected to the object."""
@@ -186,8 +178,7 @@ def list_callbacks(self):
             # Check that the callback name can be found in this object
             created = callbacks.get(callback_name)
             if created is None:
-                self.msg("No callback {} has been set on {}.".format(callback_name,
-                                                                     obj))
+                self.msg("No callback {} has been set on {}.".format(callback_name, obj))
                 return
 
             if parameters:
@@ -197,8 +188,11 @@ def list_callbacks(self):
                     assert number >= 0
                     callback = callbacks[callback_name][number]
                 except (ValueError, AssertionError, IndexError):
-                    self.msg("The callback {} {} cannot be found in {}.".format(
-                        callback_name, parameters, obj))
+                    self.msg(
+                        "The callback {} {} cannot be found in {}.".format(
+                            callback_name, parameters, obj
+                        )
+                    )
                     return
 
                 # Display the callback's details
@@ -207,9 +201,13 @@ def list_callbacks(self):
                 updated_by = callback.get("updated_by")
                 updated_by = updated_by.key if updated_by else "|gUnknown|n"
                 created_on = callback.get("created_on")
-                created_on = created_on.strftime("%Y-%m-%d %H:%M:%S") if created_on else "|gUnknown|n"
+                created_on = (
+                    created_on.strftime("%Y-%m-%d %H:%M:%S") if created_on else "|gUnknown|n"
+                )
                 updated_on = callback.get("updated_on")
-                updated_on = updated_on.strftime("%Y-%m-%d %H:%M:%S") if updated_on else "|gUnknown|n"
+                updated_on = (
+                    updated_on.strftime("%Y-%m-%d %H:%M:%S") if updated_on else "|gUnknown|n"
+                )
                 msg = "Callback {} {} of {}:".format(callback_name, parameters, obj)
                 msg += "\nCreated by {} on {}.".format(author, created_on)
                 msg += "\nUpdated by {} on {}".format(updated_by, updated_on)
@@ -241,9 +239,9 @@ def list_callbacks(self):
                     updated_on = callback.get("created_on")
 
                 if updated_on:
-                    updated_on = "{} ago".format(time_format(
-                        (now - updated_on).total_seconds(),
-                        4).capitalize())
+                    updated_on = "{} ago".format(
+                        time_format((now - updated_on).total_seconds(), 4).capitalize()
+                    )
                 else:
                     updated_on = "|gUnknown|n"
                 parameters = callback.get("parameters", "")
@@ -256,8 +254,7 @@ def list_callbacks(self):
             self.msg(str(table))
         else:
             names = list(set(list(types.keys()) + list(callbacks.keys())))
-            table = EvTable("Callback name", "Number", "Description",
-                            valign="t", width=78)
+            table = EvTable("Callback name", "Number", "Description", valign="t", width=78)
             table.reformat_column(0, width=20)
             table.reformat_column(1, width=10, align="r")
             table.reformat_column(2, width=48)
@@ -279,8 +276,10 @@ def add_callback(self):
 
         # Check that the callback exists
         if not callback_name.startswith("chain_") and callback_name not in types:
-            self.msg("The callback name {} can't be found in {} of "
-                     "typeclass {}.".format(callback_name, obj, type(obj)))
+            self.msg(
+                "The callback name {} can't be found in {} of "
+                "typeclass {}.".format(callback_name, obj, type(obj))
+            )
             return
 
         definition = types.get(callback_name, (None, "Chained event."))
@@ -288,17 +287,24 @@ def add_callback(self):
         self.msg(raw(description.strip("\n")))
 
         # Open the editor
-        callback = self.handler.add_callback(obj, callback_name, "",
-                                             self.caller, False, parameters=self.parameters)
+        callback = self.handler.add_callback(
+            obj, callback_name, "", self.caller, False, parameters=self.parameters
+        )
 
         # Lock this callback right away
         self.handler.db.locked.append((obj, callback_name, callback["number"]))
 
         # Open the editor for this callback
         self.caller.db._callback = callback
-        EvEditor(self.caller, loadfunc=_ev_load, savefunc=_ev_save,
-                 quitfunc=_ev_quit, key="Callback {} of {}".format(
-                     callback_name, obj), persistent=True, codefunc=_ev_save)
+        EvEditor(
+            self.caller,
+            loadfunc=_ev_load,
+            savefunc=_ev_save,
+            quitfunc=_ev_quit,
+            key="Callback {} of {}".format(callback_name, obj),
+            persistent=True,
+            codefunc=_ev_save,
+        )
 
     def edit_callback(self):
         """Edit a callback."""
@@ -315,8 +321,7 @@ def edit_callback(self):
 
         # Check that the callback exists
         if callback_name not in callbacks:
-            self.msg("The callback name {} can't be found in {}.".format(
-                callback_name, obj))
+            self.msg("The callback name {} can't be found in {}.".format(callback_name, obj))
             return
 
         # If there's only one callback, just edit it
@@ -335,8 +340,11 @@ def edit_callback(self):
                 assert number >= 0
                 callback = callbacks[callback_name][number]
             except (ValueError, AssertionError, IndexError):
-                self.msg("The callback {} {} cannot be found in {}.".format(
-                    callback_name, parameters, obj))
+                self.msg(
+                    "The callback {} {} cannot be found in {}.".format(
+                        callback_name, parameters, obj
+                    )
+                )
                 return
 
         # If caller can't edit without validation, forbid editing
@@ -360,9 +368,15 @@ def edit_callback(self):
         # Open the editor
         callback = dict(callback)
         self.caller.db._callback = callback
-        EvEditor(self.caller, loadfunc=_ev_load, savefunc=_ev_save,
-                 quitfunc=_ev_quit, key="Callback {} of {}".format(
-                     callback_name, obj), persistent=True, codefunc=_ev_save)
+        EvEditor(
+            self.caller,
+            loadfunc=_ev_load,
+            savefunc=_ev_save,
+            quitfunc=_ev_quit,
+            key="Callback {} of {}".format(callback_name, obj),
+            persistent=True,
+            codefunc=_ev_save,
+        )
 
     def del_callback(self):
         """Delete a callback."""
@@ -379,8 +393,7 @@ def del_callback(self):
 
         # Check that the callback exists
         if callback_name not in callbacks:
-            self.msg("The callback name {} can't be found in {}.".format(
-                callback_name, obj))
+            self.msg("The callback name {} can't be found in {}.".format(callback_name, obj))
             return
 
         # If there's only one callback, just delete it
@@ -389,8 +402,7 @@ def del_callback(self):
             callback = callbacks[callback_name][0]
         else:
             if not parameters:
-                self.msg("Which callback do you wish to delete?  Specify "
-                         "a number.")
+                self.msg("Which callback do you wish to delete?  Specify " "a number.")
                 self.list_callbacks()
                 return
 
@@ -400,8 +412,11 @@ def del_callback(self):
                 assert number >= 0
                 callback = callbacks[callback_name][number]
             except (ValueError, AssertionError, IndexError):
-                self.msg("The callback {} {} cannot be found in {}.".format(
-                    callback_name, parameters, obj))
+                self.msg(
+                    "The callback {} {} cannot be found in {}.".format(
+                        callback_name, parameters, obj
+                    )
+                )
                 return
 
         # If caller can't edit without validation, forbid deleting
@@ -417,8 +432,7 @@ def del_callback(self):
 
         # Delete the callback
         self.handler.del_callback(obj, callback_name, number)
-        self.msg("The callback {}[{}] of {} was deleted.".format(
-            callback_name, number + 1, obj))
+        self.msg("The callback {}[{}] of {} was deleted.".format(callback_name, number + 1, obj))
 
     def accept_callback(self):
         """Accept a callback."""
@@ -428,8 +442,7 @@ def accept_callback(self):
 
         # If no object, display the list of callbacks to be checked
         if obj is None:
-            table = EvTable("ID", "Type", "Object", "Name", "Updated by",
-                            "On", width=78)
+            table = EvTable("ID", "Type", "Object", "Name", "Updated by", "On", width=78)
             table.reformat_column(0, align="r")
             now = datetime.now()
             for obj, name, number in self.handler.db.to_valid:
@@ -450,9 +463,9 @@ def accept_callback(self):
                     updated_on = callback.get("created_on")
 
                 if updated_on:
-                    updated_on = "{} ago".format(time_format(
-                        (now - updated_on).total_seconds(),
-                        4).capitalize())
+                    updated_on = "{} ago".format(
+                        time_format((now - updated_on).total_seconds(), 4).capitalize()
+                    )
                 else:
                     updated_on = "|gUnknown|n"
 
@@ -471,8 +484,7 @@ def accept_callback(self):
 
         # Check that the callback exists
         if callback_name not in callbacks:
-            self.msg("The callback name {} can't be found in {}.".format(
-                callback_name, obj))
+            self.msg("The callback name {} can't be found in {}.".format(callback_name, obj))
             return
 
         if not parameters:
@@ -486,8 +498,9 @@ def accept_callback(self):
             assert number >= 0
             callback = callbacks[callback_name][number]
         except (ValueError, AssertionError, IndexError):
-            self.msg("The callback {} {} cannot be found in {}.".format(
-                callback_name, parameters, obj))
+            self.msg(
+                "The callback {} {} cannot be found in {}.".format(callback_name, parameters, obj)
+            )
             return
 
         # Accept the callback
@@ -495,8 +508,9 @@ def accept_callback(self):
             self.msg("This callback has already been accepted.")
         else:
             self.handler.accept_callback(obj, callback_name, number)
-            self.msg("The callback {} {} of {} has been accepted.".format(
-                callback_name, parameters, obj))
+            self.msg(
+                "The callback {} {} of {} has been accepted.".format(callback_name, parameters, obj)
+            )
 
     def list_tasks(self):
         """List the active tasks."""
@@ -520,6 +534,7 @@ def list_tasks(self):
 
         self.msg(str(table))
 
+
 # Private functions to handle editing
 
 
@@ -529,36 +544,40 @@ def _ev_load(caller):
 
 def _ev_save(caller, buf):
     """Save and add the callback."""
-    lock = "perm({}) or perm(events_without_validation)".format(
-        WITHOUT_VALIDATION)
+    lock = "perm({}) or perm(events_without_validation)".format(WITHOUT_VALIDATION)
     autovalid = caller.locks.check_lockstring(caller, lock)
     callback = caller.db._callback
     handler = get_event_handler()
-    if not handler or not callback or not all(key in callback for key in
-                                              ("obj", "name", "number", "valid")):
+    if (
+        not handler
+        or not callback
+        or not all(key in callback for key in ("obj", "name", "number", "valid"))
+    ):
         caller.msg("Couldn't save this callback.")
         return False
 
     if (callback["obj"], callback["name"], callback["number"]) in handler.db.locked:
-        handler.db.locked.remove((callback["obj"], callback["name"],
-                                  callback["number"]))
+        handler.db.locked.remove((callback["obj"], callback["name"], callback["number"]))
 
-    handler.edit_callback(callback["obj"], callback["name"], callback["number"], buf,
-                          caller, valid=autovalid)
+    handler.edit_callback(
+        callback["obj"], callback["name"], callback["number"], buf, caller, valid=autovalid
+    )
     return True
 
 
 def _ev_quit(caller):
     callback = caller.db._callback
     handler = get_event_handler()
-    if not handler or not callback or not all(key in callback for key in
-                                              ("obj", "name", "number", "valid")):
+    if (
+        not handler
+        or not callback
+        or not all(key in callback for key in ("obj", "name", "number", "valid"))
+    ):
         caller.msg("Couldn't save this callback.")
         return False
 
     if (callback["obj"], callback["name"], callback["number"]) in handler.db.locked:
-        handler.db.locked.remove((callback["obj"], callback["name"],
-                                  callback["number"]))
+        handler.db.locked.remove((callback["obj"], callback["name"], callback["number"]))
 
     del caller.db._callback
     caller.msg("Exited the code editor.")
diff --git a/evennia/contrib/ingame_python/scripts.py b/evennia/contrib/ingame_python/scripts.py
index d0706db2e66..5c916002628 100644
--- a/evennia/contrib/ingame_python/scripts.py
+++ b/evennia/contrib/ingame_python/scripts.py
@@ -87,6 +87,7 @@ def at_start(self):
 
         # Place the script in the CallbackHandler
         from evennia.contrib.ingame_python import typeclasses
+
         CallbackHandler.script = self
         DefaultObject.callbacks = typeclasses.EventObject.callbacks
 
@@ -94,8 +95,11 @@ def at_start(self):
         try:
             self.ndb.channel = ChannelDB.objects.get(db_key="everror")
         except ChannelDB.DoesNotExist:
-            self.ndb.channel = create_channel("everror", desc="Event errors",
-                                              locks="control:false();listen:perm(Builders);send:false()")
+            self.ndb.channel = create_channel(
+                "everror",
+                desc="Event errors",
+                locks="control:false();listen:perm(Builders);send:false()",
+            )
 
     def get_events(self, obj):
         """
@@ -200,8 +204,7 @@ def get_callbacks(self, obj):
 
         return callbacks
 
-    def add_callback(self, obj, callback_name, code, author=None, valid=False,
-                     parameters=""):
+    def add_callback(self, obj, callback_name, code, author=None, valid=False, parameters=""):
         """
         Add the specified callback.
 
@@ -228,21 +231,22 @@ def add_callback(self, obj, callback_name, code, author=None, valid=False,
             callbacks = obj_callbacks[callback_name]
 
         # Add the callback in the list
-        callbacks.append({
-            "created_on": datetime.now(),
-            "author": author,
-            "valid": valid,
-            "code": code,
-            "parameters": parameters,
-        })
+        callbacks.append(
+            {
+                "created_on": datetime.now(),
+                "author": author,
+                "valid": valid,
+                "code": code,
+                "parameters": parameters,
+            }
+        )
 
         # If not valid, set it in 'to_valid'
         if not valid:
             self.db.to_valid.append((obj, callback_name, len(callbacks) - 1))
 
         # Call the custom_add if needed
-        custom_add = self.get_events(obj).get(
-            callback_name, [None, None, None, None])[3]
+        custom_add = self.get_events(obj).get(callback_name, [None, None, None, None])[3]
         if custom_add:
             custom_add(obj, callback_name, len(callbacks) - 1, parameters)
 
@@ -253,8 +257,7 @@ def add_callback(self, obj, callback_name, code, author=None, valid=False,
         definition["number"] = len(callbacks) - 1
         return definition
 
-    def edit_callback(self, obj, callback_name, number, code, author=None,
-                      valid=False):
+    def edit_callback(self, obj, callback_name, number, code, author=None, valid=False):
         """
         Edit the specified callback.
 
@@ -288,12 +291,9 @@ def edit_callback(self, obj, callback_name, number, code, author=None,
             raise RuntimeError("this callback is locked.")
 
         # Edit the callback
-        callbacks[number].update({
-            "updated_on": datetime.now(),
-            "updated_by": author,
-            "valid": valid,
-            "code": code,
-        })
+        callbacks[number].update(
+            {"updated_on": datetime.now(), "updated_by": author, "valid": valid, "code": code}
+        )
 
         # If not valid, set it in 'to_valid'
         if not valid and (obj, callback_name, number) not in self.db.to_valid:
@@ -334,8 +334,9 @@ def del_callback(self, obj, callback_name, number):
         except IndexError:
             return
         else:
-            logger.log_info("Deleting callback {} {} of {}:\n{}".format(
-                callback_name, number, obj, code))
+            logger.log_info(
+                "Deleting callback {} {} of {}:\n{}".format(callback_name, number, obj, code)
+            )
             del callbacks[number]
 
         # Change IDs of callbacks to be validated
@@ -349,8 +350,7 @@ def del_callback(self, obj, callback_name, number):
                     i -= 1
                 elif t_number > number:
                     # Change the ID for this callback
-                    self.db.to_valid.insert(i, (t_obj, t_callback_name,
-                                                t_number - 1))
+                    self.db.to_valid.insert(i, (t_obj, t_callback_name, t_number - 1))
                     del self.db.to_valid[i + 1]
             i += 1
 
@@ -415,13 +415,16 @@ def call(self, obj, callback_name, *args, **kwargs):
         # Errors should not pass silently
         allowed = ("number", "parameters", "locals")
         if any(k for k in kwargs if k not in allowed):
-            raise TypeError("Unknown keyword arguments were specified "
-                            "to call callbacks: {}".format(kwargs))
+            raise TypeError(
+                "Unknown keyword arguments were specified " "to call callbacks: {}".format(kwargs)
+            )
 
         event = self.get_events(obj).get(callback_name)
         if locals is None and not event:
-            logger.log_err("The callback {} for the object {} (typeclass "
-                           "{}) can't be found".format(callback_name, obj, type(obj)))
+            logger.log_err(
+                "The callback {} for the object {} (typeclass "
+                "{}) can't be found".format(callback_name, obj, type(obj))
+            )
             return False
 
         # Prepare the locals if necessary
@@ -431,9 +434,10 @@ def call(self, obj, callback_name, *args, **kwargs):
                 try:
                     locals[variable] = args[i]
                 except IndexError:
-                    logger.log_trace("callback {} of {} ({}): need variable "
-                                     "{} in position {}".format(callback_name, obj,
-                                                                type(obj), variable, i))
+                    logger.log_trace(
+                        "callback {} of {} ({}): need variable "
+                        "{} in position {}".format(callback_name, obj, type(obj), variable, i)
+                    )
                     return False
         else:
             locals = {key: value for key, value in locals.items()}
@@ -483,9 +487,10 @@ def handle_error(self, callback, trace):
         number = callback["number"]
         obj = callback["obj"]
         oid = obj.id
-        logger.log_err("An error occurred during the callback {} of "
-                       "{} (#{}), number {}\n{}".format(callback_name, obj,
-                                                        oid, number + 1, "\n".join(trace)))
+        logger.log_err(
+            "An error occurred during the callback {} of "
+            "{} (#{}), number {}\n{}".format(callback_name, obj, oid, number + 1, "\n".join(trace))
+        )
 
         # Create the error message
         line = "|runknown|n"
@@ -505,9 +510,9 @@ def handle_error(self, callback, trace):
                         break
 
         exc = raw(trace[-1].strip("\n").splitlines()[-1])
-        err_msg = "Error in {} of {} (#{})[{}], line {}:" \
-            " {}\n{}".format(callback_name, obj,
-                             oid, number + 1, lineno, line, exc)
+        err_msg = "Error in {} of {} (#{})[{}], line {}:" " {}\n{}".format(
+            callback_name, obj, oid, number + 1, lineno, line, exc
+        )
 
         # Inform the last updater if connected
         updater = callback.get("updated_by")
@@ -517,9 +522,9 @@ def handle_error(self, callback, trace):
         if updater and updater.sessions.all():
             updater.msg(err_msg)
         else:
-            err_msg = "Error in {} of {} (#{})[{}], line {}:" \
-                " {}\n          {}".format(callback_name, obj,
-                                           oid, number + 1, lineno, line, exc)
+            err_msg = "Error in {} of {} (#{})[{}], line {}:" " {}\n          {}".format(
+                callback_name, obj, oid, number + 1, lineno, line, exc
+            )
             self.ndb.channel.msg(err_msg)
 
     def add_event(self, typeclass, name, variables, help_text, custom_call, custom_add):
@@ -656,8 +661,7 @@ def complete_task(task_id):
         return
 
     if task_id not in script.db.tasks:
-        logger.log_err("The task #{} was scheduled, but it cannot be "
-                       "found".format(task_id))
+        logger.log_err("The task #{} was scheduled, but it cannot be " "found".format(task_id))
         return
 
     delta, obj, callback_name, locals = script.db.tasks.pop(task_id)
diff --git a/evennia/contrib/ingame_python/tests.py b/evennia/contrib/ingame_python/tests.py
index a67be7de8a1..f1304c94100 100644
--- a/evennia/contrib/ingame_python/tests.py
+++ b/evennia/contrib/ingame_python/tests.py
@@ -31,8 +31,7 @@ class TestEventHandler(EvenniaTest):
     def setUp(self):
         """Create the event handler."""
         super().setUp()
-        self.handler = create_script(
-            "evennia.contrib.ingame_python.scripts.EventHandler")
+        self.handler = create_script("evennia.contrib.ingame_python.scripts.EventHandler")
 
         # Copy old events if necessary
         if OLD_EVENTS:
@@ -64,8 +63,9 @@ def test_start(self):
     def test_add_validation(self):
         """Add a callback while needing validation."""
         author = self.char1
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 40", author=author, valid=False)
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 40", author=author, valid=False
+        )
         callback = self.handler.get_callbacks(self.room1).get("dummy")
         callback = callback[0]
         self.assertIsNotNone(callback)
@@ -78,19 +78,20 @@ def test_add_validation(self):
         # Run this dummy callback (shouldn't do anything)
         self.char1.db.strength = 10
         locals = {"character": self.char1}
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals=locals))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals=locals))
         self.assertEqual(self.char1.db.strength, 10)
 
     def test_edit(self):
         """Test editing a callback."""
         author = self.char1
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 60", author=author, valid=True)
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 60", author=author, valid=True
+        )
 
         # Edit it right away
-        self.handler.edit_callback(self.room1, "dummy", 0,
-                                   "character.db.strength = 65", author=self.char2, valid=True)
+        self.handler.edit_callback(
+            self.room1, "dummy", 0, "character.db.strength = 65", author=self.char2, valid=True
+        )
 
         # Check that the callback was written
         callback = self.handler.get_callbacks(self.room1).get("dummy")
@@ -103,36 +104,39 @@ def test_edit(self):
         # Run this dummy callback
         self.char1.db.strength = 10
         locals = {"character": self.char1}
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals=locals))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals=locals))
         self.assertEqual(self.char1.db.strength, 65)
 
     def test_edit_validation(self):
         """Edit a callback when validation isn't automatic."""
         author = self.char1
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 70", author=author, valid=True)
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 70", author=author, valid=True
+        )
 
         # Edit it right away
-        self.handler.edit_callback(self.room1, "dummy", 0,
-                                   "character.db.strength = 80", author=self.char2, valid=False)
+        self.handler.edit_callback(
+            self.room1, "dummy", 0, "character.db.strength = 80", author=self.char2, valid=False
+        )
 
         # Run this dummy callback (shouldn't do anything)
         self.char1.db.strength = 10
         locals = {"character": self.char1}
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals=locals))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals=locals))
         self.assertEqual(self.char1.db.strength, 10)
 
     def test_del(self):
         """Try to delete a callback."""
         # Add 3 callbacks
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 5", author=self.char1, valid=True)
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 8", author=self.char2, valid=False)
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 9", author=self.char1, valid=True)
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 5", author=self.char1, valid=True
+        )
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 8", author=self.char2, valid=False
+        )
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 9", author=self.char1, valid=True
+        )
 
         # Note that the second callback isn't valid
         self.assertIn((self.room1, "dummy", 1), self.handler.db.to_valid)
@@ -160,17 +164,18 @@ def test_del(self):
         # Call the remaining callback
         self.char1.db.strength = 10
         locals = {"character": self.char1}
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals=locals))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals=locals))
         self.assertEqual(self.char1.db.strength, 9)
 
     def test_accept(self):
         """Accept an callback."""
         # Add 2 callbacks
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 5", author=self.char1, valid=True)
-        self.handler.add_callback(self.room1, "dummy",
-                                  "character.db.strength = 8", author=self.char2, valid=False)
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 5", author=self.char1, valid=True
+        )
+        self.handler.add_callback(
+            self.room1, "dummy", "character.db.strength = 8", author=self.char2, valid=False
+        )
 
         # Note that the second callback isn't valid
         self.assertIn((self.room1, "dummy", 1), self.handler.db.to_valid)
@@ -185,8 +190,7 @@ def test_accept(self):
         # Call the dummy callback
         self.char1.db.strength = 10
         locals = {"character": self.char1}
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals=locals))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals=locals))
         self.assertEqual(self.char1.db.strength, 8)
 
     def test_call(self):
@@ -195,21 +199,22 @@ def test_call(self):
         self.char2.key = "two"
 
         # Add an callback
-        code = dedent("""
+        code = dedent(
+            """
             if character.key == "one":
                 character.db.health = 50
             else:
                 character.db.health = 0
-        """.strip("\n"))
-        self.handler.add_callback(self.room1, "dummy", code,
-                                  author=self.char1, valid=True)
+        """.strip(
+                "\n"
+            )
+        )
+        self.handler.add_callback(self.room1, "dummy", code, author=self.char1, valid=True)
 
         # Call the dummy callback
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals={"character": self.char1}))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals={"character": self.char1}))
         self.assertEqual(self.char1.db.health, 50)
-        self.assertTrue(self.handler.call(
-            self.room1, "dummy", locals={"character": self.char2}))
+        self.assertTrue(self.handler.call(self.room1, "dummy", locals={"character": self.char2}))
         self.assertEqual(self.char2.db.health, 0)
 
     def test_handler(self):
@@ -217,8 +222,7 @@ def test_handler(self):
         self.assertIsNotNone(self.char1.callbacks)
 
         # Add an callback
-        callback = self.room1.callbacks.add("dummy", "pass", author=self.char1,
-                                            valid=True)
+        callback = self.room1.callbacks.add("dummy", "pass", author=self.char1, valid=True)
         self.assertEqual(callback.obj, self.room1)
         self.assertEqual(callback.name, "dummy")
         self.assertEqual(callback.code, "pass")
@@ -227,14 +231,14 @@ def test_handler(self):
         self.assertIn([callback], list(self.room1.callbacks.all().values()))
 
         # Edit this very callback
-        new = self.room1.callbacks.edit("dummy", 0, "character.db.say = True",
-                                        author=self.char1, valid=True)
+        new = self.room1.callbacks.edit(
+            "dummy", 0, "character.db.say = True", author=self.char1, valid=True
+        )
         self.assertIn([new], list(self.room1.callbacks.all().values()))
         self.assertNotIn([callback], list(self.room1.callbacks.all().values()))
 
         # Try to call this callback
-        self.assertTrue(self.room1.callbacks.call("dummy",
-                                                  locals={"character": self.char2}))
+        self.assertTrue(self.room1.callbacks.call("dummy", locals={"character": self.char2}))
         self.assertTrue(self.char2.db.say)
 
         # Delete the callback
@@ -249,8 +253,7 @@ class TestCmdCallback(CommandTest):
     def setUp(self):
         """Create the callback handler."""
         super().setUp()
-        self.handler = create_script(
-            "evennia.contrib.ingame_python.scripts.EventHandler")
+        self.handler = create_script("evennia.contrib.ingame_python.scripts.EventHandler")
 
         # Copy old events if necessary
         if OLD_EVENTS:
@@ -269,7 +272,8 @@ def tearDown(self):
         OLD_EVENTS.update(self.handler.ndb.events)
         self.handler.stop()
         for script in ScriptDB.objects.filter(
-                db_typeclass_path="evennia.contrib.ingame_python.scripts.TimeEventScript"):
+            db_typeclass_path="evennia.contrib.ingame_python.scripts.TimeEventScript"
+        ):
             script.stop()
 
         CallbackHandler.script = None
@@ -287,8 +291,7 @@ def test_list(self):
             self.assertIn(cols[2].strip(), ("0 (0)", ""))
 
         # Add some callback
-        self.handler.add_callback(self.exit, "traverse", "pass",
-                                  author=self.char1, valid=True)
+        self.handler.add_callback(self.exit, "traverse", "pass", author=self.char1, valid=True)
 
         # Try to obtain more details on a specific callback on exit
         table = self.call(CmdCallback(), "out = traverse")
@@ -322,13 +325,19 @@ def test_add(self):
         self.assertIsNotNone(editor)
 
         # Edit the callback
-        editor.update_buffer(dedent("""
+        editor.update_buffer(
+            dedent(
+                """
             if character.key == "one":
                 character.msg("You can pass.")
             else:
                 character.msg("You can't pass.")
                 deny()
-        """.strip("\n")))
+        """.strip(
+                    "\n"
+                )
+            )
+        )
         editor.save_buffer()
         editor.quit()
         callback = self.exit.callbacks.get("traverse")[0]
@@ -343,9 +352,15 @@ def test_add(self):
         self.assertIsNotNone(editor)
 
         # Edit the callback
-        editor.update_buffer(dedent("""
+        editor.update_buffer(
+            dedent(
+                """
             character.msg("No way.")
-        """.strip("\n")))
+        """.strip(
+                    "\n"
+                )
+            )
+        )
         editor.save_buffer()
         editor.quit()
         callback = self.exit.callbacks.get("traverse")[1]
@@ -355,19 +370,16 @@ def test_add(self):
 
     def test_del(self):
         """Add and remove an callback."""
-        self.handler.add_callback(self.exit, "traverse", "pass",
-                                  author=self.char1, valid=True)
+        self.handler.add_callback(self.exit, "traverse", "pass", author=self.char1, valid=True)
 
         # Try to delete the callback
         # char2 shouldn't be allowed to do so (that's not HIS callback)
         self.call(CmdCallback(), "/del out = traverse 1", caller=self.char2)
-        self.assertTrue(len(self.handler.get_callbacks(self.exit).get(
-            "traverse", [])) == 1)
+        self.assertTrue(len(self.handler.get_callbacks(self.exit).get("traverse", [])) == 1)
 
         # Now, char1 should be allowed to delete it
         self.call(CmdCallback(), "/del out = traverse 1")
-        self.assertTrue(len(self.handler.get_callbacks(self.exit).get(
-            "traverse", [])) == 0)
+        self.assertTrue(len(self.handler.get_callbacks(self.exit).get("traverse", [])) == 0)
 
     def test_lock(self):
         """Test the lock of multiple editing."""
@@ -388,9 +400,15 @@ def test_accept(self):
         self.assertIsNotNone(editor)
 
         # Edit the callback
-        editor.update_buffer(dedent("""
+        editor.update_buffer(
+            dedent(
+                """
             room.msg_contents("It's 8 PM, everybody up!")
-        """.strip("\n")))
+        """.strip(
+                    "\n"
+                )
+            )
+        )
         editor.save_buffer()
         editor.quit()
         callback = self.room1.callbacks.get("time")[0]
@@ -414,8 +432,7 @@ class TestDefaultCallbacks(CommandTest):
     def setUp(self):
         """Create the callback handler."""
         super().setUp()
-        self.handler = create_script(
-            "evennia.contrib.ingame_python.scripts.EventHandler")
+        self.handler = create_script("evennia.contrib.ingame_python.scripts.EventHandler")
 
         # Copy old events if necessary
         if OLD_EVENTS:
@@ -439,33 +456,36 @@ def tearDown(self):
     def test_exit(self):
         """Test the callbacks of an exit."""
         self.char1.key = "char1"
-        code = dedent("""
+        code = dedent(
+            """
             if character.key == "char1":
                 character.msg("You can leave.")
             else:
                 character.msg("You cannot leave.")
                 deny()
-        """.strip("\n"))
+        """.strip(
+                "\n"
+            )
+        )
         # Enforce self.exit.destination since swapping typeclass lose it
         self.exit.destination = self.room2
 
         # Try the can_traverse callback
-        self.handler.add_callback(self.exit, "can_traverse", code,
-                                  author=self.char1, valid=True)
+        self.handler.add_callback(self.exit, "can_traverse", code, author=self.char1, valid=True)
 
         # Have char1 move through the exit
         self.call(ExitCommand(), "", "You can leave.", obj=self.exit)
         self.assertIs(self.char1.location, self.room2)
 
         # Have char2 move through this exit
-        self.call(ExitCommand(), "", "You cannot leave.", obj=self.exit,
-                  caller=self.char2)
+        self.call(ExitCommand(), "", "You cannot leave.", obj=self.exit, caller=self.char2)
         self.assertIs(self.char2.location, self.room1)
 
         # Try the traverse callback
         self.handler.del_callback(self.exit, "can_traverse", 0)
-        self.handler.add_callback(self.exit, "traverse", "character.msg('Fine!')",
-                                  author=self.char1, valid=True)
+        self.handler.add_callback(
+            self.exit, "traverse", "character.msg('Fine!')", author=self.char1, valid=True
+        )
 
         # Have char2 move through the exit
         self.call(ExitCommand(), "", obj=self.exit, caller=self.char2)
@@ -478,16 +498,17 @@ def test_exit(self):
 
         # Test msg_arrive and msg_leave
         code = 'message = "{character} goes out."'
-        self.handler.add_callback(self.exit, "msg_leave", code,
-                                  author=self.char1, valid=True)
+        self.handler.add_callback(self.exit, "msg_leave", code, author=self.char1, valid=True)
 
         # Have char1 move through the exit
         old_msg = self.char2.msg
         try:
             self.char2.msg = Mock()
             self.call(ExitCommand(), "", obj=self.exit)
-            stored_msg = [args[0] if args and args[0] else kwargs.get("text", utils.to_str(kwargs))
-                          for name, args, kwargs in self.char2.msg.mock_calls]
+            stored_msg = [
+                args[0] if args and args[0] else kwargs.get("text", utils.to_str(kwargs))
+                for name, args, kwargs in self.char2.msg.mock_calls
+            ]
             # Get the first element of a tuple if msg received a tuple instead of a string
             stored_msg = [smsg[0] if isinstance(smsg, tuple) else smsg for smsg in stored_msg]
             returned_msg = ansi.parse_ansi("\n".join(stored_msg), strip_ansi=True)
@@ -496,19 +517,24 @@ def test_exit(self):
             self.char2.msg = old_msg
 
         # Create a return exit
-        back = create_object("evennia.objects.objects.DefaultExit",
-                             key="in", location=self.room2, destination=self.room1)
+        back = create_object(
+            "evennia.objects.objects.DefaultExit",
+            key="in",
+            location=self.room2,
+            destination=self.room1,
+        )
         code = 'message = "{character} goes in."'
-        self.handler.add_callback(self.exit, "msg_arrive", code,
-                                  author=self.char1, valid=True)
+        self.handler.add_callback(self.exit, "msg_arrive", code, author=self.char1, valid=True)
 
         # Have char1 move through the exit
         old_msg = self.char2.msg
         try:
             self.char2.msg = Mock()
             self.call(ExitCommand(), "", obj=back)
-            stored_msg = [args[0] if args and args[0] else kwargs.get("text", utils.to_str(kwargs))
-                          for name, args, kwargs in self.char2.msg.mock_calls]
+            stored_msg = [
+                args[0] if args and args[0] else kwargs.get("text", utils.to_str(kwargs))
+                for name, args, kwargs in self.char2.msg.mock_calls
+            ]
             # Get the first element of a tuple if msg received a tuple instead of a string
             stored_msg = [smsg[0] if isinstance(smsg, tuple) else smsg for smsg in stored_msg]
             returned_msg = ansi.parse_ansi("\n".join(stored_msg), strip_ansi=True)
diff --git a/evennia/contrib/ingame_python/typeclasses.py b/evennia/contrib/ingame_python/typeclasses.py
index ca4d71b4364..6c3d2036fbe 100644
--- a/evennia/contrib/ingame_python/typeclasses.py
+++ b/evennia/contrib/ingame_python/typeclasses.py
@@ -212,15 +212,16 @@ def announce_move_from(self, destination, msg=None, mapping=None):
 
         # Get the exit from location to destination
         location = self.location
-        exits = [o for o in location.contents if o.location is location and o.destination is destination]
+        exits = [
+            o for o in location.contents if o.location is location and o.destination is destination
+        ]
         mapping = mapping or {}
-        mapping.update({
-            "character": self,
-        })
+        mapping.update({"character": self})
 
         if exits:
-            exits[0].callbacks.call("msg_leave", self, exits[0],
-                                    location, destination, string, mapping)
+            exits[0].callbacks.call(
+                "msg_leave", self, exits[0], location, destination, string, mapping
+            )
             string = exits[0].callbacks.get_variable("message")
             mapping = exits[0].callbacks.get_variable("mapping")
 
@@ -267,15 +268,18 @@ def announce_move_to(self, source_location, msg=None, mapping=None):
         destination = self.location
         exits = []
         mapping = mapping or {}
-        mapping.update({
-            "character": self,
-        })
+        mapping.update({"character": self})
 
         if origin:
-            exits = [o for o in destination.contents if o.location is destination and o.destination is origin]
+            exits = [
+                o
+                for o in destination.contents
+                if o.location is destination and o.destination is origin
+            ]
             if exits:
-                exits[0].callbacks.call("msg_arrive", self, exits[0],
-                                        origin, destination, string, mapping)
+                exits[0].callbacks.call(
+                    "msg_arrive", self, exits[0], origin, destination, string, mapping
+                )
                 string = exits[0].callbacks.get_variable("message")
                 mapping = exits[0].callbacks.get_variable("mapping")
 
@@ -305,14 +309,16 @@ def at_before_move(self, destination):
         origin = self.location
         Room = DefaultRoom
         if isinstance(origin, Room) and isinstance(destination, Room):
-            can = self.callbacks.call("can_move", self,
-                                      origin, destination)
+            can = self.callbacks.call("can_move", self, origin, destination)
             if can:
                 can = origin.callbacks.call("can_move", self, origin)
                 if can:
                     # Call other character's 'can_part' event
-                    for present in [o for o in origin.contents if isinstance(
-                            o, DefaultCharacter) and o is not self]:
+                    for present in [
+                        o
+                        for o in origin.contents
+                        if isinstance(o, DefaultCharacter) and o is not self
+                    ]:
                         can = present.callbacks.call("can_part", present, self)
                         if not can:
                             break
@@ -344,8 +350,9 @@ def at_after_move(self, source_location):
             destination.callbacks.call("move", self, origin, destination)
 
             # Call the 'greet' event of characters in the location
-            for present in [o for o in destination.contents if isinstance(
-                    o, DefaultCharacter) and o is not self]:
+            for present in [
+                o for o in destination.contents if isinstance(o, DefaultCharacter) and o is not self
+            ]:
                 present.callbacks.call("greet", present, self)
 
     def at_object_delete(self):
@@ -427,7 +434,11 @@ def at_before_say(self, message, **kwargs):
         """
         # First, try the location
         location = getattr(self, "location", None)
-        location = location if location and inherits_from(location, "evennia.objects.objects.DefaultRoom") else None
+        location = (
+            location
+            if location and inherits_from(location, "evennia.objects.objects.DefaultRoom")
+            else None
+        )
         if location and not kwargs.get("whisper", False):
             allow = location.callbacks.call("can_say", self, location, message, parameters=message)
             message = location.callbacks.get_variable("message")
@@ -436,7 +447,9 @@ def at_before_say(self, message, **kwargs):
 
             # Browse all the room's other characters
             for obj in location.contents:
-                if obj is self or not inherits_from(obj, "evennia.objects.objects.DefaultCharacter"):
+                if obj is self or not inherits_from(
+                    obj, "evennia.objects.objects.DefaultCharacter"
+                ):
                     continue
 
                 allow = obj.callbacks.call("can_say", self, obj, message, parameters=message)
@@ -490,14 +503,22 @@ def at_say(self, message, **kwargs):
 
         super().at_say(message, **kwargs)
         location = getattr(self, "location", None)
-        location = location if location and inherits_from(location, "evennia.objects.objects.DefaultRoom") else None
+        location = (
+            location
+            if location and inherits_from(location, "evennia.objects.objects.DefaultRoom")
+            else None
+        )
 
         if location and not kwargs.get("whisper", False):
-            location.callbacks.call("say", self, location, message,
-                  parameters=message)
+            location.callbacks.call("say", self, location, message, parameters=message)
 
             # Call the other characters' "say" event
-            presents = [obj for obj in location.contents if obj is not self and inherits_from(obj, "evennia.objects.objects.DefaultCharacter")]
+            presents = [
+                obj
+                for obj in location.contents
+                if obj is not self
+                and inherits_from(obj, "evennia.objects.objects.DefaultCharacter")
+            ]
             for present in presents:
                 present.callbacks.call("say", self, present, message, parameters=message)
 
@@ -602,8 +623,14 @@ class EventExit(DefaultExit):
 
     _events = {
         "can_traverse": (["character", "exit", "room"], EXIT_CAN_TRAVERSE),
-        "msg_arrive": (["character", "exit", "origin", "destination", "message", "mapping"], EXIT_MSG_ARRIVE),
-        "msg_leave": (["character", "exit", "origin", "destination", "message", "mapping"], EXIT_MSG_LEAVE),
+        "msg_arrive": (
+            ["character", "exit", "origin", "destination", "message", "mapping"],
+            EXIT_MSG_ARRIVE,
+        ),
+        "msg_leave": (
+            ["character", "exit", "origin", "destination", "message", "mapping"],
+            EXIT_MSG_LEAVE,
+        ),
         "time": (["exit"], EXIT_TIME, None, time_event),
         "traverse": (["character", "exit", "origin", "destination"], EXIT_TRAVERSE),
     }
@@ -630,8 +657,7 @@ def at_traverse(self, traversing_object, target_location):
         """
         is_character = inherits_from(traversing_object, DefaultCharacter)
         if is_character:
-            allow = self.callbacks.call("can_traverse", traversing_object,
-                                        self, self.location)
+            allow = self.callbacks.call("can_traverse", traversing_object, self, self.location)
             if not allow:
                 return
 
@@ -639,8 +665,9 @@ def at_traverse(self, traversing_object, target_location):
 
         # After traversing
         if is_character:
-            self.callbacks.call("traverse", traversing_object,
-                                self, self.location, self.destination)
+            self.callbacks.call(
+                "traverse", traversing_object, self, self.location, self.destination
+            )
 
 
 # Object help
diff --git a/evennia/contrib/ingame_python/utils.py b/evennia/contrib/ingame_python/utils.py
index fde97baaad8..e011593e6eb 100644
--- a/evennia/contrib/ingame_python/utils.py
+++ b/evennia/contrib/ingame_python/utils.py
@@ -85,6 +85,7 @@ class containing events, or the class itself.
 
     return typeclass
 
+
 # Custom callbacks for specific event types
 
 
@@ -108,8 +109,10 @@ def get_next_wait(format):
     """
     calendar = getattr(settings, "EVENTS_CALENDAR", None)
     if calendar is None:
-        logger.log_err("A time-related event has been set whereas "
-                       "the gametime calendar has not been set in the settings.")
+        logger.log_err(
+            "A time-related event has been set whereas "
+            "the gametime calendar has not been set in the settings."
+        )
         return
     elif calendar == "standard":
         rsu = standard_rsu
@@ -135,8 +138,9 @@ def get_next_wait(format):
             break
 
         if not piece.isdigit():
-            logger.log_trace("The time specified '{}' in {} isn't "
-                             "a valid number".format(piece, format))
+            logger.log_trace(
+                "The time specified '{}' in {} isn't " "a valid number".format(piece, format)
+            )
             return
 
         # Convert the piece to int
@@ -171,7 +175,9 @@ def time_event(obj, event_name, number, parameters):
 
     """
     seconds, usual, key = get_next_wait(parameters)
-    script = create_script("evennia.contrib.ingame_python.scripts.TimeEventScript", interval=seconds, obj=obj)
+    script = create_script(
+        "evennia.contrib.ingame_python.scripts.TimeEventScript", interval=seconds, obj=obj
+    )
     script.key = key
     script.desc = "event on {}".format(key)
     script.db.time_format = parameters
diff --git a/evennia/contrib/mail.py b/evennia/contrib/mail.py
index 9c458b8419a..490fba81f5d 100644
--- a/evennia/contrib/mail.py
+++ b/evennia/contrib/mail.py
@@ -80,6 +80,7 @@ class CmdMail(default_cmds.MuxAccountCommand):
       @mail/reply 9=Thanks for the info!
 
     """
+
     key = "@mail"
     aliases = ["mail"]
     lock = "cmd:all()"
@@ -87,13 +88,14 @@ class CmdMail(default_cmds.MuxAccountCommand):
 
     def parse(self):
         """
-        Add convenience check to know if caller is an Account or not since this cmd 
+        Add convenience check to know if caller is an Account or not since this cmd
         will be able to add to either Object- or Account level.
 
         """
         super().parse()
-        self.caller_is_account = bool(inherits_from(self.caller,
-                                                    "evennia.accounts.accounts.DefaultAccount"))
+        self.caller_is_account = bool(
+            inherits_from(self.caller, "evennia.accounts.accounts.DefaultAccount")
+        )
 
     def search_targets(self, namelist):
         """
@@ -143,9 +145,9 @@ def send_mail(self, recipients, subject, message, caller):
         """
         for recipient in recipients:
             recipient.msg("You have received a new @mail from %s" % caller)
-            new_message = create.create_message(self.caller, message,
-                                                receivers=recipient,
-                                                header=subject)
+            new_message = create.create_message(
+                self.caller, message, receivers=recipient, header=subject
+            )
             new_message.tags.add("new", category="mail")
 
         if recipients:
@@ -176,7 +178,7 @@ def func(self):
                         if all_mail[mind]:
                             mail = all_mail[mind]
                             question = "Delete message {} ({}) [Y]/N?".format(mind + 1, mail.header)
-                            ret = yield(question)
+                            ret = yield (question)
                             # handle not ret, it will be None during unit testing
                             if not ret or ret.strip().upper() not in ("N", "No"):
                                 all_mail[mind].delete()
@@ -192,8 +194,9 @@ def func(self):
             elif "forward" in self.switches or "fwd" in self.switches:
                 try:
                     if not self.rhs:
-                        self.caller.msg("Cannot forward a message without a target list. "
-                                        "Please try again.")
+                        self.caller.msg(
+                            "Cannot forward a message without a target list. " "Please try again."
+                        )
                         return
                     elif not self.lhs:
                         self.caller.msg("You must define a message to forward.")
@@ -208,9 +211,14 @@ def func(self):
                             if all_mail[mind]:
                                 old_message = all_mail[mind]
 
-                                self.send_mail(self.search_targets(self.lhslist), "FWD: " + old_message.header,
-                                               message + "\n---- Original Message ----\n" + old_message.message,
-                                               self.caller)
+                                self.send_mail(
+                                    self.search_targets(self.lhslist),
+                                    "FWD: " + old_message.header,
+                                    message
+                                    + "\n---- Original Message ----\n"
+                                    + old_message.message,
+                                    self.caller,
+                                )
                                 self.caller.msg("Message forwarded.")
                             else:
                                 raise IndexError
@@ -218,8 +226,12 @@ def func(self):
                             mind = max(0, min(mind_max, int(self.rhs) - 1))
                             if all_mail[mind]:
                                 old_message = all_mail[mind]
-                                self.send_mail(self.search_targets(self.lhslist), "FWD: " + old_message.header,
-                                               "\n---- Original Message ----\n" + old_message.message, self.caller)
+                                self.send_mail(
+                                    self.search_targets(self.lhslist),
+                                    "FWD: " + old_message.header,
+                                    "\n---- Original Message ----\n" + old_message.message,
+                                    self.caller,
+                                )
                                 self.caller.msg("Message forwarded.")
                                 old_message.tags.remove("new", category="mail")
                                 old_message.tags.add("fwd", category="mail")
@@ -243,8 +255,12 @@ def func(self):
                         mind = max(0, min(mind_max, int(self.lhs) - 1))
                         if all_mail[mind]:
                             old_message = all_mail[mind]
-                            self.send_mail(old_message.senders, "RE: " + old_message.header,
-                                           self.rhs + "\n---- Original Message ----\n" + old_message.message, self.caller)
+                            self.send_mail(
+                                old_message.senders,
+                                "RE: " + old_message.header,
+                                self.rhs + "\n---- Original Message ----\n" + old_message.message,
+                                self.caller,
+                            )
                             old_message.tags.remove("new", category="mail")
                             old_message.tags.add("-", category="mail")
                             return
@@ -275,8 +291,15 @@ def func(self):
                     messageForm = []
                     if message:
                         messageForm.append(_HEAD_CHAR * _WIDTH)
-                        messageForm.append("|wFrom:|n %s" % (message.senders[0].get_display_name(self.caller)))
-                        messageForm.append("|wSent:|n %s" % message.db_date_created.strftime("%b %-d, %Y - %H:%M:%S"))
+                        messageForm.append(
+                            "|wFrom:|n %s" % (message.senders[0].get_display_name(self.caller))
+                        )
+                        # note that we cannot use %-d format here since Windows does not support it
+                        day = message.db_date_created.day
+                        messageForm.append(
+                            "|wSent:|n %s"
+                            % message.db_date_created.strftime(f"%b {day}, %Y - %H:%M:%S")
+                        )
                         messageForm.append("|wSubject:|n %s" % message.header)
                         messageForm.append(_SUB_HEAD_CHAR * _WIDTH)
                         messageForm.append(message.message)
@@ -286,24 +309,34 @@ def func(self):
                     message.tags.add("-", category="mail")
 
         else:
-            # list messages 
+            # list messages
             messages = self.get_all_mail()
 
             if messages:
-                table = evtable.EvTable("|wID|n", "|wFrom|n", "|wSubject|n",
-                                        "|wArrived|n", "",
-                                        table=None, border="header",
-                                        header_line_char=_SUB_HEAD_CHAR, width=_WIDTH)
+                table = evtable.EvTable(
+                    "|wID|n",
+                    "|wFrom|n",
+                    "|wSubject|n",
+                    "|wArrived|n",
+                    "",
+                    table=None,
+                    border="header",
+                    header_line_char=_SUB_HEAD_CHAR,
+                    width=_WIDTH,
+                )
                 index = 1
                 for message in messages:
                     status = str(message.db_tags.last().db_key.upper())
                     if status == "NEW":
                         status = "|gNEW|n"
 
-                    table.add_row(index, message.senders[0].get_display_name(self.caller), 
-                                  message.header,
-                                  datetime_format(message.db_date_created),
-                                  status)
+                    table.add_row(
+                        index,
+                        message.senders[0].get_display_name(self.caller),
+                        message.header,
+                        datetime_format(message.db_date_created),
+                        status,
+                    )
                     index += 1
 
                 table.reformat_column(0, width=6)
@@ -321,5 +354,6 @@ def func(self):
 
 # character - level version of the command
 
+
 class CmdMailCharacter(CmdMail):
     account_caller = False
diff --git a/evennia/contrib/mapbuilder.py b/evennia/contrib/mapbuilder.py
index 12b23a4a106..9d8e283dcd9 100644
--- a/evennia/contrib/mapbuilder.py
+++ b/evennia/contrib/mapbuilder.py
@@ -133,9 +133,11 @@ def example1_build_mountains(x, y, **kwargs):
     room = create_object(rooms.Room, key="mountains" + str(x) + str(y))
 
     # Generate a description by randomly selecting an entry from a list.
-    room_desc = ["Mountains as far as the eye can see",
-                 "Your path is surrounded by sheer cliffs",
-                 "Haven't you seen that rock before?"]
+    room_desc = [
+        "Mountains as far as the eye can see",
+        "Your path is surrounded by sheer cliffs",
+        "Haven't you seen that rock before?",
+    ]
     room.db.desc = random.choice(room_desc)
 
     # Create a random number of objects to populate the room.
@@ -157,15 +159,17 @@ def example1_build_temple(x, y, **kwargs):
     room = create_object(rooms.Room, key="temple" + str(x) + str(y))
 
     # Set the description.
-    room.db.desc = ("In what, from the outside, appeared to be a grand and "
-                    "ancient temple you've somehow found yourself in the the "
-                    "Evennia Inn! It consists of one large room filled with "
-                    "tables. The bardisk extends along the east wall, where "
-                    "multiple barrels and bottles line the shelves. The "
-                    "barkeep seems busy handing out ale and chatting with "
-                    "the patrons, which are a rowdy and cheerful lot, "
-                    "keeping the sound level only just below thunderous. "
-                    "This is a rare spot of mirth on this dread moor.")
+    room.db.desc = (
+        "In what, from the outside, appeared to be a grand and "
+        "ancient temple you've somehow found yourself in the the "
+        "Evennia Inn! It consists of one large room filled with "
+        "tables. The bardisk extends along the east wall, where "
+        "multiple barrels and bottles line the shelves. The "
+        "barkeep seems busy handing out ale and chatting with "
+        "the patrons, which are a rowdy and cheerful lot, "
+        "keeping the sound level only just below thunderous. "
+        "This is a rare spot of mirth on this dread moor."
+    )
 
     # Send a message to the account
     kwargs["caller"].msg(room.key + " " + room.dbref)
@@ -175,9 +179,11 @@ def example1_build_temple(x, y, **kwargs):
 
 
 # Include your trigger characters and build functions in a legend dict.
-EXAMPLE1_LEGEND = {("♣", "♠"): example1_build_forest,
-                   ("∩", "n"): example1_build_mountains,
-                   ("▲"): example1_build_temple}
+EXAMPLE1_LEGEND = {
+    ("♣", "♠"): example1_build_forest,
+    ("∩", "n"): example1_build_mountains,
+    ("▲"): example1_build_temple,
+}
 
 # ---------- EXAMPLE 2 ---------- #
 # @mapbuilder/two evennia.contrib.mapbuilder.EXAMPLE2_MAP EXAMPLE2_LEGEND
@@ -185,11 +191,11 @@ def example1_build_temple(x, y, **kwargs):
 # -*- coding: utf-8 -*-
 
 # Add the necessary imports for your instructions here.
-#from evennia import create_object
-#from typeclasses import rooms, exits
-#from evennia.utils import utils
-#from random import randint
-#import random
+# from evennia import create_object
+# from typeclasses import rooms, exits
+# from evennia.utils import utils
+# from random import randint
+# import random
 
 # This is the same layout as Example 1 but included are characters for exits.
 # We can use these characters to determine which rooms should be connected.
@@ -230,16 +236,15 @@ def example2_build_verticle_exit(x, y, **kwargs):
     south_room = kwargs["room_dict"][(x, y + 1)]
 
     # create exits in the rooms
-    create_object(exits.Exit, key="south",
-                  aliases=["s"], location=north_room,
-                  destination=south_room)
+    create_object(
+        exits.Exit, key="south", aliases=["s"], location=north_room, destination=south_room
+    )
 
-    create_object(exits.Exit, key="north",
-                  aliases=["n"], location=south_room,
-                  destination=north_room)
+    create_object(
+        exits.Exit, key="north", aliases=["n"], location=south_room, destination=north_room
+    )
 
-    kwargs["caller"].msg("Connected: " + north_room.key +
-                         " & " + south_room.key)
+    kwargs["caller"].msg("Connected: " + north_room.key + " & " + south_room.key)
 
 
 def example2_build_horizontal_exit(x, y, **kwargs):
@@ -251,22 +256,19 @@ def example2_build_horizontal_exit(x, y, **kwargs):
     west_room = kwargs["room_dict"][(x - 1, y)]
     east_room = kwargs["room_dict"][(x + 1, y)]
 
-    create_object(exits.Exit, key="east",
-                  aliases=["e"], location=west_room,
-                  destination=east_room)
+    create_object(exits.Exit, key="east", aliases=["e"], location=west_room, destination=east_room)
 
-    create_object(exits.Exit, key="west",
-                  aliases=["w"], location=east_room,
-                  destination=west_room)
+    create_object(exits.Exit, key="west", aliases=["w"], location=east_room, destination=west_room)
 
-    kwargs["caller"].msg("Connected: " + west_room.key +
-                         " & " + east_room.key)
+    kwargs["caller"].msg("Connected: " + west_room.key + " & " + east_room.key)
 
 
 # Include your trigger characters and build functions in a legend dict.
-EXAMPLE2_LEGEND = {("♣", "♠"): example2_build_forest,
-                   ("|"): example2_build_verticle_exit,
-                   ("-"): example2_build_horizontal_exit}
+EXAMPLE2_LEGEND = {
+    ("♣", "♠"): example2_build_forest,
+    ("|"): example2_build_verticle_exit,
+    ("-"): example2_build_horizontal_exit,
+}
 
 # ---------- END OF EXAMPLES ---------- #
 
@@ -285,7 +287,7 @@ def _map_to_list(game_map):
         list (list): The map split into rows
 
     """
-    return game_map.split('\n')
+    return game_map.split("\n")
 
 
 def build_map(caller, game_map, legend, iterations=1, build_exits=True):
@@ -325,9 +327,9 @@ def build_map(caller, game_map, legend, iterations=1, build_exits=True):
                 for key in legend:
                     # obs - we must use == for strings
                     if game_map[y][x] == key:
-                        room = legend[key](x, y, iteration=iteration,
-                                           room_dict=room_dict,
-                                           caller=caller)
+                        room = legend[key](
+                            x, y, iteration=iteration, room_dict=room_dict, caller=caller
+                        )
                         if iteration == 0:
                             room_dict[(x, y)] = room
 
@@ -341,33 +343,50 @@ def build_map(caller, game_map, legend, iterations=1, build_exits=True):
             # north
             if (x, y - 1) in room_dict:
                 if room_dict[(x, y - 1)]:
-                    create_object(exits.Exit, key="north",
-                                  aliases=["n"], location=location,
-                                  destination=room_dict[(x, y - 1)])
+                    create_object(
+                        exits.Exit,
+                        key="north",
+                        aliases=["n"],
+                        location=location,
+                        destination=room_dict[(x, y - 1)],
+                    )
 
             # east
             if (x + 1, y) in room_dict:
                 if room_dict[(x + 1, y)]:
-                    create_object(exits.Exit, key="east",
-                                  aliases=["e"], location=location,
-                                  destination=room_dict[(x + 1, y)])
+                    create_object(
+                        exits.Exit,
+                        key="east",
+                        aliases=["e"],
+                        location=location,
+                        destination=room_dict[(x + 1, y)],
+                    )
 
             # south
             if (x, y + 1) in room_dict:
                 if room_dict[(x, y + 1)]:
-                    create_object(exits.Exit, key="south",
-                                  aliases=["s"], location=location,
-                                  destination=room_dict[(x, y + 1)])
+                    create_object(
+                        exits.Exit,
+                        key="south",
+                        aliases=["s"],
+                        location=location,
+                        destination=room_dict[(x, y + 1)],
+                    )
 
             # west
             if (x - 1, y) in room_dict:
                 if room_dict[(x - 1, y)]:
-                    create_object(exits.Exit, key="west",
-                                  aliases=["w"], location=location,
-                                  destination=room_dict[(x - 1, y)])
+                    create_object(
+                        exits.Exit,
+                        key="west",
+                        aliases=["w"],
+                        location=location,
+                        destination=room_dict[(x - 1, y)],
+                    )
 
     caller.msg("Map Created.")
 
+
 # access command
 
 
@@ -399,6 +418,7 @@ class CmdMapBuilder(COMMAND_DEFAULT_CLASS):
     automatically generated but is turned off by switches which also determines
     how many times the map is iterated over.
     """
+
     key = "@mapbuilder"
     aliases = ["@buildmap"]
     locks = "cmd:superuser()"
@@ -412,8 +432,7 @@ def func(self):
 
         # Check if arguments passed.
         if not self.args or (len(args) != 2):
-            caller.msg("Usage: @mapbuilder <path.to.module.VARNAME> "
-                       "<path.to.module.MAP_LEGEND>")
+            caller.msg("Usage: @mapbuilder <path.to.module.VARNAME> " "<path.to.module.MAP_LEGEND>")
             return
 
         # Set up base variables.
@@ -424,17 +443,18 @@ def func(self):
 
         # Breaks down path_to_map into [PATH, VARIABLE]
         path_to_map = args[0]
-        path_to_map = path_to_map.rsplit('.', 1)
+        path_to_map = path_to_map.rsplit(".", 1)
 
         try:
             # Retrieves map variable from module or raises error.
-            game_map = utils.variable_from_module(path_to_map[0],
-                                                  path_to_map[1])
+            game_map = utils.variable_from_module(path_to_map[0], path_to_map[1])
             if not game_map:
-                raise ValueError("Command Aborted!\n"
-                                 "Path to map variable failed.\n"
-                                 "Usage: @mapbuilder <path.to.module."
-                                 "VARNAME> <path.to.module.MAP_LEGEND>")
+                raise ValueError(
+                    "Command Aborted!\n"
+                    "Path to map variable failed.\n"
+                    "Usage: @mapbuilder <path.to.module."
+                    "VARNAME> <path.to.module.MAP_LEGEND>"
+                )
 
         except Exception as exc:
             # Or relays error message if fails.
@@ -445,7 +465,7 @@ def func(self):
 
         # Breaks down path_to_legend into [PATH, VARIABLE]
         path_to_legend = args[1]
-        path_to_legend = path_to_legend.rsplit('.', 1)
+        path_to_legend = path_to_legend.rsplit(".", 1)
 
         # If no path given default to path_to_map's path
         if len(path_to_legend) == 1:
@@ -453,13 +473,14 @@ def func(self):
 
         try:
             # Retrieves legend variable from module or raises error if fails.
-            legend = utils.variable_from_module(path_to_legend[0],
-                                                path_to_legend[1])
+            legend = utils.variable_from_module(path_to_legend[0], path_to_legend[1])
             if not legend:
-                raise ValueError("Command Aborted!\n"
-                                 "Path to legend variable failed.\n"
-                                 "Usage: @mapbuilder <path.to.module."
-                                 "VARNAME> <path.to.module.MAP_LEGEND>")
+                raise ValueError(
+                    "Command Aborted!\n"
+                    "Path to legend variable failed.\n"
+                    "Usage: @mapbuilder <path.to.module."
+                    "VARNAME> <path.to.module.MAP_LEGEND>"
+                )
 
         except Exception as exc:
             # Or relays error message if fails.
diff --git a/evennia/contrib/menu_login.py b/evennia/contrib/menu_login.py
index e9cd9405048..566f116694e 100644
--- a/evennia/contrib/menu_login.py
+++ b/evennia/contrib/menu_login.py
@@ -24,25 +24,27 @@
 from evennia import Command, CmdSet
 from evennia import syscmdkeys
 from evennia.utils.evmenu import EvMenu
-from evennia.utils.utils import (
-    random_string_from_module, class_from_module, callables_from_module)
+from evennia.utils.utils import random_string_from_module, class_from_module, callables_from_module
 
 _CONNECTION_SCREEN_MODULE = settings.CONNECTION_SCREEN_MODULE
 _GUEST_ENABLED = settings.GUEST_ENABLED
 _ACCOUNT = class_from_module(settings.BASE_ACCOUNT_TYPECLASS)
 _GUEST = class_from_module(settings.BASE_GUEST_TYPECLASS)
 
-_ACCOUNT_HELP = ("Enter the name you used to log into the game before, "
-                 "or a new account-name if you are new.")
-_PASSWORD_HELP = ("Password should be a minimum of 8 characters (preferably longer) and "
-                  "can contain a mix of letters, spaces, digits and @/./+/-/_/'/, only.")
+_ACCOUNT_HELP = (
+    "Enter the name you used to log into the game before, " "or a new account-name if you are new."
+)
+_PASSWORD_HELP = (
+    "Password should be a minimum of 8 characters (preferably longer) and "
+    "can contain a mix of letters, spaces, digits and @/./+/-/_/'/, only."
+)
 
 # Menu nodes
 
 
 def _show_help(caller, raw_string, **kwargs):
     """Echo help message, then re-run node that triggered it"""
-    help_entry = kwargs['help_entry']
+    help_entry = kwargs["help_entry"]
     caller.msg(help_entry)
     return None  # re-run calling node
 
@@ -53,6 +55,7 @@ def node_enter_username(caller, raw_text, **kwargs):
     Start login by displaying the connection screen and ask for a user name.
 
     """
+
     def _check_input(caller, username, **kwargs):
         """
         'Goto-callable', set up to be called from the _default option below.
@@ -65,9 +68,9 @@ def _check_input(caller, username, **kwargs):
         and what kwarg it will be called with.
 
         """
-        username = username.rstrip('\n')
+        username = username.rstrip("\n")
 
-        if username == 'guest' and _GUEST_ENABLED:
+        if username == "guest" and _GUEST_ENABLED:
             # do an immediate guest login
             session = caller
             address = session.address
@@ -76,7 +79,7 @@ def _check_input(caller, username, **kwargs):
                 return "node_quit_or_login", {"login": True, "account": account}
             else:
                 session.msg("|R{}|n".format("\n".join(errors)))
-                return None # re-run the username node
+                return None  # re-run the username node
 
         try:
             _ACCOUNT.objects.get(username__iexact=username)
@@ -86,28 +89,26 @@ def _check_input(caller, username, **kwargs):
             new_user = False
 
         # pass username/new_user into next node as kwargs
-        return "node_enter_password", {'new_user': new_user, 'username': username}
+        return "node_enter_password", {"new_user": new_user, "username": username}
 
     callables = callables_from_module(_CONNECTION_SCREEN_MODULE)
     if "connection_screen" in callables:
-        connection_screen = callables['connection_screen']()
+        connection_screen = callables["connection_screen"]()
     else:
         connection_screen = random_string_from_module(_CONNECTION_SCREEN_MODULE)
 
     if _GUEST_ENABLED:
         text = "Enter a new or existing user name to login (write 'guest' for a guest login):"
-    else: 
+    else:
         text = "Enter a new or existing user name to login:"
     text = "{}\n\n{}".format(connection_screen, text)
 
-    options = ({"key": "",
-                "goto": "node_enter_username"},
-               {"key": ("quit", "q"),
-                "goto": "node_quit_or_login"},
-               {"key": ("help", "h"), 
-                "goto": (_show_help, {"help_entry": _ACCOUNT_HELP, **kwargs})},
-               {"key": "_default",
-                "goto": _check_input})
+    options = (
+        {"key": "", "goto": "node_enter_username"},
+        {"key": ("quit", "q"), "goto": "node_quit_or_login"},
+        {"key": ("help", "h"), "goto": (_show_help, {"help_entry": _ACCOUNT_HELP, **kwargs})},
+        {"key": "_default", "goto": _check_input},
+    )
     return text, options
 
 
@@ -116,6 +117,7 @@ def node_enter_password(caller, raw_string, **kwargs):
     Handle password input.
 
     """
+
     def _check_input(caller, password, **kwargs):
         """
         'Goto-callable', set up to be called from the _default option below.
@@ -129,20 +131,22 @@ def _check_input(caller, password, **kwargs):
 
         """
         # these flags were set by the goto-callable
-        username = kwargs['username']
-        new_user = kwargs['new_user']
-        password = password.rstrip('\n')
+        username = kwargs["username"]
+        new_user = kwargs["new_user"]
+        password = password.rstrip("\n")
 
         session = caller
         address = session.address
         if new_user:
             # create a new account
-            account, errors = _ACCOUNT.create(username=username, password=password,
-                                              ip=address, session=session)
+            account, errors = _ACCOUNT.create(
+                username=username, password=password, ip=address, session=session
+            )
         else:
             # check password against existing account
-            account, errors = _ACCOUNT.authenticate(username=username, password=password,
-                                                    ip=address, session=session)
+            account, errors = _ACCOUNT.authenticate(
+                username=username, password=password, ip=address, session=session
+            )
 
         if account:
             if new_user:
@@ -152,32 +156,31 @@ def _check_input(caller, password, **kwargs):
         else:
             # restart due to errors
             session.msg("|R{}".format("\n".join(errors)))
-            kwargs['retry_password'] = True
+            kwargs["retry_password"] = True
             return "node_enter_password", kwargs
 
     def _restart_login(caller, *args, **kwargs):
         caller.msg("|yCancelled login.|n")
         return "node_enter_username"
 
-    username = kwargs['username']
+    username = kwargs["username"]
     if kwargs["new_user"]:
 
-        if kwargs.get('retry_password'):
+        if kwargs.get("retry_password"):
             # Attempting to fix password
             text = "Enter a new password:"
         else:
-            text = ("Creating a new account |c{}|n. "
-                    "Enter a password (empty to abort):".format(username))
+            text = "Creating a new account |c{}|n. " "Enter a password (empty to abort):".format(
+                username
+            )
     else:
         text = "Enter the password for account |c{}|n (empty to abort):".format(username)
-    options = ({"key": "",
-                "goto": _restart_login},
-               {"key": ("quit", "q"),
-                "goto": "node_quit_or_login"},
-               {"key": ("help", "h"),
-                "goto": (_show_help, {"help_entry": _PASSWORD_HELP, **kwargs})},
-               {"key": "_default",
-                "goto": (_check_input, kwargs)})
+    options = (
+        {"key": "", "goto": _restart_login},
+        {"key": ("quit", "q"), "goto": "node_quit_or_login"},
+        {"key": ("help", "h"), "goto": (_show_help, {"help_entry": _PASSWORD_HELP, **kwargs})},
+        {"key": "_default", "goto": (_check_input, kwargs)},
+    )
     return text, options
 
 
@@ -198,6 +201,7 @@ def node_quit_or_login(caller, raw_text, **kwargs):
 
 # EvMenu helper function
 
+
 def _node_formatter(nodetext, optionstext, caller=None):
     """Do not display the options, only the text.
 
@@ -211,6 +215,7 @@ def _node_formatter(nodetext, optionstext, caller=None):
 
 # Commands and CmdSets
 
+
 class UnloggedinCmdSet(CmdSet):
     "Cmdset for the unloggedin state"
     key = "DefaultUnloggedin"
@@ -228,6 +233,7 @@ class CmdUnloggedinLook(Command):
     to the menu's own look command.
 
     """
+
     key = syscmdkeys.CMD_LOGINSTART
     locks = "cmd:all()"
     arg_regex = r"^$"
@@ -237,6 +243,12 @@ def func(self):
         Run the menu using the nodes in this module.
 
         """
-        EvMenu(self.caller, "evennia.contrib.menu_login",
-               startnode="node_enter_username", auto_look=False, auto_quit=False,
-               cmd_on_exit=None, node_formatter=_node_formatter)
+        EvMenu(
+            self.caller,
+            "evennia.contrib.menu_login",
+            startnode="node_enter_username",
+            auto_look=False,
+            auto_quit=False,
+            cmd_on_exit=None,
+            node_formatter=_node_formatter,
+        )
diff --git a/evennia/contrib/multidescer.py b/evennia/contrib/multidescer.py
index cf6c5ec0398..3c99d4ada78 100644
--- a/evennia/contrib/multidescer.py
+++ b/evennia/contrib/multidescer.py
@@ -38,6 +38,7 @@ class and add a line `self.add(CmdMultiDesc())` to the end
 
 # Helper functions for the Command
 
+
 class DescValidateError(ValueError):
     "Used for tracebacks from desc systems"
     pass
@@ -95,6 +96,7 @@ def _update_store(caller, key=None, desc=None, delete=False, swapkey=None):
         else:
             raise DescValidateError("No description was set.")
 
+
 # eveditor save/load/quit functions
 
 
@@ -123,6 +125,7 @@ def _quit_editor(caller):
 
 # The actual command class
 
+
 class CmdMultiDesc(default_cmds.MuxCommand):
     """
     Manage multiple descriptions
@@ -144,6 +147,7 @@ class CmdMultiDesc(default_cmds.MuxCommand):
         paragraph and + + or ansi space ||_ to add extra whitespace.
 
     """
+
     key = "+desc"
     aliases = ["desc"]
     locks = "cmd:all()"
@@ -166,11 +170,14 @@ def func(self):
                 _update_store(caller)
                 do_crop = "full" not in switches
                 if do_crop:
-                    outtext = ["|w%s:|n %s" % (key, crop(desc))
-                               for key, desc in caller.db.multidesc]
+                    outtext = [
+                        "|w%s:|n %s" % (key, crop(desc)) for key, desc in caller.db.multidesc
+                    ]
                 else:
-                    outtext = ["\n|w%s:|n|n\n%s\n%s" % (key, "-" * (len(key) + 1), desc)
-                               for key, desc in caller.db.multidesc]
+                    outtext = [
+                        "\n|w%s:|n|n\n%s\n%s" % (key, "-" * (len(key) + 1), desc)
+                        for key, desc in caller.db.multidesc
+                    ]
 
                 caller.msg("|wStored descs:|n\n" + "\n".join(outtext))
                 return
@@ -184,8 +191,14 @@ def func(self):
                 # this is used by the editor to know what to edit; it's deleted automatically
                 caller.db._multidesc_editkey = args
                 # start the editor
-                EvEditor(caller, loadfunc=_load_editor, savefunc=_save_editor,
-                         quitfunc=_quit_editor, key="multidesc editor", persistent=True)
+                EvEditor(
+                    caller,
+                    loadfunc=_load_editor,
+                    savefunc=_save_editor,
+                    quitfunc=_quit_editor,
+                    key="multidesc editor",
+                    persistent=True,
+                )
 
             elif "delete" in switches or "del" in switches:
                 # delete a multidesc entry.
diff --git a/evennia/contrib/puzzles.py b/evennia/contrib/puzzles.py
index ebda32a4d89..1ca661cd5dc 100644
--- a/evennia/contrib/puzzles.py
+++ b/evennia/contrib/puzzles.py
@@ -81,17 +81,18 @@
 from evennia.prototypes.spawner import spawn
 
 # Tag used by puzzles
-_PUZZLES_TAG_CATEGORY = 'puzzles'
-_PUZZLES_TAG_RECIPE = 'puzzle_recipe'
+_PUZZLES_TAG_CATEGORY = "puzzles"
+_PUZZLES_TAG_RECIPE = "puzzle_recipe"
 # puzzle part and puzzle result
-_PUZZLES_TAG_MEMBER = 'puzzle_member'
+_PUZZLES_TAG_MEMBER = "puzzle_member"
 
-_PUZZLE_DEFAULT_FAIL_USE_MESSAGE = 'You try to utilize %s but nothing happens ... something amiss?'
-_PUZZLE_DEFAULT_SUCCESS_USE_MESSAGE = 'You are a Genius!!!'
+_PUZZLE_DEFAULT_FAIL_USE_MESSAGE = "You try to utilize %s but nothing happens ... something amiss?"
+_PUZZLE_DEFAULT_SUCCESS_USE_MESSAGE = "You are a Genius!!!"
 _PUZZLE_DEFAULT_SUCCESS_USE_LOCATION_MESSAGE = "|c{caller}|n performs some kind of tribal dance and |y{result_names}|n seems to appear from thin air"
 
 # ----------- UTILITY FUNCTIONS ------------
 
+
 def proto_def(obj, with_tags=True):
     """
     Basic properties needed to spawn
@@ -99,20 +100,20 @@ def proto_def(obj, with_tags=True):
     """
     protodef = {
         # TODO: Don't we need to honor ALL properties? attributes, contents, etc.
-        'prototype_key': '%s(%s)' % (obj.key, obj.dbref),
-        'key': obj.key,
-        'typeclass': obj.typeclass_path,
-        'desc': obj.db.desc,
-        'location': obj.location,
-        'home': obj.home,
-        'locks': ';'.join(obj.locks.all()),
-        'permissions': obj.permissions.all()[:],
+        "prototype_key": "%s(%s)" % (obj.key, obj.dbref),
+        "key": obj.key,
+        "typeclass": obj.typeclass_path,
+        "desc": obj.db.desc,
+        "location": obj.location,
+        "home": obj.home,
+        "locks": ";".join(obj.locks.all()),
+        "permissions": obj.permissions.all()[:],
     }
     if with_tags:
         tags = obj.tags.all(return_key_and_category=True)
         tags = [(t[0], t[1], None) for t in tags]
         tags.append((_PUZZLES_TAG_MEMBER, _PUZZLES_TAG_CATEGORY, None))
-        protodef['tags'] = tags
+        protodef["tags"] = tags
     return protodef
 
 
@@ -130,14 +131,15 @@ def maskout_protodef(protodef, mask):
 # Colorize the default success message
 def _colorize_message(msg):
     _i = 0
-    _colors = ['|r', '|g', '|y']
+    _colors = ["|r", "|g", "|y"]
     _msg = []
     for l in msg:
         _msg += _colors[_i] + l
         _i = (_i + 1) % len(_colors)
-    msg = ''.join(_msg) + '|n'
+    msg = "".join(_msg) + "|n"
     return msg
 
+
 _PUZZLE_DEFAULT_SUCCESS_USE_MESSAGE = _colorize_message(_PUZZLE_DEFAULT_SUCCESS_USE_MESSAGE)
 
 # ------------------------------------------
@@ -182,13 +184,13 @@ class CmdCreatePuzzleRecipe(MuxCommand):
 
     """
 
-    key = '@puzzle'
-    aliases = '@puzzlerecipe'
-    locks = 'cmd:perm(puzzle) or perm(Builder)'
-    help_category = 'Puzzles'
+    key = "@puzzle"
+    aliases = "@puzzlerecipe"
+    locks = "cmd:perm(puzzle) or perm(Builder)"
+    help_category = "Puzzles"
 
     confirm = True
-    default_confirm = 'no'
+    default_confirm = "no"
 
     def func(self):
         caller = self.caller
@@ -200,27 +202,26 @@ def func(self):
 
         puzzle_name = self.lhslist[0]
         if len(puzzle_name) == 0:
-            caller.msg('Invalid puzzle name %r.' % puzzle_name)
+            caller.msg("Invalid puzzle name %r." % puzzle_name)
             return
 
         # if there is another puzzle with same name
         # warn user that parts and results will be
         # interchangable
-        _puzzles = search.search_script_attribute(
-                key='puzzle_name',
-                value=puzzle_name
-        )
+        _puzzles = search.search_script_attribute(key="puzzle_name", value=puzzle_name)
         _puzzles = list(filter(lambda p: isinstance(p, PuzzleRecipe), _puzzles))
         if _puzzles:
-            confirm = 'There are %d puzzles with the same name.\n' % len(_puzzles) \
-                + 'Its parts and results will be interchangeable.\n' \
-                + 'Continue yes/[no]? '
-            answer = ''
-            while answer.strip().lower() not in ('y', 'yes', 'n', 'no'):
-                answer = yield(confirm)
-                answer = self.default_confirm if answer == '' else answer
-            if answer.strip().lower() in ('n', 'no'):
-                caller.msg('Cancelled: no puzzle created.')
+            confirm = (
+                "There are %d puzzles with the same name.\n" % len(_puzzles)
+                + "Its parts and results will be interchangeable.\n"
+                + "Continue yes/[no]? "
+            )
+            answer = ""
+            while answer.strip().lower() not in ("y", "yes", "n", "no"):
+                answer = yield (confirm)
+                answer = self.default_confirm if answer == "" else answer
+            if answer.strip().lower() in ("n", "no"):
+                caller.msg("Cancelled: no puzzle created.")
                 return
 
         def is_valid_obj_location(obj):
@@ -235,7 +236,7 @@ def is_valid_obj_location(obj):
             # located.
             # Parts and results may have different valid locations
             if not inherits_from(obj.location, DefaultRoom):
-                caller.msg('Invalid location for %s' % (obj.key))
+                caller.msg("Invalid location for %s" % (obj.key))
                 valid = False
             return valid
 
@@ -246,20 +247,20 @@ def is_valid_result_location(part):
             return is_valid_obj_location(part)
 
         def is_valid_inheritance(obj):
-            valid = not inherits_from(obj, DefaultCharacter) \
-                    and not inherits_from(obj, DefaultRoom) \
-                    and not inherits_from(obj, DefaultExit)
+            valid = (
+                not inherits_from(obj, DefaultCharacter)
+                and not inherits_from(obj, DefaultRoom)
+                and not inherits_from(obj, DefaultExit)
+            )
             if not valid:
-                caller.msg('Invalid typeclass for %s' % (obj))
+                caller.msg("Invalid typeclass for %s" % (obj))
             return valid
 
         def is_valid_part(part):
-            return is_valid_inheritance(part) \
-                    and is_valid_part_location(part)
+            return is_valid_inheritance(part) and is_valid_part_location(part)
 
         def is_valid_result(result):
-            return is_valid_inheritance(result) \
-                    and is_valid_result_location(result)
+            return is_valid_inheritance(result) and is_valid_result_location(result)
 
         parts = []
         for objname in self.lhslist[1:]:
@@ -280,26 +281,28 @@ def is_valid_result(result):
             results.append(obj)
 
         for part in parts:
-            caller.msg('Part %s(%s)' % (part.name, part.dbref))
+            caller.msg("Part %s(%s)" % (part.name, part.dbref))
 
         for result in results:
-            caller.msg('Result %s(%s)' % (result.name, result.dbref))
+            caller.msg("Result %s(%s)" % (result.name, result.dbref))
 
         proto_parts = [proto_def(obj) for obj in parts]
         proto_results = [proto_def(obj) for obj in results]
 
         puzzle = create_script(PuzzleRecipe, key=puzzle_name)
         puzzle.save_recipe(puzzle_name, proto_parts, proto_results)
-        puzzle.locks.add('control:id(%s) or perm(Builder)' % caller.dbref[1:])
+        puzzle.locks.add("control:id(%s) or perm(Builder)" % caller.dbref[1:])
 
         caller.msg(
             "Puzzle |y'%s' |w%s(%s)|n has been created |gsuccessfully|n."
-            % (puzzle.db.puzzle_name, puzzle.name, puzzle.dbref))
+            % (puzzle.db.puzzle_name, puzzle.name, puzzle.dbref)
+        )
 
         caller.msg(
-            'You may now dispose of all parts and results. \n'
-            'Use @puzzleedit #{dbref} to customize this puzzle further. \n'
-            'Use @armpuzzle #{dbref} to arm a new puzzle instance.'.format(dbref=puzzle.dbref))
+            "You may now dispose of all parts and results. \n"
+            "Use @puzzleedit #{dbref} to customize this puzzle further. \n"
+            "Use @armpuzzle #{dbref} to arm a new puzzle instance.".format(dbref=puzzle.dbref)
+        )
 
 
 class CmdEditPuzzle(MuxCommand):
@@ -331,9 +334,9 @@ class CmdEditPuzzle(MuxCommand):
 
     """
 
-    key = '@puzzleedit'
-    locks = 'cmd:perm(puzzleedit) or perm(Builder)'
-    help_category = 'Puzzles'
+    key = "@puzzleedit"
+    locks = "cmd:perm(puzzleedit) or perm(Builder)"
+    help_category = "Puzzles"
 
     def func(self):
         self._USAGE = "Usage: @puzzleedit[/switches] <dbref>[/attribute = <value>]"
@@ -343,8 +346,8 @@ def func(self):
             caller.msg(self._USAGE)
             return
 
-        if '/' in self.lhslist[0]:
-            recipe_dbref, attr = self.lhslist[0].split('/')
+        if "/" in self.lhslist[0]:
+            recipe_dbref, attr = self.lhslist[0].split("/")
         else:
             recipe_dbref = self.lhslist[0]
 
@@ -354,75 +357,73 @@ def func(self):
 
         puzzle = search.search_script(recipe_dbref)
         if not puzzle or not inherits_from(puzzle[0], PuzzleRecipe):
-            caller.msg('%s(%s) is not a puzzle' % (puzzle[0].name, recipe_dbref))
+            caller.msg("%s(%s) is not a puzzle" % (puzzle[0].name, recipe_dbref))
             return
 
         puzzle = puzzle[0]
-        puzzle_name_id = '%s(%s)' % (puzzle.name, puzzle.dbref)
+        puzzle_name_id = "%s(%s)" % (puzzle.name, puzzle.dbref)
 
-        if 'delete' in self.switches:
-            if not (puzzle.access(caller, 'control') or puzzle.access(caller, 'delete')):
+        if "delete" in self.switches:
+            if not (puzzle.access(caller, "control") or puzzle.access(caller, "delete")):
                 caller.msg("You don't have permission to delete %s." % puzzle_name_id)
                 return
 
             puzzle.delete()
-            caller.msg('%s was deleted' % puzzle_name_id)
+            caller.msg("%s was deleted" % puzzle_name_id)
             return
 
-        elif 'addpart' in self.switches:
+        elif "addpart" in self.switches:
             objs = self._get_objs()
             if objs:
                 added = self._add_parts(objs, puzzle)
-                caller.msg('%s were added to parts' % (', '.join(added)))
+                caller.msg("%s were added to parts" % (", ".join(added)))
             return
 
-        elif 'delpart' in self.switches:
+        elif "delpart" in self.switches:
             objs = self._get_objs()
             if objs:
                 removed = self._remove_parts(objs, puzzle)
-                caller.msg('%s were removed from parts' % (', '.join(removed)))
+                caller.msg("%s were removed from parts" % (", ".join(removed)))
             return
 
-        elif 'addresult' in self.switches:
+        elif "addresult" in self.switches:
             objs = self._get_objs()
             if objs:
                 added = self._add_results(objs, puzzle)
-                caller.msg('%s were added to results' % (', '.join(added)))
+                caller.msg("%s were added to results" % (", ".join(added)))
             return
 
-        elif 'delresult' in self.switches:
+        elif "delresult" in self.switches:
             objs = self._get_objs()
             if objs:
                 removed = self._remove_results(objs, puzzle)
-                caller.msg('%s were removed from results' % (', '.join(removed)))
+                caller.msg("%s were removed from results" % (", ".join(removed)))
             return
 
         else:
             # edit attributes
 
-            if not (puzzle.access(caller, 'control') or puzzle.access(caller, 'edit')):
+            if not (puzzle.access(caller, "control") or puzzle.access(caller, "edit")):
                 caller.msg("You don't have permission to edit %s." % puzzle_name_id)
                 return
 
-            if attr == 'use_success_message':
+            if attr == "use_success_message":
                 puzzle.db.use_success_message = self.rhs
                 caller.msg(
-                    "%s use_success_message = %s\n" % (
-                        puzzle_name_id, puzzle.db.use_success_message)
+                    "%s use_success_message = %s\n"
+                    % (puzzle_name_id, puzzle.db.use_success_message)
                 )
                 return
-            elif attr == 'use_success_location_message':
+            elif attr == "use_success_location_message":
                 puzzle.db.use_success_location_message = self.rhs
                 caller.msg(
-                    "%s use_success_location_message = %s\n" % (
-                        puzzle_name_id, puzzle.db.use_success_location_message)
+                    "%s use_success_location_message = %s\n"
+                    % (puzzle_name_id, puzzle.db.use_success_location_message)
                 )
                 return
-            elif attr == 'mask':
+            elif attr == "mask":
                 puzzle.db.mask = tuple(self.rhslist)
-                caller.msg(
-                    "%s mask = %r\n" % (puzzle_name_id, puzzle.db.mask)
-                )
+                caller.msg("%s mask = %r\n" % (puzzle_name_id, puzzle.db.mask))
                 return
 
     def _get_objs(self):
@@ -491,9 +492,9 @@ class CmdArmPuzzle(MuxCommand):
 
     """
 
-    key = '@armpuzzle'
-    locks = 'cmd:perm(armpuzzle) or perm(Builder)'
-    help_category = 'Puzzles'
+    key = "@armpuzzle"
+    locks = "cmd:perm(armpuzzle) or perm(Builder)"
+    help_category = "Puzzles"
 
     def func(self):
         caller = self.caller
@@ -504,18 +505,21 @@ def func(self):
 
         puzzle = search.search_script(self.args)
         if not puzzle or not inherits_from(puzzle[0], PuzzleRecipe):
-            caller.msg('Invalid puzzle %r' % (self.args))
+            caller.msg("Invalid puzzle %r" % (self.args))
             return
 
         puzzle = puzzle[0]
         caller.msg(
-            "Puzzle Recipe %s(%s) '%s' found.\nSpawning %d parts ..." % (
-                puzzle.name, puzzle.dbref, puzzle.db.puzzle_name, len(puzzle.db.parts)))
+            "Puzzle Recipe %s(%s) '%s' found.\nSpawning %d parts ..."
+            % (puzzle.name, puzzle.dbref, puzzle.db.puzzle_name, len(puzzle.db.parts))
+        )
 
         for proto_part in puzzle.db.parts:
             part = spawn(proto_part)[0]
-            caller.msg("Part %s(%s) spawned and placed at %s(%s)" % (
-                part.name, part.dbref, part.location, part.location.dbref))
+            caller.msg(
+                "Part %s(%s) spawned and placed at %s(%s)"
+                % (part.name, part.dbref, part.location, part.location.dbref)
+            )
             part.tags.add(puzzle.db.puzzle_name, category=_PUZZLES_TAG_CATEGORY)
             part.db.puzzle_name = puzzle.db.puzzle_name
 
@@ -531,7 +535,7 @@ def _lookups_parts_puzzlenames_protodefs(parts):
         parts_dict[part.dbref] = part
         protodef = proto_def(part, with_tags=False)
         # remove 'prototype_key' as it will prevent equality
-        del(protodef['prototype_key'])
+        del protodef["prototype_key"]
         puzzle_ingredients[part.dbref] = protodef
         tags_categories = part.tags.all(return_key_and_category=True)
         for tag, category in tags_categories:
@@ -547,10 +551,7 @@ def _puzzles_by_names(names):
     # Find all puzzles by puzzle name (i.e. tag name)
     puzzles = []
     for puzzle_name in names:
-        _puzzles = search.search_script_attribute(
-                key='puzzle_name',
-                value=puzzle_name
-        )
+        _puzzles = search.search_script_attribute(key="puzzle_name", value=puzzle_name)
         _puzzles = list(filter(lambda p: isinstance(p, PuzzleRecipe), _puzzles))
         if not _puzzles:
             continue
@@ -567,8 +568,8 @@ def _matching_puzzles(puzzles, puzzlename_tags_dict, puzzle_ingredients):
         puzzle_mask = puzzle.db.mask[:]
         # remove tags and prototype_key as they prevent equality
         for i, puzzle_protopart in enumerate(puzzle_protoparts[:]):
-            del(puzzle_protopart['tags'])
-            del(puzzle_protopart['prototype_key'])
+            del puzzle_protopart["tags"]
+            del puzzle_protopart["prototype_key"]
             puzzle_protopart = maskout_protodef(puzzle_protopart, puzzle_mask)
             puzzle_protoparts[i] = puzzle_protopart
 
@@ -596,19 +597,19 @@ class CmdUsePuzzleParts(MuxCommand):
         use <part1[,part2,...>]
     """
 
-    key = 'use'
-    aliases = 'combine'
-    locks = 'cmd:pperm(use) or pperm(Player)'
-    help_category = 'Puzzles'
+    key = "use"
+    aliases = "combine"
+    locks = "cmd:pperm(use) or pperm(Player)"
+    help_category = "Puzzles"
 
     def func(self):
         caller = self.caller
 
         if not self.lhs:
-            caller.msg('Use what?')
+            caller.msg("Use what?")
             return
 
-        many = 'these' if len(self.lhslist) > 1 else 'this'
+        many = "these" if len(self.lhslist) > 1 else "this"
 
         # either all are parts, or abort finding matching puzzles
         parts = []
@@ -616,8 +617,8 @@ def func(self):
         for partname in partnames:
             part = caller.search(
                 partname,
-                multimatch_string='Which %s. There are many.\n' % (partname),
-                nofound_string='There is no %s around.' % (partname)
+                multimatch_string="Which %s. There are many.\n" % (partname),
+                nofound_string="There is no %s around." % (partname),
             )
 
             if not part:
@@ -626,15 +627,16 @@ def func(self):
             if not part.tags.get(_PUZZLES_TAG_MEMBER, category=_PUZZLES_TAG_CATEGORY):
 
                 # not a puzzle part ... abort
-                caller.msg('You have no idea how %s can be used' % (many))
+                caller.msg("You have no idea how %s can be used" % (many))
                 return
 
             # a valid part
             parts.append(part)
 
         # Create lookup dicts by part's dbref and by puzzle_name(tags)
-        parts_dict, puzzlename_tags_dict, puzzle_ingredients = \
-                _lookups_parts_puzzlenames_protodefs(parts)
+        parts_dict, puzzlename_tags_dict, puzzle_ingredients = _lookups_parts_puzzlenames_protodefs(
+            parts
+        )
 
         # Find all puzzles by puzzle name (i.e. tag name)
         puzzles = _puzzles_by_names(puzzlename_tags_dict.keys())
@@ -644,8 +646,7 @@ def func(self):
         # Create lookup dict of puzzles by dbref
         puzzles_dict = dict((puzzle.dbref, puzzle) for puzzle in puzzles)
         # Check if parts can be combined to solve a puzzle
-        matched_puzzles = _matching_puzzles(
-                puzzles, puzzlename_tags_dict, puzzle_ingredients)
+        matched_puzzles = _matching_puzzles(puzzles, puzzlename_tags_dict, puzzle_ingredients)
 
         if len(matched_puzzles) == 0:
             # TODO: we could use part.fail_message instead, if there was one
@@ -671,7 +672,7 @@ def func(self):
         # just hint how many.
         if len(largest_puzzles) > 1:
             caller.msg(
-                'Your gears start turning and %d different ideas come to your mind ...\n'
+                "Your gears start turning and %d different ideas come to your mind ...\n"
                 % (len(largest_puzzles))
             )
             puzzletuple = choice(largest_puzzles)
@@ -690,12 +691,11 @@ def func(self):
         for dbref in matched_dbrefparts:
             parts_dict[dbref].delete()
 
-        result_names = ', '.join(result_names)
+        result_names = ", ".join(result_names)
         caller.msg(puzzle.db.use_success_message)
         caller.location.msg_contents(
-            puzzle.db.use_success_location_message.format(
-                caller=caller, result_names=result_names),
-            exclude=(caller,)
+            puzzle.db.use_success_location_message.format(caller=caller, result_names=result_names),
+            exclude=(caller,),
         )
 
 
@@ -707,15 +707,14 @@ class CmdListPuzzleRecipes(MuxCommand):
         @lspuzzlerecipes
     """
 
-    key = '@lspuzzlerecipes'
-    locks = 'cmd:perm(lspuzzlerecipes) or perm(Builder)'
-    help_category = 'Puzzles'
+    key = "@lspuzzlerecipes"
+    locks = "cmd:perm(lspuzzlerecipes) or perm(Builder)"
+    help_category = "Puzzles"
 
     def func(self):
         caller = self.caller
 
-        recipes = search.search_script_tag(
-            _PUZZLES_TAG_RECIPE, category=_PUZZLES_TAG_CATEGORY)
+        recipes = search.search_script_tag(_PUZZLES_TAG_RECIPE, category=_PUZZLES_TAG_CATEGORY)
 
         div = "-" * 60
         text = [div]
@@ -723,26 +722,28 @@ def func(self):
         msgf_item = "%2s|c%15s|n: |w%s|n"
         for recipe in recipes:
             text.append(msgf_recipe % (recipe.db.puzzle_name, recipe.name, recipe.dbref))
-            text.append('Success Caller message:\n' + recipe.db.use_success_message + '\n')
-            text.append('Success Location message:\n' + recipe.db.use_success_location_message + '\n')
-            text.append('Mask:\n' + str(recipe.db.mask) + '\n')
-            text.append('Parts')
+            text.append("Success Caller message:\n" + recipe.db.use_success_message + "\n")
+            text.append(
+                "Success Location message:\n" + recipe.db.use_success_location_message + "\n"
+            )
+            text.append("Mask:\n" + str(recipe.db.mask) + "\n")
+            text.append("Parts")
             for protopart in recipe.db.parts[:]:
-                mark = '-'
+                mark = "-"
                 for k, v in protopart.items():
                     text.append(msgf_item % (mark, k, v))
-                    mark = ''
-            text.append('Results')
+                    mark = ""
+            text.append("Results")
             for protoresult in recipe.db.results[:]:
-                mark = '-'
+                mark = "-"
                 for k, v in protoresult.items():
                     text.append(msgf_item % (mark, k, v))
-                    mark = ''
+                    mark = ""
         else:
             text.append(div)
-            text.append('Found |r%d|n puzzle(s).' % (len(recipes)))
+            text.append("Found |r%d|n puzzle(s)." % (len(recipes)))
             text.append(div)
-        caller.msg('\n'.join(text))
+        caller.msg("\n".join(text))
 
 
 class CmdListArmedPuzzles(MuxCommand):
@@ -753,35 +754,34 @@ class CmdListArmedPuzzles(MuxCommand):
         @lsarmedpuzzles
     """
 
-    key = '@lsarmedpuzzles'
-    locks = 'cmd:perm(lsarmedpuzzles) or perm(Builder)'
-    help_category = 'Puzzles'
+    key = "@lsarmedpuzzles"
+    locks = "cmd:perm(lsarmedpuzzles) or perm(Builder)"
+    help_category = "Puzzles"
 
     def func(self):
         caller = self.caller
 
-        armed_puzzles = search.search_tag(
-            _PUZZLES_TAG_MEMBER, category=_PUZZLES_TAG_CATEGORY)
+        armed_puzzles = search.search_tag(_PUZZLES_TAG_MEMBER, category=_PUZZLES_TAG_CATEGORY)
 
-        armed_puzzles = dict((k, list(g)) for k, g in itertools.groupby(
-            armed_puzzles,
-            lambda ap: ap.db.puzzle_name))
+        armed_puzzles = dict(
+            (k, list(g)) for k, g in itertools.groupby(armed_puzzles, lambda ap: ap.db.puzzle_name)
+        )
 
-        div = '-' * 60
+        div = "-" * 60
         msgf_pznm = "Puzzle name: |y%s|n"
         msgf_item = "|m%25s|w(%s)|n at |c%25s|w(%s)|n"
         text = [div]
         for pzname, items in armed_puzzles.items():
             text.append(msgf_pznm % (pzname))
             for item in items:
-                text.append(msgf_item % (
-                    item.name, item.dbref,
-                    item.location.name, item.location.dbref))
+                text.append(
+                    msgf_item % (item.name, item.dbref, item.location.name, item.location.dbref)
+                )
         else:
             text.append(div)
-            text.append('Found |r%d|n armed puzzle(s).' % (len(armed_puzzles)))
+            text.append("Found |r%d|n armed puzzle(s)." % (len(armed_puzzles)))
             text.append(div)
-        caller.msg('\n'.join(text))
+        caller.msg("\n".join(text))
 
 
 class PuzzleSystemCmdSet(CmdSet):
diff --git a/evennia/contrib/random_string_generator.py b/evennia/contrib/random_string_generator.py
index a6ceb805fc4..bedb0ed3b6f 100644
--- a/evennia/contrib/random_string_generator.py
+++ b/evennia/contrib/random_string_generator.py
@@ -156,7 +156,9 @@ def __init__(self, name, regex):
             self._find_elements(regex)
 
     def __repr__(self):
-        return "<evennia.contrib.random_string_generator.RandomStringGenerator for {}>".format(self.name)
+        return "<evennia.contrib.random_string_generator.RandomStringGenerator for {}>".format(
+            self.name
+        )
 
     def _get_script(self):
         """Get or create the script."""
@@ -191,7 +193,9 @@ def _find_elements(self, regex):
 
             # If `.`, break here
             if name == "any":
-                raise RejectedRegex("the . definition is too broad, specify what you need more precisely")
+                raise RejectedRegex(
+                    "the . definition is too broad, specify what you need more precisely"
+                )
             elif name == "at":
                 # Either the beginning or end, we ignore it
                 continue
@@ -332,8 +336,11 @@ def remove(self, element):
         script = self._get_script()
         generated = script.db.generated.get(self.name, [])
         if element not in generated:
-            raise ValueError("the string {} isn't stored as generated by the generator {}".format(
-                element, self.name))
+            raise ValueError(
+                "the string {} isn't stored as generated by the generator {}".format(
+                    element, self.name
+                )
+            )
 
         generated.remove(element)
 
diff --git a/evennia/contrib/rplanguage.py b/evennia/contrib/rplanguage.py
index b77ccc97a9a..6fae4969605 100644
--- a/evennia/contrib/rplanguage.py
+++ b/evennia/contrib/rplanguage.py
@@ -90,8 +90,6 @@
     that never change (if this is desired).
 
 """
-from builtins import range
-
 import re
 from random import choice, randint
 from collections import defaultdict
@@ -99,15 +97,17 @@
 from evennia.utils import logger
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Obfuscate language
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 # default language grammar
-_PHONEMES = "ea oh ae aa eh ah ao aw ai er ey ow ia ih iy oy ua uh uw a e i u y p b t d f v t dh " \
-            "s z sh zh ch jh k ng g m n l r w"
+_PHONEMES = (
+    "ea oh ae aa eh ah ao aw ai er ey ow ia ih iy oy ua uh uw a e i u y p b t d f v t dh "
+    "s z sh zh ch jh k ng g m n l r w"
+)
 _VOWELS = "eaoiuy"
 # these must be able to be constructed from phonemes (so for example,
 # if you have v here, there must exist at least one single-character
@@ -116,8 +116,8 @@
 
 _RE_FLAGS = re.MULTILINE + re.IGNORECASE + re.DOTALL + re.UNICODE
 _RE_GRAMMAR = re.compile(r"vv|cc|v|c", _RE_FLAGS)
-_RE_WORD = re.compile(r'\w+', _RE_FLAGS)
-_RE_EXTRA_CHARS = re.compile(r'\s+(?=\W)|[,.?;](?=[,.?;]|\s+[,.?;])', _RE_FLAGS)
+_RE_WORD = re.compile(r"\w+", _RE_FLAGS)
+_RE_EXTRA_CHARS = re.compile(r"\s+(?=\W)|[,.?;](?=[,.?;]|\s+[,.?;])", _RE_FLAGS)
 
 
 class LanguageError(RuntimeError):
@@ -161,13 +161,20 @@ def at_script_creation(self):
         self.persistent = True
         self.db.language_storage = {}
 
-    def add(self, key="default", phonemes=_PHONEMES,
-            grammar=_GRAMMAR, word_length_variance=0,
-            noun_translate=False,
-            noun_prefix="",
-            noun_postfix="",
-            vowels=_VOWELS, manual_translations=None,
-            auto_translations=None, force=False):
+    def add(
+        self,
+        key="default",
+        phonemes=_PHONEMES,
+        grammar=_GRAMMAR,
+        word_length_variance=0,
+        noun_translate=False,
+        noun_prefix="",
+        noun_postfix="",
+        vowels=_VOWELS,
+        manual_translations=None,
+        auto_translations=None,
+        force=False,
+    ):
         """
         Add a new language. Note that you generally only need to do
         this once per language and that adding an existing language
@@ -231,7 +238,8 @@ def add(self, key="default", phonemes=_PHONEMES,
         if key in self.db.language_storage and not force:
             raise LanguageExistsError(
                 "Language is already created. Re-adding it will re-build"
-                " its dictionary map. Use 'force=True' keyword if you are sure.")
+                " its dictionary map. Use 'force=True' keyword if you are sure."
+            )
 
         # create grammar_component->phoneme mapping
         # {"vv": ["ea", "oh", ...], ...}
@@ -246,25 +254,25 @@ def add(self, key="default", phonemes=_PHONEMES,
         gramdict = defaultdict(list)
         for gram in grammar.split():
             if re.search("\W|(!=[cv])", gram):
-                raise LanguageError("The grammar '%s' is invalid (only 'c' and 'v' are allowed)" % gram)
+                raise LanguageError(
+                    "The grammar '%s' is invalid (only 'c' and 'v' are allowed)" % gram
+                )
             gramdict[len(gram)].append(gram)
         grammar = dict(gramdict)
 
-
         # create automatic translation
         translation = {}
 
         if auto_translations:
             if isinstance(auto_translations, str):
                 # path to a file rather than a list
-                with open(auto_translations, 'r') as f:
+                with open(auto_translations, "r") as f:
                     auto_translations = f.readlines()
             for word in auto_translations:
                 word = word.strip()
                 lword = len(word)
                 new_word = ""
-                wlen = max(0, lword + sum(randint(-1, 1) for i
-                                          in range(word_length_variance)))
+                wlen = max(0, lword + sum(randint(-1, 1) for i in range(word_length_variance)))
                 if wlen not in grammar:
                     # always create a translation, use random length
                     structure = choice(grammar[choice(list(grammar))])
@@ -277,16 +285,20 @@ def add(self, key="default", phonemes=_PHONEMES,
 
         if manual_translations:
             # update with manual translations
-            translation.update(dict((key.lower(), value.lower()) for key, value in manual_translations.items()))
+            translation.update(
+                dict((key.lower(), value.lower()) for key, value in manual_translations.items())
+            )
 
         # store data
-        storage = {"translation": translation,
-                   "grammar": grammar,
-                   "grammar2phonemes": dict(grammar2phonemes),
-                   "word_length_variance": word_length_variance,
-                   "noun_translate": noun_translate,
-                   "noun_prefix": noun_prefix,
-                   "noun_postfix": noun_postfix}
+        storage = {
+            "translation": translation,
+            "grammar": grammar,
+            "grammar2phonemes": dict(grammar2phonemes),
+            "word_length_variance": word_length_variance,
+            "noun_translate": noun_translate,
+            "noun_prefix": noun_prefix,
+            "noun_postfix": noun_postfix,
+        }
         self.db.language_storage[key] = storage
 
     def _translate_sub(self, match):
@@ -323,14 +335,17 @@ def _translate_sub(self, match):
 
                 # make up translation on the fly. Length can
                 # vary from un-translated word.
-                wlen = max(0, lword + sum(randint(-1, 1) for i
-                                          in range(self.language["word_length_variance"])))
+                wlen = max(
+                    0,
+                    lword
+                    + sum(randint(-1, 1) for i in range(self.language["word_length_variance"])),
+                )
                 grammar = self.language["grammar"]
                 if wlen not in grammar:
                     if randint(0, 1) == 0:
                         # this word has no direct translation!
                         wlen = 0
-                        new_word = ''
+                        new_word = ""
                     else:
                         # use random word length
                         wlen = choice(list(grammar.keys()))
@@ -343,14 +358,16 @@ def _translate_sub(self, match):
                         try:
                             new_word += choice(grammar2phonemes[match.group()])
                         except KeyError:
-                            logger.log_trace("You need to supply at least one example of each of "
-                                             "the four base phonemes (c, v, cc, vv)")
+                            logger.log_trace(
+                                "You need to supply at least one example of each of "
+                                "the four base phonemes (c, v, cc, vv)"
+                            )
                             # abort translation here
-                            new_word = ''
+                            new_word = ""
                             break
 
                 if word.istitle():
-                    title_word = ''
+                    title_word = ""
                     if not start_sentence and not self.language.get("noun_translate", False):
                         # don't translate what we identify as proper nouns (names)
                         title_word = word
@@ -359,9 +376,11 @@ def _translate_sub(self, match):
 
                     if title_word:
                         # Regardless of if we translate or not, we will add the custom prefix/postfixes
-                        new_word = "%s%s%s" % (self.language["noun_prefix"],
-                                               title_word.capitalize(),
-                                               self.language["noun_postfix"])
+                        new_word = "%s%s%s" % (
+                            self.language["noun_prefix"],
+                            title_word.capitalize(),
+                            self.language["noun_postfix"],
+                        )
 
             if len(word) > 1 and word.isupper():
                 # keep LOUD words loud also when translated
@@ -429,6 +448,7 @@ def obfuscate_language(text, level=0.0, language="default"):
         except LanguageHandler.DoesNotExist:
             if not _LANGUAGE_HANDLER:
                 from evennia import create_script
+
                 _LANGUAGE_HANDLER = create_script(LanguageHandler)
     return _LANGUAGE_HANDLER.translate(text, level=level, language=language)
 
@@ -446,6 +466,7 @@ def add_language(**kwargs):
         except LanguageHandler.DoesNotExist:
             if not _LANGUAGE_HANDLER:
                 from evennia import create_script
+
                 _LANGUAGE_HANDLER = create_script(LanguageHandler)
     _LANGUAGE_HANDLER.add(**kwargs)
 
@@ -465,11 +486,12 @@ def available_languages():
         except LanguageHandler.DoesNotExist:
             if not _LANGUAGE_HANDLER:
                 from evennia import create_script
+
                 _LANGUAGE_HANDLER = create_script(LanguageHandler)
     return list(_LANGUAGE_HANDLER.attributes.get("language_storage", {}))
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Whisper obscuration
 #
@@ -481,24 +503,25 @@ def available_languages():
 # give a user some idea of the sentence structure. Then the  word
 # lengths are also obfuscated and finally the whisper # length itself.
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 _RE_WHISPER_OBSCURE = [
-    re.compile(r"^$", _RE_FLAGS),                   # This is a Test! #0 full whisper
-    re.compile(r"[ae]", _RE_FLAGS),                 # This -s - Test! #1 add uy
-    re.compile(r"[aeuy]", _RE_FLAGS),               # This -s - Test! #2 add oue
-    re.compile(r"[aeiouy]", _RE_FLAGS),             # Th-s -s - T-st! #3 add all consonants
+    re.compile(r"^$", _RE_FLAGS),  # This is a Test! #0 full whisper
+    re.compile(r"[ae]", _RE_FLAGS),  # This -s - Test! #1 add uy
+    re.compile(r"[aeuy]", _RE_FLAGS),  # This -s - Test! #2 add oue
+    re.compile(r"[aeiouy]", _RE_FLAGS),  # Th-s -s - T-st! #3 add all consonants
     re.compile(r"[aeiouybdhjlmnpqrv]", _RE_FLAGS),  # T--s -s - T-st! #4 add hard consonants
-    re.compile(r"[a-eg-rt-z]", _RE_FLAGS),          # T--s -s - T-s-! #5 add all capitals
+    re.compile(r"[a-eg-rt-z]", _RE_FLAGS),  # T--s -s - T-s-! #5 add all capitals
     re.compile(r"[A-EG-RT-Za-eg-rt-z]", _RE_FLAGS),  # ---s -s - --s-! #6 add f
-    re.compile(r"[A-EG-RT-Za-rt-z]", _RE_FLAGS),    # ---s -s - --s-! #7 add s
-    re.compile(r"[A-EG-RT-Za-z]", _RE_FLAGS),       # ---- -- - ----! #8 add capital F
-    re.compile(r"[A-RT-Za-z]", _RE_FLAGS),          # ---- -- - ----! #9 add capital S
-    re.compile(r"[\w]", _RE_FLAGS),                 # ---- -- - ----! #10 non-alphanumerals
-    re.compile(r"[\S]", _RE_FLAGS),                 # ---- -- - ----  #11 words
-    re.compile(r"[\w\W]", _RE_FLAGS),               # --------------  #12 whisper length
-    re.compile(r".*", _RE_FLAGS)]                   # ...             #13 (always same length)
+    re.compile(r"[A-EG-RT-Za-rt-z]", _RE_FLAGS),  # ---s -s - --s-! #7 add s
+    re.compile(r"[A-EG-RT-Za-z]", _RE_FLAGS),  # ---- -- - ----! #8 add capital F
+    re.compile(r"[A-RT-Za-z]", _RE_FLAGS),  # ---- -- - ----! #9 add capital S
+    re.compile(r"[\w]", _RE_FLAGS),  # ---- -- - ----! #10 non-alphanumerals
+    re.compile(r"[\S]", _RE_FLAGS),  # ---- -- - ----  #11 words
+    re.compile(r"[\w\W]", _RE_FLAGS),  # --------------  #12 whisper length
+    re.compile(r".*", _RE_FLAGS),
+]  # ...             #13 (always same length)
 
 
 def obfuscate_whisper(whisper, level=0.0):
@@ -519,4 +542,4 @@ def obfuscate_whisper(whisper, level=0.0):
     if olevel == 13:
         return "..."
     else:
-        return _RE_WHISPER_OBSCURE[olevel].sub('-', whisper)
+        return _RE_WHISPER_OBSCURE[olevel].sub("-", whisper)
diff --git a/evennia/contrib/rpsystem.py b/evennia/contrib/rpsystem.py
index 9b9a8daab35..e3983844114 100644
--- a/evennia/contrib/rpsystem.py
+++ b/evennia/contrib/rpsystem.py
@@ -94,8 +94,6 @@
            @type/reset/force me = typeclasses.characters.Character
 
 """
-from builtins import object
-
 import re
 from re import escape as re_escape
 import itertools
@@ -105,10 +103,10 @@
 from evennia import ansi
 from evennia.utils.utils import lazy_property, make_iter, variable_from_module
 
-_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
-#------------------------------------------------------------
+_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
+# ------------------------------------------------------------
 # Emote parser
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 # Settings
 
@@ -126,11 +124,9 @@
 
 # Texts
 
-_EMOTE_NOMATCH_ERROR = \
-    """|RNo match for |r{ref}|R.|n"""
+_EMOTE_NOMATCH_ERROR = """|RNo match for |r{ref}|R.|n"""
 
-_EMOTE_MULTIMATCH_ERROR = \
-    """|RMultiple possibilities for {ref}:
+_EMOTE_MULTIMATCH_ERROR = """|RMultiple possibilities for {ref}:
     |r{reflist}|n"""
 
 _RE_FLAGS = re.MULTILINE + re.IGNORECASE + re.UNICODE
@@ -141,8 +137,7 @@
 # separate multimatches from one another and word is the first word in the
 # marker. So entering "/tall man" will return groups ("", "tall")
 # and "/2-tall man" will return groups ("2", "tall").
-_RE_OBJ_REF_START = re.compile(r"%s(?:([0-9]+)%s)*(\w+)" %
-                               (_PREFIX, _NUM_SEP), _RE_FLAGS)
+_RE_OBJ_REF_START = re.compile(r"%s(?:([0-9]+)%s)*(\w+)" % (_PREFIX, _NUM_SEP), _RE_FLAGS)
 
 _RE_LEFT_BRACKETS = re.compile(r"\{+", _RE_FLAGS)
 _RE_RIGHT_BRACKETS = re.compile(r"\}+", _RE_FLAGS)
@@ -235,7 +230,10 @@ def ordered_permutation_regex(sentence):
             elif comb:
                 break
         if comb:
-            solution.append(_PREFIX + r"[0-9]*%s*%s(?=\W|$)+" % (_NUM_SEP, re_escape(" ".join(comb)).rstrip("\\")))
+            solution.append(
+                _PREFIX
+                + r"[0-9]*%s*%s(?=\W|$)+" % (_NUM_SEP, re_escape(" ".join(comb)).rstrip("\\"))
+            )
 
     # combine into a match regex, first matching the longest down to the shortest components
     regex = r"|".join(sorted(set(solution), key=lambda item: (-len(item), item)))
@@ -259,9 +257,11 @@ def regex_tuple_from_key_alias(obj):
             (ordered_permutation_regex, obj, key/alias)
 
     """
-    return (re.compile(ordered_permutation_regex(" ".join([obj.key] + obj.aliases.all())), _RE_FLAGS),
-            obj,
-            obj.key)
+    return (
+        re.compile(ordered_permutation_regex(" ".join([obj.key] + obj.aliases.all())), _RE_FLAGS),
+        obj,
+        obj.key,
+    )
 
 
 def parse_language(speaker, emote):
@@ -359,14 +359,20 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False):
 
     """
     # Load all candidate regex tuples [(regex, obj, sdesc/recog),...]
-    candidate_regexes = \
-        ([(_RE_SELF_REF, sender, sender.sdesc.get())] if hasattr(sender, "sdesc") else []) + \
-        ([sender.recog.get_regex_tuple(obj) for obj in candidates] if hasattr(sender, "recog") else []) + \
-        [obj.sdesc.get_regex_tuple()
-         for obj in candidates if hasattr(obj, "sdesc")] + \
-        [regex_tuple_from_key_alias(obj)   # handle objects without sdescs
-         for obj in candidates if not (hasattr(obj, "recog") and
-                                       hasattr(obj, "sdesc"))]
+    candidate_regexes = (
+        ([(_RE_SELF_REF, sender, sender.sdesc.get())] if hasattr(sender, "sdesc") else [])
+        + (
+            [sender.recog.get_regex_tuple(obj) for obj in candidates]
+            if hasattr(sender, "recog")
+            else []
+        )
+        + [obj.sdesc.get_regex_tuple() for obj in candidates if hasattr(obj, "sdesc")]
+        + [
+            regex_tuple_from_key_alias(obj)  # handle objects without sdescs
+            for obj in candidates
+            if not (hasattr(obj, "recog") and hasattr(obj, "sdesc"))
+        ]
+    )
 
     # filter out non-found data
     candidate_regexes = [tup for tup in candidate_regexes if tup]
@@ -436,16 +442,26 @@ def parse_sdescs_and_recogs(sender, candidates, string, search_mode=False):
             errors.append(_EMOTE_NOMATCH_ERROR.format(ref=marker_match.group()))
         elif nmatches == 1:
             key = "#%i" % obj.id
-            string = string[:istart0] + "{%s}" % key + string[istart + maxscore:]
+            string = string[:istart0] + "{%s}" % key + string[istart + maxscore :]
             mapping[key] = obj
         else:
             refname = marker_match.group()
-            reflist = ["%s%s%s (%s%s)" % (inum + 1, _NUM_SEP,
-                                          _RE_PREFIX.sub("", refname), text,
-                                          " (%s)" % sender.key if sender == ob else "")
-                       for inum, (ob, text) in enumerate(obj)]
-            errors.append(_EMOTE_MULTIMATCH_ERROR.format(
-                          ref=marker_match.group(), reflist="\n    ".join(reflist)))
+            reflist = [
+                "%s%s%s (%s%s)"
+                % (
+                    inum + 1,
+                    _NUM_SEP,
+                    _RE_PREFIX.sub("", refname),
+                    text,
+                    " (%s)" % sender.key if sender == ob else "",
+                )
+                for inum, (ob, text) in enumerate(obj)
+            ]
+            errors.append(
+                _EMOTE_MULTIMATCH_ERROR.format(
+                    ref=marker_match.group(), reflist="\n    ".join(reflist)
+                )
+            )
     if search_mode:
         # return list of object(s) matching
         if nmatches == 0:
@@ -487,7 +503,7 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
         emote, language_mapping = parse_language(sender, emote)
     except (EmoteError, LanguageError) as err:
         # handle all error messages, don't hide actual coding errors
-        sender.msg(err.message)
+        sender.msg(str(err))
         return
     # we escape the object mappings since we'll do the language ones first
     # (the text could have nested object mappings).
@@ -497,8 +513,8 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
         # no self-reference in the emote - add to the end
         key = "#%i" % sender.id
         obj_mapping[key] = sender
-        if anonymous_add == 'first':
-            possessive = "" if emote.startswith('\'') else " "
+        if anonymous_add == "first":
+            possessive = "" if emote.startswith("'") else " "
             emote = "%s%s%s" % ("{{%s}}" % key, possessive, emote)
         else:
             emote = "%s [%s]" % (emote, "{{%s}}" % key)
@@ -531,11 +547,19 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
 
         try:
             recog_get = receiver.recog.get
-            receiver_sdesc_mapping = dict((ref, process_recog(recog_get(obj), obj)) for ref, obj in obj_mapping.items())
+            receiver_sdesc_mapping = dict(
+                (ref, process_recog(recog_get(obj), obj)) for ref, obj in obj_mapping.items()
+            )
         except AttributeError:
-            receiver_sdesc_mapping = dict((ref, process_sdesc(obj.sdesc.get(), obj)
-                                           if hasattr(obj, "sdesc") else process_sdesc(obj.key, obj))
-                                          for ref, obj in obj_mapping.items())
+            receiver_sdesc_mapping = dict(
+                (
+                    ref,
+                    process_sdesc(obj.sdesc.get(), obj)
+                    if hasattr(obj, "sdesc")
+                    else process_sdesc(obj.key, obj),
+                )
+                for ref, obj in obj_mapping.items()
+            )
         # make sure receiver always sees their real name
         rkey = "#%i" % receiver.id
         if rkey in receiver_sdesc_mapping:
@@ -544,9 +568,10 @@ def send_emote(sender, receivers, emote, anonymous_add="first"):
         # do the template replacement of the sdesc/recog {#num} markers
         receiver.msg(sendemote.format(**receiver_sdesc_mapping))
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 # Handlers for sdesc and recog
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class SdescHandler(object):
@@ -603,11 +628,13 @@ def add(self, sdesc, max_length=60):
 
         """
         # strip emote components from sdesc
-        sdesc = _RE_REF.sub(r"\1",
-                            _RE_REF_LANG.sub(r"\1",
-                                             _RE_SELF_REF.sub(r"",
-                                                              _RE_LANGUAGE.sub(r"",
-                                                                               _RE_OBJ_REF_START.sub(r"", sdesc)))))
+        sdesc = _RE_REF.sub(
+            r"\1",
+            _RE_REF_LANG.sub(
+                r"\1",
+                _RE_SELF_REF.sub(r"", _RE_LANGUAGE.sub(r"", _RE_OBJ_REF_START.sub(r"", sdesc))),
+            ),
+        )
 
         # make an sdesc clean of ANSI codes
         cleaned_sdesc = ansi.strip_ansi(sdesc)
@@ -616,7 +643,10 @@ def add(self, sdesc, max_length=60):
             raise SdescError("Short desc cannot be empty.")
 
         if len(cleaned_sdesc) > max_length:
-            raise SdescError("Short desc can max be %i chars long (was %i chars)." % (max_length, len(cleaned_sdesc)))
+            raise SdescError(
+                "Short desc can max be %i chars long (was %i chars)."
+                % (max_length, len(cleaned_sdesc))
+            )
 
         # store to attributes
         sdesc_regex = ordered_permutation_regex(cleaned_sdesc)
@@ -683,10 +713,10 @@ def _cache(self):
         self.ref2recog = self.obj.attributes.get("_recog_ref2recog", default={})
         obj2regex = self.obj.attributes.get("_recog_obj2regex", default={})
         obj2recog = self.obj.attributes.get("_recog_obj2recog", default={})
-        self.obj2regex = dict((obj, re.compile(regex, _RE_FLAGS))
-                              for obj, regex in obj2regex.items() if obj)
-        self.obj2recog = dict((obj, recog)
-                              for obj, recog in obj2recog.items() if obj)
+        self.obj2regex = dict(
+            (obj, re.compile(regex, _RE_FLAGS)) for obj, regex in obj2regex.items() if obj
+        )
+        self.obj2recog = dict((obj, recog) for obj, recog in obj2recog.items() if obj)
 
     def add(self, obj, recog, max_length=60):
         """
@@ -713,10 +743,12 @@ def add(self, obj, recog, max_length=60):
 
         # strip emote components from recog
         recog = _RE_REF.sub(
-            r"\1", _RE_REF_LANG.sub(
-                r"\1", _RE_SELF_REF.sub(
-                    r"", _RE_LANGUAGE.sub(
-                        r"", _RE_OBJ_REF_START.sub(r"", recog)))))
+            r"\1",
+            _RE_REF_LANG.sub(
+                r"\1",
+                _RE_SELF_REF.sub(r"", _RE_LANGUAGE.sub(r"", _RE_OBJ_REF_START.sub(r"", recog))),
+            ),
+        )
 
         # make an recog clean of ANSI codes
         cleaned_recog = ansi.strip_ansi(recog)
@@ -725,7 +757,10 @@ def add(self, obj, recog, max_length=60):
             raise SdescError("Recog string cannot be empty.")
 
         if len(cleaned_recog) > max_length:
-            raise RecogError("Recog string cannot be longer than %i chars (was %i chars)" % (max_length, len(cleaned_recog)))
+            raise RecogError(
+                "Recog string cannot be longer than %i chars (was %i chars)"
+                % (max_length, len(cleaned_recog))
+            )
 
         # mapping #dbref:obj
         key = "#%i" % obj.id
@@ -758,8 +793,7 @@ def get(self, obj):
             # check an eventual recog_masked lock on the object
             # to avoid revealing masked characters. If lock
             # does not exist, pass automatically.
-            return self.obj2recog.get(obj, obj.sdesc.get()
-                                      if hasattr(obj, "sdesc") else obj.key)
+            return self.obj2recog.get(obj, obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key)
         else:
             # recog_mask log not passed, disable recog
             return obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key
@@ -786,9 +820,10 @@ def get_regex_tuple(self, obj):
             return self.obj2regex[obj], obj, self.obj2regex[obj]
         return None
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 # RP Commands
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class RPCommand(Command):
@@ -820,6 +855,7 @@ class CmdEmote(RPCommand):  # replaces the main emote
     a different language.
 
     """
+
     key = "emote"
     aliases = [":"]
     locks = "cmd:all()"
@@ -834,7 +870,7 @@ def func(self):
             targets = self.caller.location.contents
             if not emote.endswith((".", "?", "!")):  # If emote is not punctuated,
                 emote = "%s." % emote  # add a full-stop for good measure.
-            send_emote(self.caller, targets, emote, anonymous_add='first')
+            send_emote(self.caller, targets, emote, anonymous_add="first")
 
 
 class CmdSay(RPCommand):  # replaces standard say
@@ -863,7 +899,7 @@ def func(self):
         # calling the speech hook on the location
         speech = caller.location.at_before_say(self.args)
         # preparing the speech with sdesc/speech parsing.
-        speech = "/me says, \"{speech}\"".format(speech=speech)
+        speech = '/me says, "{speech}"'.format(speech=speech)
         targets = self.caller.location.contents
         send_emote(self.caller, targets, speech, anonymous_add=None)
 
@@ -878,6 +914,7 @@ class CmdSdesc(RPCommand):  # set/look at own sdesc
     Assigns a short description to yourself.
 
     """
+
     key = "sdesc"
     locks = "cmd:all()"
 
@@ -923,6 +960,7 @@ class CmdPose(RPCommand):  # set current pose and default pose
     sdesc in the emote, regardless of who is seeing it.
 
     """
+
     key = "pose"
 
     def parse(self):
@@ -983,8 +1021,10 @@ def func(self):
         else:
             # set the pose. We do one-time ref->sdesc mapping here.
             parsed, mapping = parse_sdescs_and_recogs(caller, caller.location.contents, pose)
-            mapping = dict((ref, obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key)
-                           for ref, obj in mapping.items())
+            mapping = dict(
+                (ref, obj.sdesc.get() if hasattr(obj, "sdesc") else obj.key)
+                for ref, obj in mapping.items()
+            )
             pose = parsed.format(**mapping)
 
             if len(target_name) + len(pose) > 60:
@@ -1012,6 +1052,7 @@ class CmdRecog(RPCommand):  # assign personal alias to object in room
     forget said alias.
 
     """
+
     key = "recog"
     aliases = ["recognize", "forget"]
 
@@ -1042,10 +1083,17 @@ def func(self):
         if nmatches == 0:
             caller.msg(_EMOTE_NOMATCH_ERROR.format(ref=sdesc))
         elif nmatches > 1:
-            reflist = ["%s%s%s (%s%s)" % (inum + 1, _NUM_SEP,
-                                          _RE_PREFIX.sub("", sdesc), caller.recog.get(obj),
-                                          " (%s)" % caller.key if caller == obj else "")
-                       for inum, obj in enumerate(matches)]
+            reflist = [
+                "%s%s%s (%s%s)"
+                % (
+                    inum + 1,
+                    _NUM_SEP,
+                    _RE_PREFIX.sub("", sdesc),
+                    caller.recog.get(obj),
+                    " (%s)" % caller.key if caller == obj else "",
+                )
+                for inum, obj in enumerate(matches)
+            ]
             caller.msg(_EMOTE_MULTIMATCH_ERROR.format(ref=sdesc, reflist="\n    ".join(reflist)))
         else:
             obj = matches[0]
@@ -1080,6 +1128,7 @@ class CmdMask(RPCommand):
     people's recognitions of you will be disabled.
 
     """
+
     key = "mask"
     aliases = ["unmask"]
 
@@ -1128,9 +1177,10 @@ def at_cmdset_creation(self):
         self.add(CmdMask())
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # RP typeclasses
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class ContribRPObject(DefaultObject):
     """
@@ -1148,18 +1198,21 @@ def at_object_creation(self):
         self.db.pose = ""
         self.db.pose_default = "is here."
 
-    def search(self, searchdata,
-               global_search=False,
-               use_nicks=True,
-               typeclass=None,
-               location=None,
-               attribute_name=None,
-               quiet=False,
-               exact=False,
-               candidates=None,
-               nofound_string=None,
-               multimatch_string=None,
-               use_dbref=None):
+    def search(
+        self,
+        searchdata,
+        global_search=False,
+        use_nicks=True,
+        typeclass=None,
+        location=None,
+        attribute_name=None,
+        quiet=False,
+        exact=False,
+        candidates=None,
+        nofound_string=None,
+        multimatch_string=None,
+        use_dbref=None,
+    ):
         """
         Returns an Object matching a search string/condition, taking
         sdescs into account.
@@ -1230,17 +1283,23 @@ def search(self, searchdata,
 
         if is_string:
             # searchdata is a string; wrap some common self-references
-            if searchdata.lower() in ("here", ):
+            if searchdata.lower() in ("here",):
                 return [self.location] if quiet else self.location
-            if searchdata.lower() in ("me", "self",):
+            if searchdata.lower() in ("me", "self"):
                 return [self] if quiet else self
 
         if use_nicks:
             # do nick-replacement on search
-            searchdata = self.nicks.nickreplace(searchdata, categories=("object", "account"), include_account=True)
-
-        if(global_search or (is_string and searchdata.startswith("#") and
-                             len(searchdata) > 1 and searchdata[1:].isdigit())):
+            searchdata = self.nicks.nickreplace(
+                searchdata, categories=("object", "account"), include_account=True
+            )
+
+        if global_search or (
+            is_string
+            and searchdata.startswith("#")
+            and len(searchdata) > 1
+            and searchdata[1:].isdigit()
+        ):
             # only allow exact matching if searching the entire database
             # or unique #dbrefs
             exact = True
@@ -1270,17 +1329,19 @@ def search(self, searchdata,
 
         def search_obj(string):
             "helper wrapper for searching"
-            return ObjectDB.objects.object_search(string,
-                                                  attribute_name=attribute_name,
-                                                  typeclass=typeclass,
-                                                  candidates=candidates,
-                                                  exact=exact,
-                                                  use_dbref=use_dbref)
+            return ObjectDB.objects.object_search(
+                string,
+                attribute_name=attribute_name,
+                typeclass=typeclass,
+                candidates=candidates,
+                exact=exact,
+                use_dbref=use_dbref,
+            )
 
         if candidates:
-            candidates = parse_sdescs_and_recogs(self, candidates,
-                                                 _PREFIX + searchdata,
-                                                 search_mode=True)
+            candidates = parse_sdescs_and_recogs(
+                self, candidates, _PREFIX + searchdata, search_mode=True
+            )
             results = []
             for candidate in candidates:
                 # we search by candidate keys here; this allows full error
@@ -1288,8 +1349,7 @@ def search_obj(string):
                 # in eventual error reporting later (not their keys). Doing
                 # it like this e.g. allows for use of the typeclass kwarg
                 # limiter.
-                results.extend([obj for obj in search_obj(candidate.key)
-                                if obj not in results])
+                results.extend([obj for obj in search_obj(candidate.key) if obj not in results])
 
             if not results and is_builder:
                 # builders get a chance to search only by key+alias
@@ -1302,9 +1362,13 @@ def search_obj(string):
 
         if quiet:
             return results
-        return _AT_SEARCH_RESULT(results, self, query=searchdata,
-                                 nofound_string=nofound_string,
-                                 multimatch_string=multimatch_string)
+        return _AT_SEARCH_RESULT(
+            results,
+            self,
+            query=searchdata,
+            nofound_string=nofound_string,
+            multimatch_string=multimatch_string,
+        )
 
     def get_display_name(self, looker, **kwargs):
         """
@@ -1327,7 +1391,7 @@ def get_display_name(self, looker, **kwargs):
             The RPObject version doesn't add color to its display.
 
         """
-        idstr = "(#%s)" % self.id if self.access(looker, access_type='control') else ""
+        idstr = "(#%s)" % self.id if self.access(looker, access_type="control") else ""
         if looker == self:
             sdesc = self.key
         else:
@@ -1350,8 +1414,7 @@ def return_appearance(self, looker):
         if not looker:
             return ""
         # get and identify all objects
-        visible = (con for con in self.contents if con != looker and
-                   con.access(looker, "view"))
+        visible = (con for con in self.contents if con != looker and con.access(looker, "view"))
         exits, users, things = [], [], []
         for con in visible:
             key = con.get_display_name(looker, pose=True)
@@ -1377,6 +1440,7 @@ class ContribRPRoom(ContribRPObject):
     """
     Dummy inheritance for rooms.
     """
+
     pass
 
 
@@ -1384,6 +1448,7 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
     """
     This is a character class that has poses, sdesc and recog.
     """
+
     # Handlers
     @lazy_property
     def sdesc(self):
@@ -1415,7 +1480,7 @@ def get_display_name(self, looker, **kwargs):
             characters stand out from other objects.
 
         """
-        idstr = "(#%s)" % self.id if self.access(looker, access_type='control') else ""
+        idstr = "(#%s)" % self.id if self.access(looker, access_type="control") else ""
         if looker == self:
             sdesc = self.key
         else:
@@ -1501,4 +1566,3 @@ def process_language(self, text, speaker, language, **kwargs):
 
         """
         return "%s|w%s|n" % ("|W(%s)" % language if language else "", text)
-
diff --git a/evennia/contrib/security/auditing/outputs.py b/evennia/contrib/security/auditing/outputs.py
index b3f9d72c23f..d57881521ee 100644
--- a/evennia/contrib/security/auditing/outputs.py
+++ b/evennia/contrib/security/auditing/outputs.py
@@ -31,7 +31,7 @@ def to_file(data):
 
     """
     # Bucket logs by day and remove objects before serialization
-    bucket = data.pop('objects')['time'].strftime('%Y-%m-%d')
+    bucket = data.pop("objects")["time"].strftime("%Y-%m-%d")
 
     # Write it
     log_file(json.dumps(data), filename="audit_%s.log" % bucket)
@@ -54,7 +54,7 @@ def to_syslog(data):
 
     """
     # Remove objects before serialization
-    data.pop('objects')
+    data.pop("objects")
 
     # Write it out
     syslog.syslog(json.dumps(data))
diff --git a/evennia/contrib/security/auditing/server.py b/evennia/contrib/security/auditing/server.py
index 89efbe53ecd..f7dd0c7a983 100644
--- a/evennia/contrib/security/auditing/server.py
+++ b/evennia/contrib/security/auditing/server.py
@@ -15,31 +15,36 @@
 from evennia.server.serversession import ServerSession
 
 # Attributes governing auditing of commands and where to send log objects
-AUDIT_CALLBACK = getattr(ev_settings, 'AUDIT_CALLBACK',
-                         'evennia.contrib.security.auditing.outputs.to_file')
-AUDIT_IN = getattr(ev_settings, 'AUDIT_IN', False)
-AUDIT_OUT = getattr(ev_settings, 'AUDIT_OUT', False)
-AUDIT_ALLOW_SPARSE = getattr(ev_settings, 'AUDIT_ALLOW_SPARSE', False)
+AUDIT_CALLBACK = getattr(
+    ev_settings, "AUDIT_CALLBACK", "evennia.contrib.security.auditing.outputs.to_file"
+)
+AUDIT_IN = getattr(ev_settings, "AUDIT_IN", False)
+AUDIT_OUT = getattr(ev_settings, "AUDIT_OUT", False)
+AUDIT_ALLOW_SPARSE = getattr(ev_settings, "AUDIT_ALLOW_SPARSE", False)
 AUDIT_MASKS = [
-    {'connect': r"^[@\s]*[connect]{5,8}\s+(\".+?\"|[^\s]+)\s+(?P<secret>.+)"},
-    {'connect': r"^[@\s]*[connect]{5,8}\s+(?P<secret>[\w]+)"},
-    {'create': r"^[^@]?[create]{5,6}\s+(\w+|\".+?\")\s+(?P<secret>[\w]+)"},
-    {'create': r"^[^@]?[create]{5,6}\s+(?P<secret>[\w]+)"},
-    {'userpassword': r"^[@\s]*[userpassword]{11,14}\s+(\w+|\".+?\")\s+=*\s*(?P<secret>[\w]+)"},
-    {'userpassword': r"^.*new password set to '(?P<secret>[^']+)'\."},
-    {'userpassword': r"^.* has changed your password to '(?P<secret>[^']+)'\."},
-    {'password': r"^[@\s]*[password]{6,9}\s+(?P<secret>.*)"},
-] + getattr(ev_settings, 'AUDIT_MASKS', [])
+    {"connect": r"^[@\s]*[connect]{5,8}\s+(\".+?\"|[^\s]+)\s+(?P<secret>.+)"},
+    {"connect": r"^[@\s]*[connect]{5,8}\s+(?P<secret>[\w]+)"},
+    {"create": r"^[^@]?[create]{5,6}\s+(\w+|\".+?\")\s+(?P<secret>[\w]+)"},
+    {"create": r"^[^@]?[create]{5,6}\s+(?P<secret>[\w]+)"},
+    {"userpassword": r"^[@\s]*[userpassword]{11,14}\s+(\w+|\".+?\")\s+=*\s*(?P<secret>[\w]+)"},
+    {"userpassword": r"^.*new password set to '(?P<secret>[^']+)'\."},
+    {"userpassword": r"^.* has changed your password to '(?P<secret>[^']+)'\."},
+    {"password": r"^[@\s]*[password]{6,9}\s+(?P<secret>.*)"},
+] + getattr(ev_settings, "AUDIT_MASKS", [])
 
 
 if AUDIT_CALLBACK:
     try:
         AUDIT_CALLBACK = getattr(
-            mod_import('.'.join(AUDIT_CALLBACK.split('.')[:-1])), AUDIT_CALLBACK.split('.')[-1])
+            mod_import(".".join(AUDIT_CALLBACK.split(".")[:-1])), AUDIT_CALLBACK.split(".")[-1]
+        )
         logger.log_sec("Auditing module online.")
-        logger.log_sec("Audit record User input: {}, output: {}.\n"
-                       "Audit sparse recording: {}, Log callback: {}".format(
-                            AUDIT_IN, AUDIT_OUT, AUDIT_ALLOW_SPARSE, AUDIT_CALLBACK))
+        logger.log_sec(
+            "Audit record User input: {}, output: {}.\n"
+            "Audit sparse recording: {}, Log callback: {}".format(
+                AUDIT_IN, AUDIT_OUT, AUDIT_ALLOW_SPARSE, AUDIT_CALLBACK
+            )
+        )
     except Exception as e:
         logger.log_err("Failed to activate Auditing module. %s" % e)
 
@@ -59,6 +64,7 @@ class AuditedServerSession(ServerSession):
 
     See README.md for installation/configuration instructions.
     """
+
     def audit(self, **kwargs):
         """
         Extracts messages and system data from a Session object upon message
@@ -79,7 +85,7 @@ def audit(self, **kwargs):
         time_str = str(time_obj)
 
         session = self
-        src = kwargs.pop('src', '?')
+        src = kwargs.pop("src", "?")
         bytecount = 0
 
         # Do not log empty lines
@@ -91,22 +97,22 @@ def audit(self, **kwargs):
 
         # Capture Account name and dbref together
         account = session.get_account()
-        account_token = ''
+        account_token = ""
         if account:
-            account_token = '%s%s' % (account.key, account.dbref)
+            account_token = "%s%s" % (account.key, account.dbref)
 
         # Capture Character name and dbref together
         char = session.get_puppet()
-        char_token = ''
+        char_token = ""
         if char:
-            char_token = '%s%s' % (char.key, char.dbref)
+            char_token = "%s%s" % (char.key, char.dbref)
 
         # Capture Room name and dbref together
         room = None
-        room_token = ''
+        room_token = ""
         if char:
             room = char.location
-            room_token = '%s%s' % (room.key, room.dbref)
+            room_token = "%s%s" % (room.key, room.dbref)
 
         # Try to compile an input/output string
         def drill(obj, bucket):
@@ -119,44 +125,44 @@ def drill(obj, bucket):
                 bucket.append(obj)
             return bucket
 
-        text = kwargs.pop('text', '')
+        text = kwargs.pop("text", "")
         if utils.is_iter(text):
-            text = '|'.join(drill(text, []))
+            text = "|".join(drill(text, []))
 
         # Mask any PII in message, where possible
-        bytecount = len(text.encode('utf-8'))
+        bytecount = len(text.encode("utf-8"))
         text = self.mask(text)
 
         # Compile the IP, Account, Character, Room, and the message.
         log = {
-            'time': time_str,
-            'hostname': socket.getfqdn(),
-            'application': '%s' % ev_settings.SERVERNAME,
-            'version': get_evennia_version(),
-            'pid': os.getpid(),
-            'direction': 'SND' if src == 'server' else 'RCV',
-            'protocol': self.protocol_key,
-            'ip': client_ip,
-            'session': 'session#%s' % self.sessid,
-            'account': account_token,
-            'character': char_token,
-            'room': room_token,
-            'text': text.strip(),
-            'bytes': bytecount,
-            'data': kwargs,
-            'objects': {
-                'time': time_obj,
-                'session': self,
-                'account': account,
-                'character': char,
-                'room': room,
-            }
+            "time": time_str,
+            "hostname": socket.getfqdn(),
+            "application": "%s" % ev_settings.SERVERNAME,
+            "version": get_evennia_version(),
+            "pid": os.getpid(),
+            "direction": "SND" if src == "server" else "RCV",
+            "protocol": self.protocol_key,
+            "ip": client_ip,
+            "session": "session#%s" % self.sessid,
+            "account": account_token,
+            "character": char_token,
+            "room": room_token,
+            "text": text.strip(),
+            "bytes": bytecount,
+            "data": kwargs,
+            "objects": {
+                "time": time_obj,
+                "session": self,
+                "account": account,
+                "character": char,
+                "room": room,
+            },
         }
 
         # Remove any keys with blank values
         if AUDIT_ALLOW_SPARSE is False:
-            log['data'] = {k: v for k, v in log['data'].items() if v}
-            log['objects'] = {k: v for k, v in log['objects'].items() if v}
+            log["data"] = {k: v for k, v in log["data"].items() if v}
+            log["objects"] = {k: v for k, v in log["objects"].items() if v}
             log = {k: v for k, v in log.items() if v}
 
         return log
@@ -178,7 +184,7 @@ def mask(self, msg):
         is_embedded = False
         match = re.match(".*Command.*'(.+)'.*is not available.*", msg, flags=re.IGNORECASE)
         if match:
-            msg = match.group(1).replace('\\', '')
+            msg = match.group(1).replace("\\", "")
             submsg = msg
             is_embedded = True
 
@@ -192,11 +198,13 @@ def mask(self, msg):
                     continue
 
                 if match:
-                    term = match.group('secret')
-                    masked = re.sub(term, '*' * len(term.zfill(8)), msg)
+                    term = match.group("secret")
+                    masked = re.sub(term, "*" * len(term.zfill(8)), msg)
 
                     if is_embedded:
-                        msg = re.sub(submsg, '%s <Masked: %s>' % (masked, command), _msg, flags=re.IGNORECASE)
+                        msg = re.sub(
+                            submsg, "%s <Masked: %s>" % (masked, command), _msg, flags=re.IGNORECASE
+                        )
                     else:
                         msg = masked
 
@@ -214,7 +222,7 @@ def data_out(self, **kwargs):
         """
         if AUDIT_CALLBACK and AUDIT_OUT:
             try:
-                log = self.audit(src='server', **kwargs)
+                log = self.audit(src="server", **kwargs)
                 if log:
                     AUDIT_CALLBACK(log)
             except Exception as e:
@@ -232,7 +240,7 @@ def data_in(self, **kwargs):
         """
         if AUDIT_CALLBACK and AUDIT_IN:
             try:
-                log = self.audit(src='client', **kwargs)
+                log = self.audit(src="client", **kwargs)
                 if log:
                     AUDIT_CALLBACK(log)
             except Exception as e:
diff --git a/evennia/contrib/security/auditing/tests.py b/evennia/contrib/security/auditing/tests.py
index 20498cac6e5..8e1bf8703e9 100644
--- a/evennia/contrib/security/auditing/tests.py
+++ b/evennia/contrib/security/auditing/tests.py
@@ -19,59 +19,69 @@
 
 
 class AuditingTest(EvenniaTest):
-
     def test_mask(self):
         """
         Make sure the 'mask' function is properly masking potentially sensitive
         information from strings.
         """
         safe_cmds = (
-            '/say hello to my little friend',
-            '@ccreate channel = for channeling',
-            '@create/drop some stuff',
-            '@create rock',
-            '@create a pretty shirt : evennia.contrib.clothing.Clothing',
-            '@charcreate johnnyefhiwuhefwhef',
+            "/say hello to my little friend",
+            "@ccreate channel = for channeling",
+            "@create/drop some stuff",
+            "@create rock",
+            "@create a pretty shirt : evennia.contrib.clothing.Clothing",
+            "@charcreate johnnyefhiwuhefwhef",
             'Command "@logout" is not available. Maybe you meant "@color" or "@cboot"?',
             '/me says, "what is the password?"',
-            'say the password is plugh',
+            "say the password is plugh",
             # Unfortunately given the syntax, there is no way to discern the
             # latter of these as sensitive
-            '@create pretty sunset'
-            '@create johnny password123',
-            '{"text": "Command \'do stuff\' is not available. Type \"help\" for help."}'
+            "@create pretty sunset" "@create johnny password123",
+            '{"text": "Command \'do stuff\' is not available. Type "help" for help."}',
         )
 
         for cmd in safe_cmds:
             self.assertEqual(self.session.mask(cmd), cmd)
 
         unsafe_cmds = (
-            ("something - new password set to 'asdfghjk'.", "something - new password set to '********'."),
-            ("someone has changed your password to 'something'.", "someone has changed your password to '*********'."),
-            ('connect johnny password123', 'connect johnny ***********'),
-            ('concnct johnny password123', 'concnct johnny ***********'),
-            ('concnct johnnypassword123', 'concnct *****************'),
+            (
+                "something - new password set to 'asdfghjk'.",
+                "something - new password set to '********'.",
+            ),
+            (
+                "someone has changed your password to 'something'.",
+                "someone has changed your password to '*********'.",
+            ),
+            ("connect johnny password123", "connect johnny ***********"),
+            ("concnct johnny password123", "concnct johnny ***********"),
+            ("concnct johnnypassword123", "concnct *****************"),
             ('connect "johnny five" "password 123"', 'connect "johnny five" **************'),
-            ('connect johnny "password 123"', 'connect johnny **************'),
-            ('create johnny password123', 'create johnny ***********'),
-            ('@password password1234 = password2345', '@password ***************************'),
-            ('@password password1234 password2345', '@password *************************'),
-            ('@passwd password1234 = password2345', '@passwd ***************************'),
-            ('@userpassword johnny = password234', '@userpassword johnny = ***********'),
-            ('craete johnnypassword123', 'craete *****************'),
-            ("Command 'conncect teddy teddy' is not available. Maybe you meant \"@encode\"?", 'Command \'conncect ******** ********\' is not available. Maybe you meant "@encode"?'),
-            ("{'text': u'Command \\'conncect jsis dfiidf\\' is not available. Type \"help\" for help.'}", "{'text': u'Command \\'conncect jsis ********\\' is not available. Type \"help\" for help.'}")
+            ('connect johnny "password 123"', "connect johnny **************"),
+            ("create johnny password123", "create johnny ***********"),
+            ("@password password1234 = password2345", "@password ***************************"),
+            ("@password password1234 password2345", "@password *************************"),
+            ("@passwd password1234 = password2345", "@passwd ***************************"),
+            ("@userpassword johnny = password234", "@userpassword johnny = ***********"),
+            ("craete johnnypassword123", "craete *****************"),
+            (
+                "Command 'conncect teddy teddy' is not available. Maybe you meant \"@encode\"?",
+                "Command 'conncect ******** ********' is not available. Maybe you meant \"@encode\"?",
+            ),
+            (
+                "{'text': u'Command \\'conncect jsis dfiidf\\' is not available. Type \"help\" for help.'}",
+                "{'text': u'Command \\'conncect jsis ********\\' is not available. Type \"help\" for help.'}",
+            ),
         )
 
         for index, (unsafe, safe) in enumerate(unsafe_cmds):
-            self.assertEqual(re.sub(' <Masked: .+>', '', self.session.mask(unsafe)).strip(), safe)
+            self.assertEqual(re.sub(" <Masked: .+>", "", self.session.mask(unsafe)).strip(), safe)
 
         # Make sure scrubbing is not being abused to evade monitoring
         secrets = [
-            'say password password password; ive got a secret that i cant explain',
-            'whisper johnny = password\n let\'s lynch the landlord',
-            'say connect johnny password1234|the secret life of arabia',
-            "@password eval(\"__import__('os').system('clear')\", {'__builtins__':{}})"
+            "say password password password; ive got a secret that i cant explain",
+            "whisper johnny = password\n let's lynch the landlord",
+            "say connect johnny password1234|the secret life of arabia",
+            "@password eval(\"__import__('os').system('clear')\", {'__builtins__':{}})",
         ]
         for secret in secrets:
             self.assertEqual(self.session.mask(secret), secret)
@@ -81,17 +91,24 @@ def test_audit(self):
         Make sure the 'audit' function is returning a dictionary based on values
         parsed from the Session object.
         """
-        log = self.session.audit(src='client', text=[['hello']])
-        obj = {k:v for k,v in log.items() if k in ('direction', 'protocol', 'application', 'text')}
-        self.assertEqual(obj, {
-            'direction': 'RCV',
-            'protocol': 'telnet',
-            'application': Anything,  # this will change if running tests from the game dir 
-            'text': 'hello'
-        })
+        log = self.session.audit(src="client", text=[["hello"]])
+        obj = {
+            k: v for k, v in log.items() if k in ("direction", "protocol", "application", "text")
+        }
+        self.assertEqual(
+            obj,
+            {
+                "direction": "RCV",
+                "protocol": "telnet",
+                "application": Anything,  # this will change if running tests from the game dir
+                "text": "hello",
+            },
+        )
 
         # Make sure OOB data is being recorded
-        log = self.session.audit(src='client', text="connect johnny password123", prompt="hp=20|st=10|ma=15", pane=2)
-        self.assertEqual(log['text'], 'connect johnny ***********')
-        self.assertEqual(log['data']['prompt'], 'hp=20|st=10|ma=15')
-        self.assertEqual(log['data']['pane'], 2)
+        log = self.session.audit(
+            src="client", text="connect johnny password123", prompt="hp=20|st=10|ma=15", pane=2
+        )
+        self.assertEqual(log["text"], "connect johnny ***********")
+        self.assertEqual(log["data"]["prompt"], "hp=20|st=10|ma=15")
+        self.assertEqual(log["data"]["pane"], 2)
diff --git a/evennia/contrib/simpledoor.py b/evennia/contrib/simpledoor.py
index 991c089c825..152a8bf7114 100644
--- a/evennia/contrib/simpledoor.py
+++ b/evennia/contrib/simpledoor.py
@@ -97,14 +97,14 @@ class CmdOpen(default_cmds.CmdOpen):
     __doc__ = default_cmds.CmdOpen.__doc__
     # overloading parts of the default CmdOpen command to support doors.
 
-    def create_exit(self, exit_name, location, destination,
-                    exit_aliases=None, typeclass=None):
+    def create_exit(self, exit_name, location, destination, exit_aliases=None, typeclass=None):
         """
         Simple wrapper for the default CmdOpen.create_exit
         """
         # create a new exit as normal
-        new_exit = super().create_exit(exit_name, location, destination,
-                                                    exit_aliases=exit_aliases, typeclass=typeclass)
+        new_exit = super().create_exit(
+            exit_name, location, destination, exit_aliases=exit_aliases, typeclass=typeclass
+        )
         if hasattr(self, "return_exit_already_created"):
             # we don't create a return exit if it was already created (because
             # we created a door)
@@ -113,10 +113,13 @@ def create_exit(self, exit_name, location, destination,
         if inherits_from(new_exit, SimpleDoor):
             # a door - create its counterpart and make sure to turn off the default
             # return-exit creation of CmdOpen
-            self.caller.msg("Note: A door-type exit was created - ignored eventual custom return-exit type.")
+            self.caller.msg(
+                "Note: A door-type exit was created - ignored eventual custom return-exit type."
+            )
             self.return_exit_already_created = True
-            back_exit = self.create_exit(exit_name, destination, location,
-                                         exit_aliases=exit_aliases, typeclass=typeclass)
+            back_exit = self.create_exit(
+                exit_name, destination, location, exit_aliases=exit_aliases, typeclass=typeclass
+            )
             new_exit.db.return_exit = back_exit
             back_exit.db.return_exit = new_exit
         return new_exit
@@ -126,6 +129,7 @@ def create_exit(self, exit_name, location, destination,
 # functionality. One could easily expand it with functionality to
 # operate on other types of open-able objects as needed.
 
+
 class CmdOpenCloseDoor(default_cmds.MuxCommand):
     """
     Open and close a door
diff --git a/evennia/contrib/slow_exit.py b/evennia/contrib/slow_exit.py
index c120728479e..107d274b8cb 100644
--- a/evennia/contrib/slow_exit.py
+++ b/evennia/contrib/slow_exit.py
@@ -37,10 +37,7 @@
 
 from evennia import DefaultExit, utils, Command
 
-MOVE_DELAY = {"stroll": 6,
-              "walk": 4,
-              "run": 2,
-              "sprint": 1}
+MOVE_DELAY = {"stroll": 6, "walk": 4, "run": 2, "sprint": 1}
 
 
 class SlowExit(DefaultExit):
@@ -84,10 +81,7 @@ def move_callback():
 # set speed - command
 #
 
-SPEED_DESCS = {"stroll": "strolling",
-               "walk": "walking",
-               "run": "running",
-               "sprint": "sprinting"}
+SPEED_DESCS = {"stroll": "strolling", "walk": "walking", "run": "running", "sprint": "sprinting"}
 
 
 class CmdSetSpeed(Command):
@@ -101,6 +95,7 @@ class CmdSetSpeed(Command):
     it takes to traverse exits. If no speed is set, 'walk' speed
     is assumed.
     """
+
     key = "setspeed"
 
     def func(self):
@@ -121,6 +116,7 @@ def func(self):
 # stop moving - command
 #
 
+
 class CmdStop(Command):
     """
     stop moving
@@ -130,6 +126,7 @@ class CmdStop(Command):
 
     Stops the current movement, if any.
     """
+
     key = "stop"
 
     def func(self):
diff --git a/evennia/contrib/talking_npc.py b/evennia/contrib/talking_npc.py
index 3d7ace2fc23..ddf0d372f97 100644
--- a/evennia/contrib/talking_npc.py
+++ b/evennia/contrib/talking_npc.py
@@ -25,13 +25,14 @@
 
 # Menu implementing the dialogue tree
 
+
 def menu_start_node(caller):
     text = "'Hello there, how can I help you?'"
 
-    options = ({"desc": "Hey, do you know what this 'Evennia' thing is all about?",
-                "goto": "info1"},
-               {"desc": "What's your name, little NPC?",
-                "goto": "info2"})
+    options = (
+        {"desc": "Hey, do you know what this 'Evennia' thing is all about?", "goto": "info1"},
+        {"desc": "What's your name, little NPC?", "goto": "info2"},
+    )
 
     return text, options
 
@@ -39,12 +40,11 @@ def menu_start_node(caller):
 def info1(caller):
     text = "'Oh, Evennia is where you are right now! Don't you feel the power?'"
 
-    options = ({"desc": "Sure, *I* do, not sure how you do though. You are just an NPC.",
-                "goto": "info3"},
-               {"desc": "Sure I do. What's yer name, NPC?",
-                "goto": "info2"},
-               {"desc": "Ok, bye for now then.",
-                "goto": "END"})
+    options = (
+        {"desc": "Sure, *I* do, not sure how you do though. You are just an NPC.", "goto": "info3"},
+        {"desc": "Sure I do. What's yer name, NPC?", "goto": "info2"},
+        {"desc": "Ok, bye for now then.", "goto": "END"},
+    )
 
     return text, options
 
@@ -52,10 +52,10 @@ def info1(caller):
 def info2(caller):
     text = "'My name is not really important ... I'm just an NPC after all.'"
 
-    options = ({"desc": "I didn't really want to know it anyhow.",
-                "goto": "info3"},
-               {"desc": "Okay then, so what's this 'Evennia' thing about?",
-                "goto": "info1"})
+    options = (
+        {"desc": "I didn't really want to know it anyhow.", "goto": "info3"},
+        {"desc": "Okay then, so what's this 'Evennia' thing about?", "goto": "info1"},
+    )
 
     return text, options
 
@@ -63,10 +63,10 @@ def info2(caller):
 def info3(caller):
     text = "'Well ... I'm sort of busy so, have to go. NPC business. Important stuff. You wouldn't understand.'"
 
-    options = ({"desc": "Oookay ... I won't keep you. Bye.",
-                "goto": "END"},
-               {"desc": "Wait, why don't you tell me your name first?",
-                "goto": "info2"})
+    options = (
+        {"desc": "Oookay ... I won't keep you. Bye.", "goto": "END"},
+        {"desc": "Wait, why don't you tell me your name first?", "goto": "info2"},
+    )
 
     return text, options
 
@@ -78,6 +78,7 @@ def END(caller):
 
     return text, options
 
+
 #
 # The talk command (sits on the NPC)
 #
@@ -94,6 +95,7 @@ class CmdTalk(default_cmds.MuxCommand):
    (NPC) is actually present. It will strike up a conversation with
    that NPC and give you options on what to talk about.
    """
+
     key = "talk"
     locks = "cmd:all()"
     help_category = "General"
@@ -106,8 +108,7 @@ def func(self):
 
         # Initiate the menu. Change this if you are putting this on
         # some other custom NPC class.
-        EvMenu(self.caller, "evennia.contrib.talking_npc",
-               startnode="menu_start_node")
+        EvMenu(self.caller, "evennia.contrib.talking_npc", startnode="menu_start_node")
 
 
 class TalkingCmdSet(CmdSet):
diff --git a/evennia/contrib/tests.py b/evennia/contrib/tests.py
index 3293cab4e1c..ed025b666cb 100644
--- a/evennia/contrib/tests.py
+++ b/evennia/contrib/tests.py
@@ -18,26 +18,32 @@
 mtrans = {"testing": "1", "is": "2", "a": "3", "human": "4"}
 atrans = ["An", "automated", "advantageous", "repeatable", "faster"]
 
-text = "Automated testing is advantageous for a number of reasons: " \
-       "tests may be executed Continuously without the need for human " \
-       "intervention, They are easily repeatable, and often faster."
+text = (
+    "Automated testing is advantageous for a number of reasons: "
+    "tests may be executed Continuously without the need for human "
+    "intervention, They are easily repeatable, and often faster."
+)
 
 
 class TestLanguage(EvenniaTest):
     def setUp(self):
         super().setUp()
-        rplanguage.add_language(key="testlang",
-                                word_length_variance=1,
-                                noun_prefix="bara",
-                                noun_postfix="'y",
-                                manual_translations=mtrans,
-                                auto_translations=atrans,
-                                force=True)
-        rplanguage.add_language(key="binary",
-                                phonemes="oo ii a ck w b d t",
-                                grammar="cvvv cvv cvvcv cvvcvv cvvvc cvvvcvv cvvc",
-                                noun_prefix='beep-',
-                                word_length_variance=4)
+        rplanguage.add_language(
+            key="testlang",
+            word_length_variance=1,
+            noun_prefix="bara",
+            noun_postfix="'y",
+            manual_translations=mtrans,
+            auto_translations=atrans,
+            force=True,
+        )
+        rplanguage.add_language(
+            key="binary",
+            phonemes="oo ii a ck w b d t",
+            grammar="cvvv cvv cvvcv cvvcvv cvvvc cvvvcvv cvvc",
+            noun_prefix="beep-",
+            word_length_variance=4,
+        )
 
     def tearDown(self):
         super().tearDown()
@@ -49,7 +55,7 @@ def test_obfuscate_language(self):
         self.assertEqual(result0, text)
         result1 = rplanguage.obfuscate_language(text, level=1.0, language="testlang")
         result2 = rplanguage.obfuscate_language(text, level=1.0, language="testlang")
-        result3 = rplanguage.obfuscate_language(text, level=1.0, language='binary')
+        result3 = rplanguage.obfuscate_language(text, level=1.0, language="binary")
 
         self.assertNotEqual(result1, text)
         self.assertNotEqual(result3, text)
@@ -63,23 +69,27 @@ def test_faulty_language(self):
         self.assertRaises(
             rplanguage.LanguageError,
             rplanguage.add_language,
-            key='binary2',
+            key="binary2",
             phonemes="w b d t oe ee, oo e o a wh dw bw",  # erroneous comma
             grammar="cvvv cvv cvvcv cvvcvvo cvvvc cvvvcvv cvvc c v cc vv ccvvc ccvvccvv ",
             vowels="oea",
-            word_length_variance=4)
+            word_length_variance=4,
+        )
 
     def test_available_languages(self):
         self.assertEqual(list(sorted(rplanguage.available_languages())), ["binary", "testlang"])
 
     def test_obfuscate_whisper(self):
         self.assertEqual(rplanguage.obfuscate_whisper(text, level=0.0), text)
-        assert (rplanguage.obfuscate_whisper(text, level=0.1).startswith(
-            '-utom-t-d t-sting is -dv-nt-g-ous for - numb-r of r--sons: t-sts m-y b- -x-cut-d Continuously'))
-        assert(rplanguage.obfuscate_whisper(text, level=0.5).startswith(
-            '--------- --s---- -s -----------s f-- - ------ -f ---s--s: --s-s '))
+        assert rplanguage.obfuscate_whisper(text, level=0.1).startswith(
+            "-utom-t-d t-sting is -dv-nt-g-ous for - numb-r of r--sons: t-sts m-y b- -x-cut-d Continuously"
+        )
+        assert rplanguage.obfuscate_whisper(text, level=0.5).startswith(
+            "--------- --s---- -s -----------s f-- - ------ -f ---s--s: --s-s "
+        )
         self.assertEqual(rplanguage.obfuscate_whisper(text, level=1.0), "...")
 
+
 # Testing of emoting / sdesc / recog system
 
 
@@ -92,37 +102,42 @@ def test_obfuscate_whisper(self):
 recog01 = "Mr Receiver"
 recog02 = "Mr Receiver2"
 recog10 = "Mr Sender"
-emote = "With a flair, /me looks at /first and /colliding sdesc-guy. She says \"This is a test.\""
+emote = 'With a flair, /me looks at /first and /colliding sdesc-guy. She says "This is a test."'
 
 
 class TestRPSystem(EvenniaTest):
     maxDiff = None
+
     def setUp(self):
         super().setUp()
         self.room = create_object(rpsystem.ContribRPRoom, key="Location")
         self.speaker = create_object(rpsystem.ContribRPCharacter, key="Sender", location=self.room)
-        self.receiver1 = create_object(rpsystem.ContribRPCharacter, key="Receiver1", location=self.room)
-        self.receiver2 = create_object(rpsystem.ContribRPCharacter, key="Receiver2", location=self.room)
+        self.receiver1 = create_object(
+            rpsystem.ContribRPCharacter, key="Receiver1", location=self.room
+        )
+        self.receiver2 = create_object(
+            rpsystem.ContribRPCharacter, key="Receiver2", location=self.room
+        )
 
     def test_ordered_permutation_regex(self):
         self.assertEqual(
             rpsystem.ordered_permutation_regex(sdesc0),
-            '/[0-9]*-*A\\ nice\\ sender\\ of\\ emotes(?=\\W|$)+|'
-            '/[0-9]*-*nice\\ sender\\ of\\ emotes(?=\\W|$)+|'
-            '/[0-9]*-*A\\ nice\\ sender\\ of(?=\\W|$)+|'
-            '/[0-9]*-*sender\\ of\\ emotes(?=\\W|$)+|'
-            '/[0-9]*-*nice\\ sender\\ of(?=\\W|$)+|'
-            '/[0-9]*-*A\\ nice\\ sender(?=\\W|$)+|'
-            '/[0-9]*-*nice\\ sender(?=\\W|$)+|'
-            '/[0-9]*-*of\\ emotes(?=\\W|$)+|'
-            '/[0-9]*-*sender\\ of(?=\\W|$)+|'
-            '/[0-9]*-*A\\ nice(?=\\W|$)+|'
-            '/[0-9]*-*emotes(?=\\W|$)+|'
-            '/[0-9]*-*sender(?=\\W|$)+|'
-            '/[0-9]*-*nice(?=\\W|$)+|'
-            '/[0-9]*-*of(?=\\W|$)+|'
-            '/[0-9]*-*A(?=\\W|$)+'
-            )
+            "/[0-9]*-*A\\ nice\\ sender\\ of\\ emotes(?=\\W|$)+|"
+            "/[0-9]*-*nice\\ sender\\ of\\ emotes(?=\\W|$)+|"
+            "/[0-9]*-*A\\ nice\\ sender\\ of(?=\\W|$)+|"
+            "/[0-9]*-*sender\\ of\\ emotes(?=\\W|$)+|"
+            "/[0-9]*-*nice\\ sender\\ of(?=\\W|$)+|"
+            "/[0-9]*-*A\\ nice\\ sender(?=\\W|$)+|"
+            "/[0-9]*-*nice\\ sender(?=\\W|$)+|"
+            "/[0-9]*-*of\\ emotes(?=\\W|$)+|"
+            "/[0-9]*-*sender\\ of(?=\\W|$)+|"
+            "/[0-9]*-*A\\ nice(?=\\W|$)+|"
+            "/[0-9]*-*emotes(?=\\W|$)+|"
+            "/[0-9]*-*sender(?=\\W|$)+|"
+            "/[0-9]*-*nice(?=\\W|$)+|"
+            "/[0-9]*-*of(?=\\W|$)+|"
+            "/[0-9]*-*A(?=\\W|$)+",
+        )
 
     def test_sdesc_handler(self):
         self.speaker.sdesc.add(sdesc0)
@@ -132,13 +147,13 @@ def test_sdesc_handler(self):
         self.speaker.sdesc.add("Testing three words")
         self.assertEqual(
             self.speaker.sdesc.get_regex_tuple()[0].pattern,
-            '/[0-9]*-*Testing\ three\ words(?=\W|$)+|'
-            '/[0-9]*-*Testing\ three(?=\W|$)+|'
-            '/[0-9]*-*three\ words(?=\W|$)+|'
-            '/[0-9]*-*Testing(?=\W|$)+|'
-            '/[0-9]*-*three(?=\W|$)+|'
-            '/[0-9]*-*words(?=\W|$)+'
-            )
+            "/[0-9]*-*Testing\ three\ words(?=\W|$)+|"
+            "/[0-9]*-*Testing\ three(?=\W|$)+|"
+            "/[0-9]*-*three\ words(?=\W|$)+|"
+            "/[0-9]*-*Testing(?=\W|$)+|"
+            "/[0-9]*-*three(?=\W|$)+|"
+            "/[0-9]*-*words(?=\W|$)+",
+        )
 
     def test_recog_handler(self):
         self.speaker.sdesc.add(sdesc0)
@@ -149,15 +164,19 @@ def test_recog_handler(self):
         self.assertEqual(self.speaker.recog.get(self.receiver2), recog02)
         self.assertEqual(
             self.speaker.recog.get_regex_tuple(self.receiver1)[0].pattern,
-            '/[0-9]*-*Mr\\ Receiver(?=\\W|$)+|/[0-9]*-*Receiver(?=\\W|$)+|/[0-9]*-*Mr(?=\\W|$)+')
+            "/[0-9]*-*Mr\\ Receiver(?=\\W|$)+|/[0-9]*-*Receiver(?=\\W|$)+|/[0-9]*-*Mr(?=\\W|$)+",
+        )
         self.speaker.recog.remove(self.receiver1)
         self.assertEqual(self.speaker.recog.get(self.receiver1), sdesc1)
 
     def test_parse_language(self):
         self.assertEqual(
             rpsystem.parse_language(self.speaker, emote),
-            ('With a flair, /me looks at /first and /colliding sdesc-guy. She says {##0}',
-             {'##0': (None, '"This is a test."')}))
+            (
+                "With a flair, /me looks at /first and /colliding sdesc-guy. She says {##0}",
+                {"##0": (None, '"This is a test."')},
+            ),
+        )
 
     def parse_sdescs_and_recogs(self):
         speaker = self.speaker
@@ -165,9 +184,14 @@ def parse_sdescs_and_recogs(self):
         self.receiver1.sdesc.add(sdesc1)
         self.receiver2.sdesc.add(sdesc2)
         candidates = (self.receiver1, self.receiver2)
-        result = ('With a flair, {#9} looks at {#10} and {#11}. She says "This is a test."',
-                  {'#11': 'Another nice colliding sdesc-guy for tests', '#10':
-                      'The first receiver of emotes.', '#9': 'A nice sender of emotes'})
+        result = (
+            'With a flair, {#9} looks at {#10} and {#11}. She says "This is a test."',
+            {
+                "#11": "Another nice colliding sdesc-guy for tests",
+                "#10": "The first receiver of emotes.",
+                "#9": "A nice sender of emotes",
+            },
+        )
         self.assertEqual(rpsystem.parse_sdescs_and_recogs(speaker, candidates, emote), result)
         self.speaker.recog.add(self.receiver1, recog01)
         self.assertEqual(rpsystem.parse_sdescs_and_recogs(speaker, candidates, emote), result)
@@ -185,14 +209,20 @@ def test_send_emote(self):
         receiver2.msg = lambda text, **kwargs: setattr(self, "out2", text)
         rpsystem.send_emote(speaker, receivers, emote)
         self.assertEqual(
-            self.out0, 'With a flair, |bSender|n looks at |bThe first receiver of emotes.|n '
-            'and |bAnother nice colliding sdesc-guy for tests|n. She says |w"This is a test."|n')
+            self.out0,
+            "With a flair, |bSender|n looks at |bThe first receiver of emotes.|n "
+            'and |bAnother nice colliding sdesc-guy for tests|n. She says |w"This is a test."|n',
+        )
         self.assertEqual(
-            self.out1, 'With a flair, |bA nice sender of emotes|n looks at |bReceiver1|n and '
-            '|bAnother nice colliding sdesc-guy for tests|n. She says |w"This is a test."|n')
+            self.out1,
+            "With a flair, |bA nice sender of emotes|n looks at |bReceiver1|n and "
+            '|bAnother nice colliding sdesc-guy for tests|n. She says |w"This is a test."|n',
+        )
         self.assertEqual(
-            self.out2, 'With a flair, |bA nice sender of emotes|n looks at |bThe first '
-            'receiver of emotes.|n and |bReceiver2|n. She says |w"This is a test."|n')
+            self.out2,
+            "With a flair, |bA nice sender of emotes|n looks at |bThe first "
+            'receiver of emotes.|n and |bReceiver2|n. She says |w"This is a test."|n',
+        )
 
     def test_rpsearch(self):
         self.speaker.sdesc.add(sdesc0)
@@ -221,9 +251,9 @@ def fromtimestamp(cls, timestamp):
         return datetime.datetime.utcfromtimestamp(timestamp)
 
 
-@patch('evennia.contrib.extended_room.datetime.datetime', ForceUTCDatetime)
+@patch("evennia.contrib.extended_room.datetime.datetime", ForceUTCDatetime)
 # mock gametime to return April 9, 2064, at 21:06 (spring evening)
-@patch('evennia.utils.gametime.gametime', new=Mock(return_value=2975000766))
+@patch("evennia.utils.gametime.gametime", new=Mock(return_value=2975000766))
 class TestExtendedRoom(CommandTest):
     room_typeclass = extended_room.ExtendedRoom
     DETAIL_DESC = "A test detail."
@@ -235,7 +265,7 @@ def setUp(self):
         super().setUp()
         self.room1.ndb.last_timeslot = "afternoon"
         self.room1.ndb.last_season = "winter"
-        self.room1.db.details = {'testdetail': self.DETAIL_DESC}
+        self.room1.db.details = {"testdetail": self.DETAIL_DESC}
         self.room1.db.spring_desc = self.SPRING_DESC
         self.room1.db.desc = self.OLD_DESC
 
@@ -243,8 +273,10 @@ def test_return_appearance(self):
         # get the appearance of a non-extended room for contrast purposes
         old_desc = DefaultRoom.return_appearance(self.room1, self.char1)
         # the new appearance should be the old one, but with the desc switched
-        self.assertEqual(old_desc.replace(self.OLD_DESC, self.SPRING_DESC),
-                         self.room1.return_appearance(self.char1))
+        self.assertEqual(
+            old_desc.replace(self.OLD_DESC, self.SPRING_DESC),
+            self.room1.return_appearance(self.char1),
+        )
         self.assertEqual("spring", self.room1.ndb.last_season)
         self.assertEqual("evening", self.room1.ndb.last_timeslot)
 
@@ -253,27 +285,47 @@ def test_return_detail(self):
 
     def test_cmdextendedlook(self):
         rid = self.room1.id
-        self.call(extended_room.CmdExtendedRoomLook(), "here", 
-                  "Room(#{})\n{}".format(rid, self.SPRING_DESC))
+        self.call(
+            extended_room.CmdExtendedRoomLook(),
+            "here",
+            "Room(#{})\n{}".format(rid, self.SPRING_DESC),
+        )
         self.call(extended_room.CmdExtendedRoomLook(), "testdetail", self.DETAIL_DESC)
-        self.call(extended_room.CmdExtendedRoomLook(), "nonexistent", "Could not find 'nonexistent'.")
+        self.call(
+            extended_room.CmdExtendedRoomLook(), "nonexistent", "Could not find 'nonexistent'."
+        )
 
     def test_cmdsetdetail(self):
         self.call(extended_room.CmdExtendedRoomDetail(), "", "Details on Room")
-        self.call(extended_room.CmdExtendedRoomDetail(), "thingie = newdetail with spaces",
-                "Detail set 'thingie': 'newdetail with spaces'")
+        self.call(
+            extended_room.CmdExtendedRoomDetail(),
+            "thingie = newdetail with spaces",
+            "Detail set 'thingie': 'newdetail with spaces'",
+        )
         self.call(extended_room.CmdExtendedRoomDetail(), "thingie", "Detail 'thingie' on Room:\n")
-        self.call(extended_room.CmdExtendedRoomDetail(), "/del thingie", "Detail thingie deleted, if it existed.", cmdstring="detail")
+        self.call(
+            extended_room.CmdExtendedRoomDetail(),
+            "/del thingie",
+            "Detail thingie deleted, if it existed.",
+            cmdstring="detail",
+        )
         self.call(extended_room.CmdExtendedRoomDetail(), "thingie", "Detail 'thingie' not found.")
 
         # Test with aliases
         self.call(extended_room.CmdExtendedRoomDetail(), "", "Details on Room")
-        self.call(extended_room.CmdExtendedRoomDetail(), "thingie;other;stuff = newdetail with spaces",
-                "Detail set 'thingie;other;stuff': 'newdetail with spaces'")
+        self.call(
+            extended_room.CmdExtendedRoomDetail(),
+            "thingie;other;stuff = newdetail with spaces",
+            "Detail set 'thingie;other;stuff': 'newdetail with spaces'",
+        )
         self.call(extended_room.CmdExtendedRoomDetail(), "thingie", "Detail 'thingie' on Room:\n")
         self.call(extended_room.CmdExtendedRoomDetail(), "other", "Detail 'other' on Room:\n")
         self.call(extended_room.CmdExtendedRoomDetail(), "stuff", "Detail 'stuff' on Room:\n")
-        self.call(extended_room.CmdExtendedRoomDetail(), "/del other;stuff", "Detail other;stuff deleted, if it existed.")
+        self.call(
+            extended_room.CmdExtendedRoomDetail(),
+            "/del other;stuff",
+            "Detail other;stuff deleted, if it existed.",
+        )
         self.call(extended_room.CmdExtendedRoomDetail(), "other", "Detail 'other' not found.")
         self.call(extended_room.CmdExtendedRoomDetail(), "stuff", "Detail 'stuff' not found.")
 
@@ -287,7 +339,6 @@ def test_cmdgametime(self):
 
 
 class TestBarter(CommandTest):
-
     def setUp(self):
         super().setUp()
         self.tradeitem1 = create_object(key="TradeItem1", location=self.char1)
@@ -340,31 +391,91 @@ def test_tradehandler_offers(self):
         self.assertEqual(self.tradeitem3.location, self.char1)
 
     def test_cmdtrade(self):
-        self.call(barter.CmdTrade(), "Char2 : Hey wanna trade?", "You say, \"Hey wanna trade?\"", caller=self.char1)
-        self.call(barter.CmdTrade(), "Char decline : Nope!", "You say, \"Nope!\"", caller=self.char2)
-        self.call(barter.CmdTrade(), "Char2 : Hey wanna trade?", "You say, \"Hey wanna trade?\"", caller=self.char1)
-        self.call(barter.CmdTrade(), "Char accept : Sure!", "You say, \"Sure!\"", caller=self.char2)
-        self.call(barter.CmdOffer(), "TradeItem3", "Your trade action: You offer TradeItem3", caller=self.char2)
-        self.call(barter.CmdOffer(), "TradeItem1 : Here's my offer.", "You say, \"Here's my offer.\"\n  [You offer TradeItem1]")
-        self.call(barter.CmdAccept(), "", "Your trade action: You accept the offer. Char2 must now also accept")
-        self.call(barter.CmdDecline(), "", "Your trade action: You change your mind, declining the current offer.")
-        self.call(barter.CmdAccept(), ": Sounds good.", "You say, \"Sounds good.\"\n"
-                                      "  [You accept the offer. Char must now also accept.", caller=self.char2)
-        self.call(barter.CmdDecline(), ":No way!", "You say, \"No way!\"\n  [You change your mind, declining the current offer.]", caller=self.char2)
-        self.call(barter.CmdOffer(), "TradeItem1, TradeItem2 : My final offer!", "You say, \"My final offer!\"\n  [You offer TradeItem1 and TradeItem2]")
-        self.call(barter.CmdAccept(), "", "Your trade action: You accept the offer. Char2 must now also accept.", caller=self.char1)
+        self.call(
+            barter.CmdTrade(),
+            "Char2 : Hey wanna trade?",
+            'You say, "Hey wanna trade?"',
+            caller=self.char1,
+        )
+        self.call(barter.CmdTrade(), "Char decline : Nope!", 'You say, "Nope!"', caller=self.char2)
+        self.call(
+            barter.CmdTrade(),
+            "Char2 : Hey wanna trade?",
+            'You say, "Hey wanna trade?"',
+            caller=self.char1,
+        )
+        self.call(barter.CmdTrade(), "Char accept : Sure!", 'You say, "Sure!"', caller=self.char2)
+        self.call(
+            barter.CmdOffer(),
+            "TradeItem3",
+            "Your trade action: You offer TradeItem3",
+            caller=self.char2,
+        )
+        self.call(
+            barter.CmdOffer(),
+            "TradeItem1 : Here's my offer.",
+            'You say, "Here\'s my offer."\n  [You offer TradeItem1]',
+        )
+        self.call(
+            barter.CmdAccept(),
+            "",
+            "Your trade action: You accept the offer. Char2 must now also accept",
+        )
+        self.call(
+            barter.CmdDecline(),
+            "",
+            "Your trade action: You change your mind, declining the current offer.",
+        )
+        self.call(
+            barter.CmdAccept(),
+            ": Sounds good.",
+            'You say, "Sounds good."\n' "  [You accept the offer. Char must now also accept.",
+            caller=self.char2,
+        )
+        self.call(
+            barter.CmdDecline(),
+            ":No way!",
+            'You say, "No way!"\n  [You change your mind, declining the current offer.]',
+            caller=self.char2,
+        )
+        self.call(
+            barter.CmdOffer(),
+            "TradeItem1, TradeItem2 : My final offer!",
+            'You say, "My final offer!"\n  [You offer TradeItem1 and TradeItem2]',
+        )
+        self.call(
+            barter.CmdAccept(),
+            "",
+            "Your trade action: You accept the offer. Char2 must now also accept.",
+            caller=self.char1,
+        )
         self.call(barter.CmdStatus(), "", "Offered by Char:", caller=self.char2)
         self.tradeitem1.db.desc = "A great offer."
         self.call(barter.CmdEvaluate(), "TradeItem1", "A great offer.")
-        self.call(barter.CmdAccept(), ":Ok then.", "You say, \"Ok then.\"\n  [You accept the deal.", caller=self.char2)
+        self.call(
+            barter.CmdAccept(),
+            ":Ok then.",
+            'You say, "Ok then."\n  [You accept the deal.',
+            caller=self.char2,
+        )
         self.assertEqual(self.tradeitem1.location, self.char2)
         self.assertEqual(self.tradeitem2.location, self.char2)
         self.assertEqual(self.tradeitem3.location, self.char1)
 
     def test_cmdtradehelp(self):
-        self.call(barter.CmdTrade(), "Char2 : Hey wanna trade?", "You say, \"Hey wanna trade?\"", caller=self.char1)
+        self.call(
+            barter.CmdTrade(),
+            "Char2 : Hey wanna trade?",
+            'You say, "Hey wanna trade?"',
+            caller=self.char1,
+        )
         self.call(barter.CmdTradeHelp(), "", "Trading commands\n", caller=self.char1)
-        self.call(barter.CmdFinish(), ": Ending.", "You say, \"Ending.\"\n  [You aborted trade. No deal was made.]")
+        self.call(
+            barter.CmdFinish(),
+            ": Ending.",
+            'You say, "Ending."\n  [You aborted trade. No deal was made.]',
+        )
+
 
 # Test wilderness
 
@@ -374,7 +485,6 @@ def test_cmdtradehelp(self):
 
 
 class TestWilderness(EvenniaTest):
-
     def setUp(self):
         super().setUp()
         self.char1 = create_object(DefaultCharacter, key="char1")
@@ -421,10 +531,11 @@ def test_wilderness_correct_exits(self):
 
         # By default we enter at a corner (0, 0), so only a few exits should
         # be visible / traversable
-        exits = [i for i in self.char1.location.contents
-                 if i.destination and (
-                     i.access(self.char1, "view") or
-                     i.access(self.char1, "traverse"))]
+        exits = [
+            i
+            for i in self.char1.location.contents
+            if i.destination and (i.access(self.char1, "view") or i.access(self.char1, "traverse"))
+        ]
 
         self.assertEqual(len(exits), 3)
         exitsok = ["north", "northeast", "east"]
@@ -434,13 +545,22 @@ def test_wilderness_correct_exits(self):
         # If we move to another location not on an edge, then all directions
         # should be visible / traversable
         wilderness.enter_wilderness(self.char1, coordinates=(1, 1))
-        exits = [i for i in self.char1.location.contents
-                 if i.destination and (
-                     i.access(self.char1, "view") or
-                     i.access(self.char1, "traverse"))]
+        exits = [
+            i
+            for i in self.char1.location.contents
+            if i.destination and (i.access(self.char1, "view") or i.access(self.char1, "traverse"))
+        ]
         self.assertEqual(len(exits), 8)
-        exitsok = ["north", "northeast", "east", "southeast", "south",
-                   "southwest", "west", "northwest"]
+        exitsok = [
+            "north",
+            "northeast",
+            "east",
+            "southeast",
+            "south",
+            "southwest",
+            "west",
+            "northwest",
+        ]
         for each_exit in exitsok:
             self.assertTrue(any([e for e in exits if e.key == each_exit]))
 
@@ -477,14 +597,16 @@ def test_room_creation(self):
 
     def test_get_new_coordinates(self):
         loc = (1, 1)
-        directions = {"north": (1, 2),
-                      "northeast": (2, 2),
-                      "east": (2, 1),
-                      "southeast": (2, 0),
-                      "south": (1, 0),
-                      "southwest": (0, 0),
-                      "west": (0, 1),
-                      "northwest": (0, 2)}
+        directions = {
+            "north": (1, 2),
+            "northeast": (2, 2),
+            "east": (2, 1),
+            "southeast": (2, 0),
+            "south": (1, 0),
+            "southwest": (0, 0),
+            "west": (0, 1),
+            "northwest": (0, 2),
+        }
         for direction, correct_loc in directions.items():  # Not compatible with Python 3
             new_loc = wilderness.get_new_coordinates(loc, direction)
             self.assertEqual(new_loc, correct_loc, direction)
@@ -495,16 +617,37 @@ def test_get_new_coordinates(self):
 
 
 class TestChargen(CommandTest):
-
     def test_ooclook(self):
-        self.call(chargen.CmdOOCLook(), "foo", "You have no characters to look at", caller=self.account)
-        self.call(chargen.CmdOOCLook(), "", "You, TestAccount, are an OOC ghost without form.", caller=self.account)
+        self.call(
+            chargen.CmdOOCLook(), "foo", "You have no characters to look at", caller=self.account
+        )
+        self.call(
+            chargen.CmdOOCLook(),
+            "",
+            "You, TestAccount, are an OOC ghost without form.",
+            caller=self.account,
+        )
 
     def test_charcreate(self):
-        self.call(chargen.CmdOOCCharacterCreate(), "testchar", "The character testchar was successfully created!", caller=self.account)
-        self.call(chargen.CmdOOCCharacterCreate(), "testchar", "Character testchar already exists.", caller=self.account)
+        self.call(
+            chargen.CmdOOCCharacterCreate(),
+            "testchar",
+            "The character testchar was successfully created!",
+            caller=self.account,
+        )
+        self.call(
+            chargen.CmdOOCCharacterCreate(),
+            "testchar",
+            "Character testchar already exists.",
+            caller=self.account,
+        )
         self.assertTrue(self.account.db._character_dbrefs)
-        self.call(chargen.CmdOOCLook(), "", "You, TestAccount, are an OOC ghost without form.", caller=self.account)
+        self.call(
+            chargen.CmdOOCLook(),
+            "",
+            "You, TestAccount, are an OOC ghost without form.",
+            caller=self.account,
+        )
         self.call(chargen.CmdOOCLook(), "testchar", "testchar(", caller=self.account)
 
 
@@ -513,7 +656,6 @@ def test_charcreate(self):
 
 
 class TestClothingCmd(CommandTest):
-
     def test_clothingcommands(self):
         wearer = create_object(clothing.ClothedCharacter, key="Wearer")
         friend = create_object(clothing.ClothedCharacter, key="Friend")
@@ -522,23 +664,45 @@ def test_clothingcommands(self):
         friend.location = room
         # Make a test hat
         test_hat = create_object(clothing.Clothing, key="test hat")
-        test_hat.db.clothing_type = 'hat'
+        test_hat.db.clothing_type = "hat"
         test_hat.location = wearer
         # Make a test scarf
         test_scarf = create_object(clothing.Clothing, key="test scarf")
-        test_scarf.db.clothing_type = 'accessory'
+        test_scarf.db.clothing_type = "accessory"
         test_scarf.location = wearer
         # Test wear command
         self.call(clothing.CmdWear(), "", "Usage: wear <obj> [wear style]", caller=wearer)
         self.call(clothing.CmdWear(), "hat", "Wearer puts on test hat.", caller=wearer)
-        self.call(clothing.CmdWear(), "scarf stylishly", "Wearer wears test scarf stylishly.", caller=wearer)
+        self.call(
+            clothing.CmdWear(),
+            "scarf stylishly",
+            "Wearer wears test scarf stylishly.",
+            caller=wearer,
+        )
         # Test cover command.
-        self.call(clothing.CmdCover(), "", "Usage: cover <worn clothing> [with] <clothing object>", caller=wearer)
-        self.call(clothing.CmdCover(), "hat with scarf", "Wearer covers test hat with test scarf.", caller=wearer)
+        self.call(
+            clothing.CmdCover(),
+            "",
+            "Usage: cover <worn clothing> [with] <clothing object>",
+            caller=wearer,
+        )
+        self.call(
+            clothing.CmdCover(),
+            "hat with scarf",
+            "Wearer covers test hat with test scarf.",
+            caller=wearer,
+        )
         # Test remove command.
         self.call(clothing.CmdRemove(), "", "Could not find ''.", caller=wearer)
-        self.call(clothing.CmdRemove(), "hat", "You have to take off test scarf first.", caller=wearer)
-        self.call(clothing.CmdRemove(), "scarf", "Wearer removes test scarf, revealing test hat.", caller=wearer)
+        self.call(
+            clothing.CmdRemove(), "hat", "You have to take off test scarf first.", caller=wearer
+        )
+        self.call(
+            clothing.CmdRemove(),
+            "scarf",
+            "Wearer removes test scarf, revealing test hat.",
+            caller=wearer,
+        )
         # Test uncover command.
         test_scarf.wear(wearer, True)
         test_hat.db.covered_by = test_scarf
@@ -547,36 +711,49 @@ def test_clothingcommands(self):
         # Test drop command.
         test_hat.db.covered_by = test_scarf
         self.call(clothing.CmdDrop(), "", "Drop what?", caller=wearer)
-        self.call(clothing.CmdDrop(), "hat", "You can't drop that because it's covered by test scarf.", caller=wearer)
+        self.call(
+            clothing.CmdDrop(),
+            "hat",
+            "You can't drop that because it's covered by test scarf.",
+            caller=wearer,
+        )
         self.call(clothing.CmdDrop(), "scarf", "You drop test scarf.", caller=wearer)
         # Test give command.
-        self.call(clothing.CmdGive(), "", "Usage: give <inventory object> = <target>", caller=wearer)
-        self.call(clothing.CmdGive(), "hat = Friend", "Wearer removes test hat.|You give test hat to Friend.", caller=wearer)
+        self.call(
+            clothing.CmdGive(), "", "Usage: give <inventory object> = <target>", caller=wearer
+        )
+        self.call(
+            clothing.CmdGive(),
+            "hat = Friend",
+            "Wearer removes test hat.|You give test hat to Friend.",
+            caller=wearer,
+        )
         # Test inventory command.
-        self.call(clothing.CmdInventory(), "", "You are not carrying or wearing anything.", caller=wearer)
+        self.call(
+            clothing.CmdInventory(), "", "You are not carrying or wearing anything.", caller=wearer
+        )
 
 
 class TestClothingFunc(EvenniaTest):
-
     def test_clothingfunctions(self):
         wearer = create_object(clothing.ClothedCharacter, key="Wearer")
         room = create_object(DefaultRoom, key="room")
         wearer.location = room
         # Make a test hat
         test_hat = create_object(clothing.Clothing, key="test hat")
-        test_hat.db.clothing_type = 'hat'
+        test_hat.db.clothing_type = "hat"
         test_hat.location = wearer
         # Make a test shirt
         test_shirt = create_object(clothing.Clothing, key="test shirt")
-        test_shirt.db.clothing_type = 'top'
+        test_shirt.db.clothing_type = "top"
         test_shirt.location = wearer
         # Make a test pants
         test_pants = create_object(clothing.Clothing, key="test pants")
-        test_pants.db.clothing_type = 'bottom'
+        test_pants.db.clothing_type = "bottom"
         test_pants.location = wearer
 
-        test_hat.wear(wearer, 'on the head')
-        self.assertEqual(test_hat.db.worn, 'on the head')
+        test_hat.wear(wearer, "on the head")
+        self.assertEqual(test_hat.db.worn, "on the head")
 
         test_hat.remove(wearer)
         self.assertEqual(test_hat.db.worn, False)
@@ -586,16 +763,19 @@ def test_clothingfunctions(self):
         self.assertEqual(test_hat.db.worn, False)
 
         clothes_list = [test_shirt, test_hat, test_pants]
-        self.assertEqual(clothing.order_clothes_list(clothes_list), [test_hat, test_shirt, test_pants])
+        self.assertEqual(
+            clothing.order_clothes_list(clothes_list), [test_hat, test_shirt, test_pants]
+        )
 
         test_hat.wear(wearer, True)
         test_pants.wear(wearer, True)
         self.assertEqual(clothing.get_worn_clothes(wearer), [test_hat, test_pants])
 
-        self.assertEqual(clothing.clothing_type_count(clothes_list), {'hat': 1, 'top': 1, 'bottom': 1})
-
-        self.assertEqual(clothing.single_type_count(clothes_list, 'hat'), 1)
+        self.assertEqual(
+            clothing.clothing_type_count(clothes_list), {"hat": 1, "top": 1, "bottom": 1}
+        )
 
+        self.assertEqual(clothing.single_type_count(clothes_list, "hat"), 1)
 
 
 # Testing custom_gametime
@@ -606,7 +786,7 @@ def _testcallback():
     pass
 
 
-@patch('evennia.utils.gametime.gametime', new=Mock(return_value=2975000898.46))
+@patch("evennia.utils.gametime.gametime", new=Mock(return_value=2975000898.46))
 class TestCustomGameTime(EvenniaTest):
     def tearDown(self):
         if hasattr(self, "timescript"):
@@ -619,42 +799,57 @@ def test_time_to_tuple(self):
 
     def test_gametime_to_realtime(self):
         self.assertEqual(custom_gametime.gametime_to_realtime(days=2, mins=4), 86520.0)
-        self.assertEqual(custom_gametime.gametime_to_realtime(format=True, days=2), (0, 0, 0, 1, 0, 0, 0))
+        self.assertEqual(
+            custom_gametime.gametime_to_realtime(format=True, days=2), (0, 0, 0, 1, 0, 0, 0)
+        )
 
     def test_realtime_to_gametime(self):
         self.assertEqual(custom_gametime.realtime_to_gametime(days=2, mins=34), 349680.0)
-        self.assertEqual(custom_gametime.realtime_to_gametime(days=2, mins=34, format=True), (0, 0, 0, 4, 1, 8, 0))
-        self.assertEqual(custom_gametime.realtime_to_gametime(format=True, days=2, mins=4), (0, 0, 0, 4, 0, 8, 0))
+        self.assertEqual(
+            custom_gametime.realtime_to_gametime(days=2, mins=34, format=True),
+            (0, 0, 0, 4, 1, 8, 0),
+        )
+        self.assertEqual(
+            custom_gametime.realtime_to_gametime(format=True, days=2, mins=4), (0, 0, 0, 4, 0, 8, 0)
+        )
 
     def test_custom_gametime(self):
         self.assertEqual(custom_gametime.custom_gametime(), (102, 5, 2, 6, 21, 8, 18))
         self.assertEqual(custom_gametime.custom_gametime(absolute=True), (102, 5, 2, 6, 21, 8, 18))
 
     def test_real_seconds_until(self):
-        self.assertEqual(custom_gametime.real_seconds_until(year=2300, month=11, day=6), 31911667199.77)
+        self.assertEqual(
+            custom_gametime.real_seconds_until(year=2300, month=11, day=6), 31911667199.77
+        )
 
     def test_schedule(self):
         self.timescript = custom_gametime.schedule(_testcallback, repeat=True, min=5, sec=0)
         self.assertEqual(self.timescript.interval, 1700.7699999809265)
 
+
 # Test dice module
 
 
-@patch('random.randint', return_value=5)
+@patch("random.randint", return_value=5)
 class TestDice(CommandTest):
     def test_roll_dice(self, mocked_randint):
         # we must import dice here for the mocked randint to apply correctly.
         from evennia.contrib import dice
-        self.assertEqual(dice.roll_dice(6, 6, modifier=('+', 4)), mocked_randint() * 6 + 4)
-        self.assertEqual(dice.roll_dice(6, 6, conditional=('<', 35)), True)
-        self.assertEqual(dice.roll_dice(6, 6, conditional=('>', 33)), False)
+
+        self.assertEqual(dice.roll_dice(6, 6, modifier=("+", 4)), mocked_randint() * 6 + 4)
+        self.assertEqual(dice.roll_dice(6, 6, conditional=("<", 35)), True)
+        self.assertEqual(dice.roll_dice(6, 6, conditional=(">", 33)), False)
 
     def test_cmddice(self, mocked_randint):
         from evennia.contrib import dice
-        self.call(dice.CmdDice(), "3d6 + 4", "You roll 3d6 + 4.| Roll(s): 5, 5 and 5. Total result is 19.")
+
+        self.call(
+            dice.CmdDice(), "3d6 + 4", "You roll 3d6 + 4.| Roll(s): 5, 5 and 5. Total result is 19."
+        )
         self.call(dice.CmdDice(), "100000d1000", "The maximum roll allowed is 10000d10000.")
         self.call(dice.CmdDice(), "/secret 3d6 + 4", "You roll 3d6 + 4 (secret, not echoed).")
 
+
 # Test email-login
 
 
@@ -663,9 +858,22 @@ def test_cmddice(self, mocked_randint):
 
 class TestEmailLogin(CommandTest):
     def test_connect(self):
-        self.call(email_login.CmdUnconnectedConnect(), "mytest@test.com test", "The email 'mytest@test.com' does not match any accounts.")
-        self.call(email_login.CmdUnconnectedCreate(), '"mytest" mytest@test.com test11111', "A new account 'mytest' was created. Welcome!")
-        self.call(email_login.CmdUnconnectedConnect(), "mytest@test.com test11111", "", caller=self.account.sessions.get()[0])
+        self.call(
+            email_login.CmdUnconnectedConnect(),
+            "mytest@test.com test",
+            "The email 'mytest@test.com' does not match any accounts.",
+        )
+        self.call(
+            email_login.CmdUnconnectedCreate(),
+            '"mytest" mytest@test.com test11111',
+            "A new account 'mytest' was created. Welcome!",
+        )
+        self.call(
+            email_login.CmdUnconnectedConnect(),
+            "mytest@test.com test11111",
+            "",
+            caller=self.account.sessions.get()[0],
+        )
 
     def test_quit(self):
         self.call(email_login.CmdUnconnectedQuit(), "", "", caller=self.account.sessions.get()[0])
@@ -676,6 +884,7 @@ def test_unconnectedlook(self):
     def test_unconnectedhelp(self):
         self.call(email_login.CmdUnconnectedHelp(), "", "You are not yet logged into the game.")
 
+
 # test gendersub contrib
 
 
@@ -691,29 +900,54 @@ def test_setgender(self):
     def test_gendercharacter(self):
         char = create_object(gendersub.GenderCharacter, key="Gendered", location=self.room1)
         txt = "Test |p gender"
-        self.assertEqual(gendersub._RE_GENDER_PRONOUN.sub(char._get_pronoun, txt), "Test their gender")
+        self.assertEqual(
+            gendersub._RE_GENDER_PRONOUN.sub(char._get_pronoun, txt), "Test their gender"
+        )
+
 
 # test health bar contrib
 
 from evennia.contrib import health_bar
 
+
 class TestHealthBar(EvenniaTest):
     def test_healthbar(self):
-        expected_bar_str = '|[R|w|n|[B|w            test0 / 200test             |n'
-        self.assertEqual(health_bar.display_meter(
-            0, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
+        expected_bar_str = "|[R|w|n|[B|w            test0 / 200test             |n"
+        self.assertEqual(
+            health_bar.display_meter(
+                0, 200, length=40, pre_text="test", post_text="test", align="center"
+            ),
+            expected_bar_str,
+        )
         expected_bar_str = "|[R|w     |n|[B|w       test24 / 200test            |n"
-        self.assertEqual(health_bar.display_meter(
-            24, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
-        expected_bar_str = '|[Y|w           test100 /|n|[B|w 200test            |n'
-        self.assertEqual(health_bar.display_meter(
-            100, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
-        expected_bar_str = '|[G|w           test180 / 200test        |n|[B|w    |n'
-        self.assertEqual(health_bar.display_meter(
-            180, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
-        expected_bar_str = '|[G|w           test200 / 200test            |n|[B|w|n'
-        self.assertEqual(health_bar.display_meter(
-            200, 200, length=40, pre_text="test", post_text="test", align="center"), expected_bar_str)
+        self.assertEqual(
+            health_bar.display_meter(
+                24, 200, length=40, pre_text="test", post_text="test", align="center"
+            ),
+            expected_bar_str,
+        )
+        expected_bar_str = "|[Y|w           test100 /|n|[B|w 200test            |n"
+        self.assertEqual(
+            health_bar.display_meter(
+                100, 200, length=40, pre_text="test", post_text="test", align="center"
+            ),
+            expected_bar_str,
+        )
+        expected_bar_str = "|[G|w           test180 / 200test        |n|[B|w    |n"
+        self.assertEqual(
+            health_bar.display_meter(
+                180, 200, length=40, pre_text="test", post_text="test", align="center"
+            ),
+            expected_bar_str,
+        )
+        expected_bar_str = "|[G|w           test200 / 200test            |n|[B|w|n"
+        self.assertEqual(
+            health_bar.display_meter(
+                200, 200, length=40, pre_text="test", post_text="test", align="center"
+            ),
+            expected_bar_str,
+        )
+
 
 # test mail contrib
 
@@ -726,19 +960,41 @@ def test_mail(self):
         self.call(mail.CmdMail(), "2", "'2' is not a valid mail id.", caller=self.account)
         self.call(mail.CmdMail(), "test", "'test' is not a valid mail id.", caller=self.account)
         self.call(mail.CmdMail(), "", "There are no messages in your inbox.", caller=self.account)
-        self.call(mail.CmdMailCharacter(), "Char=Message 1", 
-                  "You have received a new @mail from Char|You sent your message.", caller=self.char1)
-        self.call(mail.CmdMailCharacter(), "Char=Message 2", "You sent your message.", caller=self.char2)
-        self.call(mail.CmdMail(), "TestAccount2=Message 2",
-                  "You have received a new @mail from TestAccount2", caller=self.account2)
-        self.call(mail.CmdMail(), "TestAccount=Message 1", "You sent your message.", caller=self.account2)
-        self.call(mail.CmdMail(), "TestAccount=Message 2", "You sent your message.", caller=self.account2)
+        self.call(
+            mail.CmdMailCharacter(),
+            "Char=Message 1",
+            "You have received a new @mail from Char|You sent your message.",
+            caller=self.char1,
+        )
+        self.call(
+            mail.CmdMailCharacter(), "Char=Message 2", "You sent your message.", caller=self.char2
+        )
+        self.call(
+            mail.CmdMail(),
+            "TestAccount2=Message 2",
+            "You have received a new @mail from TestAccount2",
+            caller=self.account2,
+        )
+        self.call(
+            mail.CmdMail(), "TestAccount=Message 1", "You sent your message.", caller=self.account2
+        )
+        self.call(
+            mail.CmdMail(), "TestAccount=Message 2", "You sent your message.", caller=self.account2
+        )
         self.call(mail.CmdMail(), "", "| ID    From              Subject", caller=self.account)
         self.call(mail.CmdMail(), "2", "From: TestAccount2", caller=self.account)
-        self.call(mail.CmdMail(), "/forward TestAccount2 = 1/Forward message", "You sent your message.|Message forwarded.", caller=self.account)
-        self.call(mail.CmdMail(), "/reply 2=Reply Message2", "You sent your message.", caller=self.account)
+        self.call(
+            mail.CmdMail(),
+            "/forward TestAccount2 = 1/Forward message",
+            "You sent your message.|Message forwarded.",
+            caller=self.account,
+        )
+        self.call(
+            mail.CmdMail(), "/reply 2=Reply Message2", "You sent your message.", caller=self.account
+        )
         self.call(mail.CmdMail(), "/delete 2", "Message 2 deleted", caller=self.account)
 
+
 # test map builder contrib
 
 
@@ -747,24 +1003,28 @@ def test_mail(self):
 
 class TestMapBuilder(CommandTest):
     def test_cmdmapbuilder(self):
-        self.call(mapbuilder.CmdMapBuilder(),
-                  "evennia.contrib.mapbuilder.EXAMPLE1_MAP evennia.contrib.mapbuilder.EXAMPLE1_LEGEND",
-                  """Creating Map...|≈≈≈≈≈
+        self.call(
+            mapbuilder.CmdMapBuilder(),
+            "evennia.contrib.mapbuilder.EXAMPLE1_MAP evennia.contrib.mapbuilder.EXAMPLE1_LEGEND",
+            """Creating Map...|≈≈≈≈≈
 ≈♣n♣≈
 ≈∩▲∩≈
 ≈♠n♠≈
 ≈≈≈≈≈
-|Creating Landmass...|""")
-        self.call(mapbuilder.CmdMapBuilder(),
-                  "evennia.contrib.mapbuilder.EXAMPLE2_MAP evennia.contrib.mapbuilder.EXAMPLE2_LEGEND",
-                  """Creating Map...|≈ ≈ ≈ ≈ ≈
+|Creating Landmass...|""",
+        )
+        self.call(
+            mapbuilder.CmdMapBuilder(),
+            "evennia.contrib.mapbuilder.EXAMPLE2_MAP evennia.contrib.mapbuilder.EXAMPLE2_LEGEND",
+            """Creating Map...|≈ ≈ ≈ ≈ ≈
 
 ≈ ♣-♣-♣ ≈
     ≈ ♣ ♣ ♣ ≈
   ≈ ♣-♣-♣ ≈
 
 ≈ ≈ ≈ ≈ ≈
-|Creating Landmass...|""")
+|Creating Landmass...|""",
+        )
 
 
 # test menu_login
@@ -785,16 +1045,36 @@ def test_cmdunloggedlook(self):
 class TestMultidescer(CommandTest):
     def test_cmdmultidesc(self):
         self.call(multidescer.CmdMultiDesc(), "/list", "Stored descs:\ncaller:")
-        self.call(multidescer.CmdMultiDesc(), "test = Desc 1", "Stored description 'test': \"Desc 1\"")
-        self.call(multidescer.CmdMultiDesc(), "test2 = Desc 2", "Stored description 'test2': \"Desc 2\"")
-        self.call(multidescer.CmdMultiDesc(), "/swap test-test2", "Swapped descs 'test' and 'test2'.")
-        self.call(multidescer.CmdMultiDesc(), "test3 = Desc 3init", "Stored description 'test3': \"Desc 3init\"")
-        self.call(multidescer.CmdMultiDesc(), "/list", "Stored descs:\ntest3: Desc 3init\ntest: Desc 1\ntest2: Desc 2\ncaller:")
-        self.call(multidescer.CmdMultiDesc(), "test3 = Desc 3", "Stored description 'test3': \"Desc 3\"")
-        self.call(multidescer.CmdMultiDesc(), "/set test1 + test2 + + test3", "test1 Desc 2 Desc 3\n\n"
-                  "The above was set as the current description.")
+        self.call(
+            multidescer.CmdMultiDesc(), "test = Desc 1", "Stored description 'test': \"Desc 1\""
+        )
+        self.call(
+            multidescer.CmdMultiDesc(), "test2 = Desc 2", "Stored description 'test2': \"Desc 2\""
+        )
+        self.call(
+            multidescer.CmdMultiDesc(), "/swap test-test2", "Swapped descs 'test' and 'test2'."
+        )
+        self.call(
+            multidescer.CmdMultiDesc(),
+            "test3 = Desc 3init",
+            "Stored description 'test3': \"Desc 3init\"",
+        )
+        self.call(
+            multidescer.CmdMultiDesc(),
+            "/list",
+            "Stored descs:\ntest3: Desc 3init\ntest: Desc 1\ntest2: Desc 2\ncaller:",
+        )
+        self.call(
+            multidescer.CmdMultiDesc(), "test3 = Desc 3", "Stored description 'test3': \"Desc 3\""
+        )
+        self.call(
+            multidescer.CmdMultiDesc(),
+            "/set test1 + test2 + + test3",
+            "test1 Desc 2 Desc 3\n\n" "The above was set as the current description.",
+        )
         self.assertEqual(self.char1.db.desc, "test1 Desc 2 Desc 3")
 
+
 # test simpledoor contrib
 
 
@@ -803,18 +1083,30 @@ def test_cmdmultidesc(self):
 
 class TestSimpleDoor(CommandTest):
     def test_cmdopen(self):
-        self.call(simpledoor.CmdOpen(), "newdoor;door:contrib.simpledoor.SimpleDoor,backdoor;door = Room2",
-                  "Created new Exit 'newdoor' from Room to Room2 (aliases: door).|Note: A door-type exit was "
-                  "created - ignored eventual custom return-exit type.|Created new Exit 'newdoor' from Room2 to Room (aliases: door).")
+        self.call(
+            simpledoor.CmdOpen(),
+            "newdoor;door:contrib.simpledoor.SimpleDoor,backdoor;door = Room2",
+            "Created new Exit 'newdoor' from Room to Room2 (aliases: door).|Note: A door-type exit was "
+            "created - ignored eventual custom return-exit type.|Created new Exit 'newdoor' from Room2 to Room (aliases: door).",
+        )
         self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "You close newdoor.", cmdstring="close")
-        self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "newdoor is already closed.", cmdstring="close")
+        self.call(
+            simpledoor.CmdOpenCloseDoor(),
+            "newdoor",
+            "newdoor is already closed.",
+            cmdstring="close",
+        )
         self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "You open newdoor.", cmdstring="open")
-        self.call(simpledoor.CmdOpenCloseDoor(), "newdoor", "newdoor is already open.", cmdstring="open")
+        self.call(
+            simpledoor.CmdOpenCloseDoor(), "newdoor", "newdoor is already open.", cmdstring="open"
+        )
+
 
 # test slow_exit contrib
 
 
 from evennia.contrib import slow_exit
+
 slow_exit.MOVE_DELAY = {"stroll": 0, "walk": 0, "run": 0, "sprint": 0}
 
 
@@ -822,10 +1114,13 @@ def _cancellable_mockdelay(time, callback, *args, **kwargs):
     callback(*args, **kwargs)
     return Mock()
 
+
 class TestSlowExit(CommandTest):
     @patch("evennia.utils.delay", _cancellable_mockdelay)
     def test_exit(self):
-        exi = create_object(slow_exit.SlowExit, key="slowexit", location=self.room1, destination=self.room2)
+        exi = create_object(
+            slow_exit.SlowExit, key="slowexit", location=self.room1, destination=self.room2
+        )
         exi.at_traverse(self.char1, self.room2)
         self.call(slow_exit.CmdSetSpeed(), "walk", "You are now walking.")
         self.call(slow_exit.CmdStop(), "", "You stop moving.")
@@ -862,6 +1157,7 @@ def test_mob(self):
         mobobj._set_ticker(0, "foo", stop=True)
         # TODO should be expanded with further tests of the modes and damage etc.
 
+
 #  test tutorial_world/objects
 
 
@@ -870,26 +1166,33 @@ def test_mob(self):
 from twisted.trial.unittest import TestCase as TwistedTestCase
 
 from twisted.internet.base import DelayedCall
+
 DelayedCall.debug = True
 
 
 class TestTutorialWorldObjects(TwistedTestCase, CommandTest):
-
     def test_tutorialobj(self):
         obj1 = create_object(tutobjects.TutorialObject, key="tutobj")
         obj1.reset()
         self.assertEqual(obj1.location, obj1.home)
 
     def test_readable(self):
-        readable = create_object(tutobjects.Readable, key="book", location=self.room1)
+        readable = create_object(tutobjects.TutorialReadable, key="book", location=self.room1)
         readable.db.readable_text = "Text to read"
         self.call(tutobjects.CmdRead(), "book", "You read book:\n  Text to read", obj=readable)
 
-
     def test_climbable(self):
-        climbable = create_object(tutobjects.Climbable, key="tree", location=self.room1)
-        self.call(tutobjects.CmdClimb(), "tree", "You climb tree. Having looked around, you climb down again.", obj=climbable)
-        self.assertEqual(self.char1.tags.get("tutorial_climbed_tree", category="tutorial_world"), "tutorial_climbed_tree")
+        climbable = create_object(tutobjects.TutorialClimbable, key="tree", location=self.room1)
+        self.call(
+            tutobjects.CmdClimb(),
+            "tree",
+            "You climb tree. Having looked around, you climb down again.",
+            obj=climbable,
+        )
+        self.assertEqual(
+            self.char1.tags.get("tutorial_climbed_tree", category="tutorial_world"),
+            "tutorial_climbed_tree",
+        )
 
     def test_obelisk(self):
         obelisk = create_object(tutobjects.Obelisk, key="obelisk", location=self.room1)
@@ -899,7 +1202,12 @@ def test_obelisk(self):
     @patch("evennia.scripts.taskhandler.deferLater", mockdeferLater)
     def test_lightsource(self):
         light = create_object(tutobjects.LightSource, key="torch", location=self.room1)
-        self.call(tutobjects.CmdLight(), "", "A torch on the floor flickers and dies.|You light torch.", obj=light)
+        self.call(
+            tutobjects.CmdLight(),
+            "",
+            "A torch on the floor flickers and dies.|You light torch.",
+            obj=light,
+        )
         self.assertFalse(light.pk)
 
     @patch("evennia.contrib.tutorial_world.objects.delay", mockdelay)
@@ -910,24 +1218,48 @@ def test_crumblingwall(self):
         self.assertFalse(wall.db.button_exposed)
         self.assertFalse(wall.db.exit_open)
         wall.db.root_pos = {"yellow": 0, "green": 0, "red": 0, "blue": 0}
-        self.call(tutobjects.CmdShiftRoot(), "blue root right",
-                  "You shove the root adorned with small blue flowers to the right.", obj=wall)
-        self.call(tutobjects.CmdShiftRoot(), "red root left",
-                  "You shift the reddish root to the left.", obj=wall)
-        self.call(tutobjects.CmdShiftRoot(), "yellow root down",
-                  "You shove the root adorned with small yellow flowers downwards.", obj=wall)
-        self.call(tutobjects.CmdShiftRoot(), "green root up",
-                  "You shift the weedy green root upwards.|Holding aside the root you think you notice something behind it ...", obj=wall)
-        self.call(tutobjects.CmdPressButton(), "",
-                  "You move your fingers over the suspicious depression, then gives it a decisive push. First", obj=wall)
+        self.call(
+            tutobjects.CmdShiftRoot(),
+            "blue root right",
+            "You shove the root adorned with small blue flowers to the right.",
+            obj=wall,
+        )
+        self.call(
+            tutobjects.CmdShiftRoot(),
+            "red root left",
+            "You shift the reddish root to the left.",
+            obj=wall,
+        )
+        self.call(
+            tutobjects.CmdShiftRoot(),
+            "yellow root down",
+            "You shove the root adorned with small yellow flowers downwards.",
+            obj=wall,
+        )
+        self.call(
+            tutobjects.CmdShiftRoot(),
+            "green root up",
+            "You shift the weedy green root upwards.|Holding aside the root you think you notice something behind it ...",
+            obj=wall,
+        )
+        self.call(
+            tutobjects.CmdPressButton(),
+            "",
+            "You move your fingers over the suspicious depression, then gives it a decisive push. First",
+            obj=wall,
+        )
         # we patch out the delay, so these are closed immediately
         self.assertFalse(wall.db.button_exposed)
         self.assertFalse(wall.db.exit_open)
- 
+
     def test_weapon(self):
         weapon = create_object(tutobjects.Weapon, key="sword", location=self.char1)
-        self.call(tutobjects.CmdAttack(), "Char", "You stab with sword.", obj=weapon, cmdstring="stab")
-        self.call(tutobjects.CmdAttack(), "Char", "You slash with sword.", obj=weapon, cmdstring="slash")
+        self.call(
+            tutobjects.CmdAttack(), "Char", "You stab with sword.", obj=weapon, cmdstring="stab"
+        )
+        self.call(
+            tutobjects.CmdAttack(), "Char", "You slash with sword.", obj=weapon, cmdstring="slash"
+        )
 
     def test_weaponrack(self):
         rack = create_object(tutobjects.WeaponRack, key="rack", location=self.room1)
@@ -944,7 +1276,12 @@ def test_cmdtutorial(self):
         room = create_object(tutrooms.TutorialRoom, key="tutroom")
         self.char1.location = room
         self.call(tutrooms.CmdTutorial(), "", "Sorry, there is no tutorial help available here.")
-        self.call(tutrooms.CmdTutorialSetDetail(), "detail;foo;foo2 = A detail", "Detail set: 'detail;foo;foo2': 'A detail'", obj=room)
+        self.call(
+            tutrooms.CmdTutorialSetDetail(),
+            "detail;foo;foo2 = A detail",
+            "Detail set: 'detail;foo;foo2': 'A detail'",
+            obj=room,
+        )
         self.call(tutrooms.CmdTutorialLook(), "", "tutroom(", obj=room)
         self.call(tutrooms.CmdTutorialLook(), "detail", "A detail", obj=room)
         self.call(tutrooms.CmdTutorialLook(), "foo", "A detail", obj=room)
@@ -953,7 +1290,9 @@ def test_cmdtutorial(self):
     def test_weatherroom(self):
         room = create_object(tutrooms.WeatherRoom, key="weatherroom")
         room.update_weather()
-        tutrooms.TICKER_HANDLER.remove(interval=room.db.interval, callback=room.update_weather, idstring="tutorial")
+        tutrooms.TICKER_HANDLER.remove(
+            interval=room.db.interval, callback=room.update_weather, idstring="tutorial"
+        )
         room.delete()
 
     def test_introroom(self):
@@ -964,10 +1303,22 @@ def test_bridgeroom(self):
         room = create_object(tutrooms.BridgeRoom, key="bridgeroom")
         room.update_weather()
         self.char1.move_to(room)
-        self.call(tutrooms.CmdBridgeHelp(), "", "You are trying hard not to fall off the bridge ...", obj=room)
-        self.call(tutrooms.CmdLookBridge(), "", "bridgeroom\nYou are standing very close to the the bridge's western foundation.", obj=room)
+        self.call(
+            tutrooms.CmdBridgeHelp(),
+            "",
+            "You are trying hard not to fall off the bridge ...",
+            obj=room,
+        )
+        self.call(
+            tutrooms.CmdLookBridge(),
+            "",
+            "bridgeroom\nYou are standing very close to the the bridge's western foundation.",
+            obj=room,
+        )
         room.at_object_leave(self.char1, self.room1)
-        tutrooms.TICKER_HANDLER.remove(interval=room.db.interval, callback=room.update_weather, idstring="tutorial")
+        tutrooms.TICKER_HANDLER.remove(
+            interval=room.db.interval, callback=room.update_weather, idstring="tutorial"
+        )
         room.delete()
 
     def test_darkroom(self):
@@ -998,7 +1349,6 @@ def test_turnbattlecmd(self):
 
 
 class TestTurnBattleEquipCmd(CommandTest):
-
     def setUp(self):
         super(TestTurnBattleEquipCmd, self).setUp()
         self.testweapon = create_object(tb_equip.TBEWeapon, key="test weapon")
@@ -1038,7 +1388,6 @@ def test_turnbattlerangecmd(self):
 
 
 class TestTurnBattleItemsCmd(CommandTest):
-
     def setUp(self):
         super(TestTurnBattleItemsCmd, self).setUp()
         self.testitem = create_object(key="test item")
@@ -1071,12 +1420,15 @@ def test_turnbattlemagiccmd(self):
 
 
 class TestTurnBattleBasicFunc(EvenniaTest):
-
     def setUp(self):
         super(TestTurnBattleBasicFunc, self).setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
-        self.attacker = create_object(tb_basic.TBBasicCharacter, key="Attacker", location=self.testroom)
-        self.defender = create_object(tb_basic.TBBasicCharacter, key="Defender", location=self.testroom)
+        self.attacker = create_object(
+            tb_basic.TBBasicCharacter, key="Attacker", location=self.testroom
+        )
+        self.defender = create_object(
+            tb_basic.TBBasicCharacter, key="Defender", location=self.testroom
+        )
         self.joiner = create_object(tb_basic.TBBasicCharacter, key="Joiner", location=None)
 
     def tearDown(self):
@@ -1161,12 +1513,15 @@ def test_tbbasicfunc(self):
 
 
 class TestTurnBattleEquipFunc(EvenniaTest):
-
     def setUp(self):
         super(TestTurnBattleEquipFunc, self).setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
-        self.attacker = create_object(tb_equip.TBEquipCharacter, key="Attacker", location=self.testroom)
-        self.defender = create_object(tb_equip.TBEquipCharacter, key="Defender", location=self.testroom)
+        self.attacker = create_object(
+            tb_equip.TBEquipCharacter, key="Attacker", location=self.testroom
+        )
+        self.defender = create_object(
+            tb_equip.TBEquipCharacter, key="Defender", location=self.testroom
+        )
         self.joiner = create_object(tb_equip.TBEquipCharacter, key="Joiner", location=None)
 
     def tearDown(self):
@@ -1250,12 +1605,15 @@ def test_tbequipfunc(self):
 
 
 class TestTurnBattleRangeFunc(EvenniaTest):
-
     def setUp(self):
         super(TestTurnBattleRangeFunc, self).setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
-        self.attacker = create_object(tb_range.TBRangeCharacter, key="Attacker", location=self.testroom)
-        self.defender = create_object(tb_range.TBRangeCharacter, key="Defender", location=self.testroom)
+        self.attacker = create_object(
+            tb_range.TBRangeCharacter, key="Attacker", location=self.testroom
+        )
+        self.defender = create_object(
+            tb_range.TBRangeCharacter, key="Defender", location=self.testroom
+        )
         self.joiner = create_object(tb_range.TBRangeCharacter, key="Joiner", location=self.testroom)
 
     def tearDown(self):
@@ -1286,7 +1644,9 @@ def test_tbrangefunc(self):
         self.assertTrue(self.defender.db.hp == 7)
         # Resolve attack
         self.defender.db.hp = 40
-        tb_range.resolve_attack(self.attacker, self.defender, "test", attack_value=20, defense_value=10)
+        tb_range.resolve_attack(
+            self.attacker, self.defender, "test", attack_value=20, defense_value=10
+        )
         self.assertTrue(self.defender.db.hp < 40)
         # Combat cleanup
         self.attacker.db.Combat_attribute = True
@@ -1354,13 +1714,16 @@ def test_tbrangefunc(self):
 
 
 class TestTurnBattleItemsFunc(EvenniaTest):
-
     @patch("evennia.contrib.turnbattle.tb_items.tickerhandler", new=MagicMock())
     def setUp(self):
         super(TestTurnBattleItemsFunc, self).setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
-        self.attacker = create_object(tb_items.TBItemsCharacter, key="Attacker", location=self.testroom)
-        self.defender = create_object(tb_items.TBItemsCharacter, key="Defender", location=self.testroom)
+        self.attacker = create_object(
+            tb_items.TBItemsCharacter, key="Attacker", location=self.testroom
+        )
+        self.defender = create_object(
+            tb_items.TBItemsCharacter, key="Defender", location=self.testroom
+        )
         self.joiner = create_object(tb_items.TBItemsCharacter, key="Joiner", location=self.testroom)
         self.user = create_object(tb_items.TBItemsCharacter, key="User", location=self.testroom)
         self.test_healpotion = create_object(key="healing potion")
@@ -1456,10 +1819,10 @@ def test_tbitemsfunc(self):
         self.assertTrue(self.user.db.hp > 2)
         # Add contition
         tb_items.add_condition(self.user, self.user, "Test", 5)
-        self.assertTrue(self.user.db.conditions == {"Test":[5, self.user]})
+        self.assertTrue(self.user.db.conditions == {"Test": [5, self.user]})
         # Condition tickdown
         tb_items.condition_tickdown(self.user, self.user)
-        self.assertTrue(self.user.db.conditions == {"Test":[4, self.user]})
+        self.assertTrue(self.user.db.conditions == {"Test": [4, self.user]})
         # Test item functions now!
         # Item heal
         self.user.db.hp = 2
@@ -1467,20 +1830,23 @@ def test_tbitemsfunc(self):
         # Item add condition
         self.user.db.conditions = {}
         tb_items.itemfunc_add_condition(self.test_healpotion, self.user, self.user)
-        self.assertTrue(self.user.db.conditions == {"Regeneration":[5, self.user]})
+        self.assertTrue(self.user.db.conditions == {"Regeneration": [5, self.user]})
         # Item cure condition
-        self.user.db.conditions = {"Poisoned":[5, self.user]}
+        self.user.db.conditions = {"Poisoned": [5, self.user]}
         tb_items.itemfunc_cure_condition(self.test_healpotion, self.user, self.user)
         self.assertTrue(self.user.db.conditions == {})
 
 
 class TestTurnBattleMagicFunc(EvenniaTest):
-
     def setUp(self):
         super(TestTurnBattleMagicFunc, self).setUp()
         self.testroom = create_object(DefaultRoom, key="Test Room")
-        self.attacker = create_object(tb_magic.TBMagicCharacter, key="Attacker", location=self.testroom)
-        self.defender = create_object(tb_magic.TBMagicCharacter, key="Defender", location=self.testroom)
+        self.attacker = create_object(
+            tb_magic.TBMagicCharacter, key="Attacker", location=self.testroom
+        )
+        self.defender = create_object(
+            tb_magic.TBMagicCharacter, key="Defender", location=self.testroom
+        )
         self.joiner = create_object(tb_magic.TBMagicCharacter, key="Joiner", location=self.testroom)
 
     def tearDown(self):
@@ -1576,43 +1942,56 @@ def test_tbbasicfunc(self):
 
 
 class TestTreeSelectFunc(EvenniaTest):
-
     def test_tree_functions(self):
         # Dash counter
         self.assertTrue(tree_select.dashcount("--test") == 2)
         # Is category
         self.assertTrue(tree_select.is_category(TREE_MENU_TESTSTR, 1) == True)
         # Parse options
-        self.assertTrue(tree_select.parse_opts(TREE_MENU_TESTSTR, category_index=2) == [(3, "Baz 1"), (4, "Baz 2")])
+        self.assertTrue(
+            tree_select.parse_opts(TREE_MENU_TESTSTR, category_index=2)
+            == [(3, "Baz 1"), (4, "Baz 2")]
+        )
         # Index to selection
         self.assertTrue(tree_select.index_to_selection(TREE_MENU_TESTSTR, 2) == "Baz")
         # Go up one category
         self.assertTrue(tree_select.go_up_one_category(TREE_MENU_TESTSTR, 4) == 2)
         # Option list to menu options
         test_optlist = tree_select.parse_opts(TREE_MENU_TESTSTR, category_index=2)
-        optlist_to_menu_expected_result = [{'goto': ['menunode_treeselect', {'newindex': 3}], 'key': 'Baz 1'},
-        {'goto': ['menunode_treeselect', {'newindex': 4}], 'key': 'Baz 2'},
-        {'goto': ['menunode_treeselect', {'newindex': 1}], 'key': ['<< Go Back', 'go back', 'back'], 'desc': 'Return to the previous menu.'}]
-        self.assertTrue(tree_select.optlist_to_menuoptions(TREE_MENU_TESTSTR, test_optlist, 2, True, True) == optlist_to_menu_expected_result)
+        optlist_to_menu_expected_result = [
+            {"goto": ["menunode_treeselect", {"newindex": 3}], "key": "Baz 1"},
+            {"goto": ["menunode_treeselect", {"newindex": 4}], "key": "Baz 2"},
+            {
+                "goto": ["menunode_treeselect", {"newindex": 1}],
+                "key": ["<< Go Back", "go back", "back"],
+                "desc": "Return to the previous menu.",
+            },
+        ]
+        self.assertTrue(
+            tree_select.optlist_to_menuoptions(TREE_MENU_TESTSTR, test_optlist, 2, True, True)
+            == optlist_to_menu_expected_result
+        )
+
 
 # Test field fill
 
 from evennia.contrib import fieldfill
 
 FIELD_TEST_TEMPLATE = [
-{"fieldname":"TextTest", "fieldtype":"text"},
-{"fieldname":"NumberTest", "fieldtype":"number", "blankmsg":"Number here!"},
-{"fieldname":"DefaultText", "fieldtype":"text", "default":"Test"},
-{"fieldname":"DefaultNum", "fieldtype":"number", "default":3}
+    {"fieldname": "TextTest", "fieldtype": "text"},
+    {"fieldname": "NumberTest", "fieldtype": "number", "blankmsg": "Number here!"},
+    {"fieldname": "DefaultText", "fieldtype": "text", "default": "Test"},
+    {"fieldname": "DefaultNum", "fieldtype": "number", "default": 3},
 ]
 
-FIELD_TEST_DATA = {"TextTest":None, "NumberTest":None, "DefaultText":"Test", "DefaultNum":3}
+FIELD_TEST_DATA = {"TextTest": None, "NumberTest": None, "DefaultText": "Test", "DefaultNum": 3}
 
-class TestFieldFillFunc(EvenniaTest):
 
+class TestFieldFillFunc(EvenniaTest):
     def test_field_functions(self):
         self.assertTrue(fieldfill.form_template_to_dict(FIELD_TEST_TEMPLATE) == FIELD_TEST_DATA)
 
+
 # Test of the unixcommand module
 
 from evennia.contrib.unixcommand import UnixCommand
@@ -1642,7 +2021,6 @@ def func(self):
 
 
 class TestUnixCommand(CommandTest):
-
     def test_success(self):
         """See the command parsing succeed."""
         self.call(CmdDummy(), "5 10", "5 * 10 = 50")
@@ -1677,51 +2055,51 @@ class TestColorMarkup(EvenniaTest):
 
     def test_curly_markup(self):
         ansi_map = color_markups.CURLY_COLOR_ANSI_EXTRA_MAP
-        self.assertIsNotNone(re.match(re.escape(ansi_map[7][0]), '{r'))
-        self.assertIsNotNone(re.match(re.escape(ansi_map[-1][0]), '{[X'))
+        self.assertIsNotNone(re.match(re.escape(ansi_map[7][0]), "{r"))
+        self.assertIsNotNone(re.match(re.escape(ansi_map[-1][0]), "{[X"))
         xterm_fg = color_markups.CURLY_COLOR_XTERM256_EXTRA_FG
-        self.assertIsNotNone(re.match(xterm_fg[0], '{001'))
-        self.assertIsNotNone(re.match(xterm_fg[0], '{123'))
-        self.assertIsNotNone(re.match(xterm_fg[0], '{455'))
+        self.assertIsNotNone(re.match(xterm_fg[0], "{001"))
+        self.assertIsNotNone(re.match(xterm_fg[0], "{123"))
+        self.assertIsNotNone(re.match(xterm_fg[0], "{455"))
         xterm_bg = color_markups.CURLY_COLOR_XTERM256_EXTRA_BG
-        self.assertIsNotNone(re.match(xterm_bg[0], '{[001'))
-        self.assertIsNotNone(re.match(xterm_bg[0], '{[123'))
-        self.assertIsNotNone(re.match(xterm_bg[0], '{[455'))
+        self.assertIsNotNone(re.match(xterm_bg[0], "{[001"))
+        self.assertIsNotNone(re.match(xterm_bg[0], "{[123"))
+        self.assertIsNotNone(re.match(xterm_bg[0], "{[455"))
         xterm_gfg = color_markups.CURLY_COLOR_XTERM256_EXTRA_GFG
-        self.assertIsNotNone(re.match(xterm_gfg[0], '{=h'))
-        self.assertIsNotNone(re.match(xterm_gfg[0], '{=e'))
-        self.assertIsNotNone(re.match(xterm_gfg[0], '{=w'))
+        self.assertIsNotNone(re.match(xterm_gfg[0], "{=h"))
+        self.assertIsNotNone(re.match(xterm_gfg[0], "{=e"))
+        self.assertIsNotNone(re.match(xterm_gfg[0], "{=w"))
         xterm_gbg = color_markups.CURLY_COLOR_XTERM256_EXTRA_GBG
-        self.assertIsNotNone(re.match(xterm_gbg[0], '{[=a'))
-        self.assertIsNotNone(re.match(xterm_gbg[0], '{[=k'))
-        self.assertIsNotNone(re.match(xterm_gbg[0], '{[=z'))
+        self.assertIsNotNone(re.match(xterm_gbg[0], "{[=a"))
+        self.assertIsNotNone(re.match(xterm_gbg[0], "{[=k"))
+        self.assertIsNotNone(re.match(xterm_gbg[0], "{[=z"))
         bright_map = color_markups.CURLY_COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP
-        self.assertEqual(bright_map[0][1], '{[500')
-        self.assertEqual(bright_map[-1][1], '{[222')
+        self.assertEqual(bright_map[0][1], "{[500")
+        self.assertEqual(bright_map[-1][1], "{[222")
 
     def test_mux_markup(self):
         ansi_map = color_markups.MUX_COLOR_ANSI_EXTRA_MAP
-        self.assertIsNotNone(re.match(re.escape(ansi_map[10][0]), '%cr'))
-        self.assertIsNotNone(re.match(re.escape(ansi_map[-1][0]), '%cX'))
+        self.assertIsNotNone(re.match(re.escape(ansi_map[10][0]), "%cr"))
+        self.assertIsNotNone(re.match(re.escape(ansi_map[-1][0]), "%cX"))
         xterm_fg = color_markups.MUX_COLOR_XTERM256_EXTRA_FG
-        self.assertIsNotNone(re.match(xterm_fg[0], '%c001'))
-        self.assertIsNotNone(re.match(xterm_fg[0], '%c123'))
-        self.assertIsNotNone(re.match(xterm_fg[0], '%c455'))
+        self.assertIsNotNone(re.match(xterm_fg[0], "%c001"))
+        self.assertIsNotNone(re.match(xterm_fg[0], "%c123"))
+        self.assertIsNotNone(re.match(xterm_fg[0], "%c455"))
         xterm_bg = color_markups.MUX_COLOR_XTERM256_EXTRA_BG
-        self.assertIsNotNone(re.match(xterm_bg[0], '%c[001'))
-        self.assertIsNotNone(re.match(xterm_bg[0], '%c[123'))
-        self.assertIsNotNone(re.match(xterm_bg[0], '%c[455'))
+        self.assertIsNotNone(re.match(xterm_bg[0], "%c[001"))
+        self.assertIsNotNone(re.match(xterm_bg[0], "%c[123"))
+        self.assertIsNotNone(re.match(xterm_bg[0], "%c[455"))
         xterm_gfg = color_markups.MUX_COLOR_XTERM256_EXTRA_GFG
-        self.assertIsNotNone(re.match(xterm_gfg[0], '%c=h'))
-        self.assertIsNotNone(re.match(xterm_gfg[0], '%c=e'))
-        self.assertIsNotNone(re.match(xterm_gfg[0], '%c=w'))
+        self.assertIsNotNone(re.match(xterm_gfg[0], "%c=h"))
+        self.assertIsNotNone(re.match(xterm_gfg[0], "%c=e"))
+        self.assertIsNotNone(re.match(xterm_gfg[0], "%c=w"))
         xterm_gbg = color_markups.MUX_COLOR_XTERM256_EXTRA_GBG
-        self.assertIsNotNone(re.match(xterm_gbg[0], '%c[=a'))
-        self.assertIsNotNone(re.match(xterm_gbg[0], '%c[=k'))
-        self.assertIsNotNone(re.match(xterm_gbg[0], '%c[=z'))
+        self.assertIsNotNone(re.match(xterm_gbg[0], "%c[=a"))
+        self.assertIsNotNone(re.match(xterm_gbg[0], "%c[=k"))
+        self.assertIsNotNone(re.match(xterm_gbg[0], "%c[=z"))
         bright_map = color_markups.MUX_COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP
-        self.assertEqual(bright_map[0][1], '%c[500')
-        self.assertEqual(bright_map[-1][1], '%c[222')
+        self.assertEqual(bright_map[0][1], "%c[500")
+        self.assertEqual(bright_map[-1][1], "%c[222")
 
 
 from evennia.contrib import random_string_generator
@@ -1730,7 +2108,6 @@ def test_mux_markup(self):
 
 
 class TestRandomStringGenerator(EvenniaTest):
-
     def test_generate(self):
         """Generate and fail when exhausted."""
         generated = []
@@ -1753,28 +2130,19 @@ def test_generate(self):
 from evennia.utils import search
 from evennia.utils.utils import inherits_from
 
-class TestPuzzles(CommandTest):
 
+class TestPuzzles(CommandTest):
     def setUp(self):
         super(TestPuzzles, self).setUp()
-        self.steel = create_object(
-                self.object_typeclass,
-                key='steel', 
-                location=self.char1.location)
-        self.flint = create_object(
-                self.object_typeclass,
-                key='flint', 
-                location=self.char1.location)
-        self.fire = create_object(
-                self.object_typeclass,
-                key='fire', 
-                location=self.char1.location)
-        self.steel.tags.add('tag-steel')
-        self.steel.tags.add('tag-steel', category='tagcat')
-        self.flint.tags.add('tag-flint')
-        self.flint.tags.add('tag-flint', category='tagcat')
-        self.fire.tags.add('tag-fire')
-        self.fire.tags.add('tag-fire', category='tagcat')
+        self.steel = create_object(self.object_typeclass, key="steel", location=self.char1.location)
+        self.flint = create_object(self.object_typeclass, key="flint", location=self.char1.location)
+        self.fire = create_object(self.object_typeclass, key="fire", location=self.char1.location)
+        self.steel.tags.add("tag-steel")
+        self.steel.tags.add("tag-steel", category="tagcat")
+        self.flint.tags.add("tag-flint")
+        self.flint.tags.add("tag-flint", category="tagcat")
+        self.fire.tags.add("tag-fire")
+        self.fire.tags.add("tag-fire", category="tagcat")
 
     def _assert_msg_matched(self, msg, regexs, re_flags=0):
         matches = []
@@ -1785,45 +2153,39 @@ def _assert_msg_matched(self, msg, regexs, re_flags=0):
         return matches
 
     def _assert_recipe(self, name, parts, results, and_destroy_it=True, expected_count=1):
-
         def _keys(items):
-            return [item['key'] for item in items]
+            return [item["key"] for item in items]
 
-        recipes = search.search_script_tag('', category=puzzles._PUZZLES_TAG_CATEGORY)
+        recipes = search.search_script_tag("", category=puzzles._PUZZLES_TAG_CATEGORY)
         self.assertEqual(expected_count, len(recipes))
-        self.assertEqual(name, recipes[expected_count-1].db.puzzle_name)
-        self.assertEqual(parts, _keys(recipes[expected_count-1].db.parts))
-        self.assertEqual(results, _keys(recipes[expected_count-1].db.results))
+        self.assertEqual(name, recipes[expected_count - 1].db.puzzle_name)
+        self.assertEqual(parts, _keys(recipes[expected_count - 1].db.parts))
+        self.assertEqual(results, _keys(recipes[expected_count - 1].db.results))
         self.assertEqual(
             puzzles._PUZZLES_TAG_RECIPE,
-            recipes[expected_count-1].tags.get(category=puzzles._PUZZLES_TAG_CATEGORY)
+            recipes[expected_count - 1].tags.get(category=puzzles._PUZZLES_TAG_CATEGORY),
         )
-        recipe_dbref = recipes[expected_count-1].dbref
+        recipe_dbref = recipes[expected_count - 1].dbref
         if and_destroy_it:
-            recipes[expected_count-1].delete()
+            recipes[expected_count - 1].delete()
         return recipe_dbref if not and_destroy_it else None
 
     def _assert_no_recipes(self):
         self.assertEqual(
-            0,
-            len(search.search_script_tag('', category=puzzles._PUZZLES_TAG_CATEGORY))
+            0, len(search.search_script_tag("", category=puzzles._PUZZLES_TAG_CATEGORY))
         )
 
     # good recipes
     def _good_recipe(self, name, parts, results, and_destroy_it=True, expected_count=1):
         regexs = []
         for p in parts:
-            regexs.append(r'^Part %s\(#\d+\)$' % (p))
+            regexs.append(r"^Part %s\(#\d+\)$" % (p))
         for r in results:
-            regexs.append(r'^Result %s\(#\d+\)$' % (r))
+            regexs.append(r"^Result %s\(#\d+\)$" % (r))
         regexs.append(r"^Puzzle '%s' %s\(#\d+\) has been created successfully.$" % (name, name))
         lhs = [name] + parts
-        cmdstr = ','.join(lhs) + '=' + ','.join(results)
-        msg = self.call(
-            puzzles.CmdCreatePuzzleRecipe(),
-            cmdstr,
-            caller=self.char1
-        )
+        cmdstr = ",".join(lhs) + "=" + ",".join(results)
+        msg = self.call(puzzles.CmdCreatePuzzleRecipe(), cmdstr, caller=self.char1)
         recipe_dbref = self._assert_recipe(name, parts, results, and_destroy_it, expected_count)
         self._assert_msg_matched(msg, regexs, re_flags=re.MULTILINE | re.DOTALL)
         return recipe_dbref
@@ -1834,12 +2196,15 @@ def _check_room_contents(self, expected, check_test_tags=False):
         for key, grp in itertools.groupby(room1_contents, by_obj_key):
             if key in expected:
                 grp = list(grp)
-                self.assertEqual(expected[key], len(grp),
-                        "Expected %d but got %d for %s" % (expected[key], len(grp), key))
+                self.assertEqual(
+                    expected[key],
+                    len(grp),
+                    "Expected %d but got %d for %s" % (expected[key], len(grp), key),
+                )
                 if check_test_tags:
                     for gi in grp:
                         tags = gi.tags.all(return_key_and_category=True)
-                        self.assertIn(('tag-' + gi.key, 'tagcat'), tags)
+                        self.assertIn(("tag-" + gi.key, "tagcat"), tags)
 
     def _arm(self, recipe_dbref, name, parts):
         regexs = [
@@ -1847,17 +2212,13 @@ def _arm(self, recipe_dbref, name, parts):
             r"^Spawning %d parts ...$" % (len(parts)),
         ]
         for p in parts:
-            regexs.append(r'^Part %s\(#\d+\) spawned .*$' % (p))
+            regexs.append(r"^Part %s\(#\d+\) spawned .*$" % (p))
         regexs.append(r"^Puzzle armed successfully.$")
-        msg = self.call(
-            puzzles.CmdArmPuzzle(),
-            recipe_dbref,
-            caller=self.char1
-        )
+        msg = self.call(puzzles.CmdArmPuzzle(), recipe_dbref, caller=self.char1)
         matches = self._assert_msg_matched(msg, regexs, re_flags=re.MULTILINE | re.DOTALL)
 
     def test_cmdset_puzzle(self):
-        self.char1.cmdset.add('evennia.contrib.puzzles.PuzzleSystemCmdSet')
+        self.char1.cmdset.add("evennia.contrib.puzzles.PuzzleSystemCmdSet")
         # FIXME: testing nothing, this is just to bump up coverage
 
     def test_cmd_puzzle(self):
@@ -1868,45 +2229,44 @@ def _bad_syntax(cmdstr):
             self.call(
                 puzzles.CmdCreatePuzzleRecipe(),
                 cmdstr,
-                'Usage: @puzzle name,<part1[,...]> = <result1[,...]>',
-                caller=self.char1
+                "Usage: @puzzle name,<part1[,...]> = <result1[,...]>",
+                caller=self.char1,
             )
 
-        _bad_syntax('')
-        _bad_syntax('=')
-        _bad_syntax('nothing =')
-        _bad_syntax('= nothing')
-        _bad_syntax('nothing')
-        _bad_syntax(',nothing')
-        _bad_syntax('name, nothing')
-        _bad_syntax('name, nothing =')
+        _bad_syntax("")
+        _bad_syntax("=")
+        _bad_syntax("nothing =")
+        _bad_syntax("= nothing")
+        _bad_syntax("nothing")
+        _bad_syntax(",nothing")
+        _bad_syntax("name, nothing")
+        _bad_syntax("name, nothing =")
 
         self._assert_no_recipes()
 
-        self._good_recipe('makefire', ['steel', 'flint'], ['fire', 'steel', 'flint'])
-        self._good_recipe('hot steels', ['steel', 'fire'], ['steel', 'fire'])
-        self._good_recipe('furnace', ['steel', 'steel', 'fire'], ['steel', 'steel', 'fire', 'fire', 'fire', 'fire'])
+        self._good_recipe("makefire", ["steel", "flint"], ["fire", "steel", "flint"])
+        self._good_recipe("hot steels", ["steel", "fire"], ["steel", "fire"])
+        self._good_recipe(
+            "furnace",
+            ["steel", "steel", "fire"],
+            ["steel", "steel", "fire", "fire", "fire", "fire"],
+        )
 
         # bad recipes
         def _bad_recipe(name, parts, results, fail_regex):
-            cmdstr = ','.join([name] + parts) \
-                    + '=' + ','.join(results)
-            msg = self.call(
-                puzzles.CmdCreatePuzzleRecipe(),
-                cmdstr,
-                caller=self.char1
-            )
+            cmdstr = ",".join([name] + parts) + "=" + ",".join(results)
+            msg = self.call(puzzles.CmdCreatePuzzleRecipe(), cmdstr, caller=self.char1)
             self._assert_no_recipes()
             self.assertIsNotNone(re.match(fail_regex, msg), msg)
 
-        _bad_recipe('name', ['nothing'], ['neither'], r"Could not find 'nothing'.")
-        _bad_recipe('name', ['steel'], ['nothing'], r"Could not find 'nothing'.")
-        _bad_recipe('', ['steel', 'fire'], ['steel', 'fire'], r"^Invalid puzzle name ''.")
+        _bad_recipe("name", ["nothing"], ["neither"], r"Could not find 'nothing'.")
+        _bad_recipe("name", ["steel"], ["nothing"], r"Could not find 'nothing'.")
+        _bad_recipe("", ["steel", "fire"], ["steel", "fire"], r"^Invalid puzzle name ''.")
         self.steel.location = self.char1
-        _bad_recipe('name', ['steel'], ['fire'], r"^Invalid location for steel$")
-        _bad_recipe('name', ['flint'], ['steel'], r"^Invalid location for steel$")
-        _bad_recipe('name', ['self'], ['fire'], r"^Invalid typeclass for Char$")
-        _bad_recipe('name', ['here'], ['fire'], r"^Invalid typeclass for Room$")
+        _bad_recipe("name", ["steel"], ["fire"], r"^Invalid location for steel$")
+        _bad_recipe("name", ["flint"], ["steel"], r"^Invalid location for steel$")
+        _bad_recipe("name", ["self"], ["fire"], r"^Invalid typeclass for Char$")
+        _bad_recipe("name", ["here"], ["fire"], r"^Invalid typeclass for Room$")
 
         self._assert_no_recipes()
 
@@ -1914,18 +2274,15 @@ def test_cmd_armpuzzle(self):
         # bad arms
         self.call(
             puzzles.CmdArmPuzzle(),
-            '1',
+            "1",
             "A puzzle recipe's #dbref must be specified",
-            caller=self.char1
-        )
-        self.call(
-            puzzles.CmdArmPuzzle(),
-            '#1',
-            "Invalid puzzle '#1'",
-            caller=self.char1
+            caller=self.char1,
         )
+        self.call(puzzles.CmdArmPuzzle(), "#1", "Invalid puzzle '#1'", caller=self.char1)
 
-        recipe_dbref = self._good_recipe('makefire', ['steel', 'flint'], ['fire', 'steel', 'flint'], and_destroy_it=False)
+        recipe_dbref = self._good_recipe(
+            "makefire", ["steel", "flint"], ["fire", "steel", "flint"], and_destroy_it=False
+        )
 
         # delete proto parts and proto result
         self.steel.delete()
@@ -1933,41 +2290,39 @@ def test_cmd_armpuzzle(self):
         self.fire.delete()
 
         # good arm
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
-        self._check_room_contents({'steel': 1, 'flint': 1}, check_test_tags=True)
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
+        self._check_room_contents({"steel": 1, "flint": 1}, check_test_tags=True)
 
     def _use(self, cmdstr, expmsg):
-        msg = self.call(
-                puzzles.CmdUsePuzzleParts(),
-                cmdstr,
-                expmsg,
-                caller=self.char1
-        )
+        msg = self.call(puzzles.CmdUsePuzzleParts(), cmdstr, expmsg, caller=self.char1)
         return msg
 
     def test_cmd_use(self):
 
-        self._use('', 'Use what?')
-        self._use('something', 'There is no something around.')
-        self._use('steel', 'You have no idea how this can be used')
-        self._use('steel flint', 'There is no steel flint around.')
-        self._use('steel, flint', 'You have no idea how these can be used')
+        self._use("", "Use what?")
+        self._use("something", "There is no something around.")
+        self._use("steel", "You have no idea how this can be used")
+        self._use("steel flint", "There is no steel flint around.")
+        self._use("steel, flint", "You have no idea how these can be used")
 
-        recipe_dbref = self._good_recipe('makefire', ['steel', 'flint'], ['fire'] , and_destroy_it=False)
-        recipe2_dbref = self._good_recipe('makefire2', ['steel', 'flint'], ['fire'] , and_destroy_it=False,
-                expected_count=2)
+        recipe_dbref = self._good_recipe(
+            "makefire", ["steel", "flint"], ["fire"], and_destroy_it=False
+        )
+        recipe2_dbref = self._good_recipe(
+            "makefire2", ["steel", "flint"], ["fire"], and_destroy_it=False, expected_count=2
+        )
 
         # although there is steel and flint
         # those aren't valid puzzle parts because
         # the puzzle hasn't been armed
-        self._use('steel', 'You have no idea how this can be used')
-        self._use('steel, flint', 'You have no idea how these can be used')
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
-        self._check_room_contents({'steel': 2, 'flint': 2}, check_test_tags=True)
+        self._use("steel", "You have no idea how this can be used")
+        self._use("steel, flint", "You have no idea how these can be used")
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
+        self._check_room_contents({"steel": 2, "flint": 2}, check_test_tags=True)
 
         # there are duplicated objects now
-        self._use('steel', 'Which steel. There are many')
-        self._use('flint', 'Which flint. There are many')
+        self._use("steel", "Which steel. There are many")
+        self._use("flint", "Which flint. There are many")
 
         # delete proto parts and proto results
         self.steel.delete()
@@ -1975,64 +2330,74 @@ def test_cmd_use(self):
         self.fire.delete()
 
         # solve puzzle
-        self._use('steel, flint', 'You are a Genius')
-        self.assertEqual(1,
-            len(list(filter(
-                lambda o: o.key == 'fire' \
-                    and ('makefire', puzzles._PUZZLES_TAG_CATEGORY) \
-                    in o.tags.all(return_key_and_category=True) \
-                    and (puzzles._PUZZLES_TAG_MEMBER, puzzles._PUZZLES_TAG_CATEGORY) \
-                    in o.tags.all(return_key_and_category=True),
-                self.room1.contents))))
-        self._check_room_contents({'steel': 0, 'flint': 0, 'fire': 1}, check_test_tags=True)
+        self._use("steel, flint", "You are a Genius")
+        self.assertEqual(
+            1,
+            len(
+                list(
+                    filter(
+                        lambda o: o.key == "fire"
+                        and ("makefire", puzzles._PUZZLES_TAG_CATEGORY)
+                        in o.tags.all(return_key_and_category=True)
+                        and (puzzles._PUZZLES_TAG_MEMBER, puzzles._PUZZLES_TAG_CATEGORY)
+                        in o.tags.all(return_key_and_category=True),
+                        self.room1.contents,
+                    )
+                )
+            ),
+        )
+        self._check_room_contents({"steel": 0, "flint": 0, "fire": 1}, check_test_tags=True)
 
         # trying again will fail as it was resolved already
         # and the parts were destroyed
-        self._use('steel, flint', 'There is no steel around')
-        self._use('flint, steel', 'There is no flint around')
+        self._use("steel, flint", "There is no steel around")
+        self._use("flint, steel", "There is no flint around")
 
         # arm same puzzle twice so there are duplicated parts
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
-        self._check_room_contents({'steel': 2, 'flint': 2, 'fire': 1}, check_test_tags=True)
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
+        self._check_room_contents({"steel": 2, "flint": 2, "fire": 1}, check_test_tags=True)
 
         # try solving with multiple parts but incomplete set
-        self._use('1-steel, 2-steel', 'You try to utilize these but nothing happens ... something amiss?')
+        self._use(
+            "1-steel, 2-steel", "You try to utilize these but nothing happens ... something amiss?"
+        )
 
         # arm the other puzzle. Their parts are identical
-        self._arm(recipe2_dbref, 'makefire2', ['steel', 'flint'])
-        self._check_room_contents({'steel': 3, 'flint': 3, 'fire': 1}, check_test_tags=True)
+        self._arm(recipe2_dbref, "makefire2", ["steel", "flint"])
+        self._check_room_contents({"steel": 3, "flint": 3, "fire": 1}, check_test_tags=True)
 
         # solve with multiple parts for
         # multiple puzzles. Both can be solved but
         # only one is.
         self._use(
-            '1-steel, 2-flint, 3-steel, 3-flint',
-            'Your gears start turning and 2 different ideas come to your mind ... ')
-        self._check_room_contents({'steel': 2, 'flint': 2, 'fire': 2}, check_test_tags=True)
+            "1-steel, 2-flint, 3-steel, 3-flint",
+            "Your gears start turning and 2 different ideas come to your mind ... ",
+        )
+        self._check_room_contents({"steel": 2, "flint": 2, "fire": 2}, check_test_tags=True)
 
         self.room1.msg_contents = Mock()
 
         # solve all
-        self._use('1-steel, 1-flint', 'You are a Genius')
-        self.room1.msg_contents.assert_called_once_with('|cChar|n performs some kind of tribal dance and |yfire|n seems to appear from thin air', exclude=(self.char1,))
-        self._use('steel, flint', 'You are a Genius')
-        self._check_room_contents({'steel': 0, 'flint': 0, 'fire': 4}, check_test_tags=True)
+        self._use("1-steel, 1-flint", "You are a Genius")
+        self.room1.msg_contents.assert_called_once_with(
+            "|cChar|n performs some kind of tribal dance and |yfire|n seems to appear from thin air",
+            exclude=(self.char1,),
+        )
+        self._use("steel, flint", "You are a Genius")
+        self._check_room_contents({"steel": 0, "flint": 0, "fire": 4}, check_test_tags=True)
 
     def test_puzzleedit(self):
-        recipe_dbref = self._good_recipe('makefire', ['steel', 'flint'], ['fire'] , and_destroy_it=False)
+        recipe_dbref = self._good_recipe(
+            "makefire", ["steel", "flint"], ["fire"], and_destroy_it=False
+        )
 
         def _puzzleedit(swt, dbref, args, expmsg):
             if (swt is None) and (dbref is None) and (args is None):
-                cmdstr = ''
+                cmdstr = ""
             else:
-                cmdstr = '%s %s%s' % (swt, dbref, args)
-            self.call(
-                puzzles.CmdEditPuzzle(),
-                cmdstr,
-                expmsg,
-                caller=self.char1
-            )
+                cmdstr = "%s %s%s" % (swt, dbref, args)
+            self.call(puzzles.CmdEditPuzzle(), cmdstr, expmsg, caller=self.char1)
 
         # delete proto parts and proto results
         self.steel.delete()
@@ -2041,192 +2406,176 @@ def _puzzleedit(swt, dbref, args, expmsg):
 
         sid = self.script.id
         # bad syntax
-        _puzzleedit(None, None, None, "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
-        _puzzleedit('', '1', '', "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
-        _puzzleedit('', '', '', "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
-        _puzzleedit('', recipe_dbref, 'dummy', "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
-        _puzzleedit('', self.script.dbref, '', 
-                    'Script(#{}) is not a puzzle'.format(sid))
+        _puzzleedit(
+            None, None, None, "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit"
+        )
+        _puzzleedit("", "1", "", "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
+        _puzzleedit("", "", "", "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit")
+        _puzzleedit(
+            "",
+            recipe_dbref,
+            "dummy",
+            "A puzzle recipe's #dbref must be specified.\nUsage: @puzzleedit",
+        )
+        _puzzleedit("", self.script.dbref, "", "Script(#{}) is not a puzzle".format(sid))
 
         # edit use_success_message and use_success_location_message
-        _puzzleedit('', recipe_dbref, '/use_success_message = Yes!', 'makefire(%s) use_success_message = Yes!' % recipe_dbref)
-        _puzzleedit('', recipe_dbref, '/use_success_location_message = {result_names} Yeah baby! {caller}', 'makefire(%s) use_success_location_message = {result_names} Yeah baby! {caller}' % recipe_dbref)
+        _puzzleedit(
+            "",
+            recipe_dbref,
+            "/use_success_message = Yes!",
+            "makefire(%s) use_success_message = Yes!" % recipe_dbref,
+        )
+        _puzzleedit(
+            "",
+            recipe_dbref,
+            "/use_success_location_message = {result_names} Yeah baby! {caller}",
+            "makefire(%s) use_success_location_message = {result_names} Yeah baby! {caller}"
+            % recipe_dbref,
+        )
 
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
         self.room1.msg_contents = Mock()
-        self._use('steel, flint', 'Yes!')
-        self.room1.msg_contents.assert_called_once_with('fire Yeah baby! Char', exclude=(self.char1,))
+        self._use("steel, flint", "Yes!")
+        self.room1.msg_contents.assert_called_once_with(
+            "fire Yeah baby! Char", exclude=(self.char1,)
+        )
         self.room1.msg_contents.reset_mock()
 
         # edit mask: exclude location and desc during matching
-        _puzzleedit('', recipe_dbref, '/mask = location,desc',
-                "makefire(%s) mask = ('location', 'desc')" % recipe_dbref)
+        _puzzleedit(
+            "",
+            recipe_dbref,
+            "/mask = location,desc",
+            "makefire(%s) mask = ('location', 'desc')" % recipe_dbref,
+        )
 
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
         # change location and desc
-        self.char1.search('steel').db.desc = 'A solid bar of steel'
-        self.char1.search('steel').location = self.char1
-        self.char1.search('flint').db.desc = 'A flint steel'
-        self.char1.search('flint').location = self.char1
-        self._use('steel, flint', 'Yes!')
-        self.room1.msg_contents.assert_called_once_with('fire Yeah baby! Char', exclude=(self.char1,))
+        self.char1.search("steel").db.desc = "A solid bar of steel"
+        self.char1.search("steel").location = self.char1
+        self.char1.search("flint").db.desc = "A flint steel"
+        self.char1.search("flint").location = self.char1
+        self._use("steel, flint", "Yes!")
+        self.room1.msg_contents.assert_called_once_with(
+            "fire Yeah baby! Char", exclude=(self.char1,)
+        )
 
         # delete
-        _puzzleedit('/delete', recipe_dbref, '', 'makefire(%s) was deleted' % recipe_dbref)
+        _puzzleedit("/delete", recipe_dbref, "", "makefire(%s) was deleted" % recipe_dbref)
         self._assert_no_recipes()
 
     def test_puzzleedit_add_remove_parts_results(self):
-        recipe_dbref = self._good_recipe('makefire', ['steel', 'flint'], ['fire'] , and_destroy_it=False)
+        recipe_dbref = self._good_recipe(
+            "makefire", ["steel", "flint"], ["fire"], and_destroy_it=False
+        )
 
         def _puzzleedit(swt, dbref, rhslist, expmsg):
-            cmdstr = '%s %s = %s' % (swt, dbref, ', '.join(rhslist))
-            self.call(
-                puzzles.CmdEditPuzzle(),
-                cmdstr,
-                expmsg,
-                caller=self.char1
-            )
+            cmdstr = "%s %s = %s" % (swt, dbref, ", ".join(rhslist))
+            self.call(puzzles.CmdEditPuzzle(), cmdstr, expmsg, caller=self.char1)
 
         red_steel = create_object(
-                self.object_typeclass,
-                key='red steel', location=self.char1.location)
-        smoke = create_object(
-                self.object_typeclass,
-                key='smoke', location=self.char1.location)
+            self.object_typeclass, key="red steel", location=self.char1.location
+        )
+        smoke = create_object(self.object_typeclass, key="smoke", location=self.char1.location)
 
-        _puzzleedit('/addresult', recipe_dbref, ['smoke'], 'smoke were added to results')
-        _puzzleedit('/addpart', recipe_dbref, ['red steel', 'steel'], 'red steel, steel were added to parts')
+        _puzzleedit("/addresult", recipe_dbref, ["smoke"], "smoke were added to results")
+        _puzzleedit(
+            "/addpart", recipe_dbref, ["red steel", "steel"], "red steel, steel were added to parts"
+        )
 
         # create a box so we can put all objects in
         # so that they can't be found during puzzle resolution
-        self.box = create_object(
-                self.object_typeclass,
-                key='box', location=self.char1.location)
+        self.box = create_object(self.object_typeclass, key="box", location=self.char1.location)
+
         def _box_all():
             for o in self.room1.contents:
-                if o not in [self.char1, self.char2, self.exit,
-                        self.obj1, self.obj2, self.box]:
+                if o not in [self.char1, self.char2, self.exit, self.obj1, self.obj2, self.box]:
                     o.location = self.box
+
         _box_all()
 
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint', 'red steel', 'steel'])
-        self._check_room_contents({
-            'steel': 2,
-            'red steel': 1,
-            'flint': 1,
-        })
-        self._use('1-steel, flint', 'You try to utilize these but nothing happens ... something amiss?')
-        self._use('1-steel, flint, red steel, 3-steel', 'You are a Genius')
-        self._check_room_contents({
-            'smoke': 1,
-            'fire': 1
-        })
+        self._arm(recipe_dbref, "makefire", ["steel", "flint", "red steel", "steel"])
+        self._check_room_contents({"steel": 2, "red steel": 1, "flint": 1})
+        self._use(
+            "1-steel, flint", "You try to utilize these but nothing happens ... something amiss?"
+        )
+        self._use("1-steel, flint, red steel, 3-steel", "You are a Genius")
+        self._check_room_contents({"smoke": 1, "fire": 1})
         _box_all()
 
         self.fire.location = self.room1
         self.steel.location = self.room1
 
-        _puzzleedit('/delresult', recipe_dbref, ['fire'], 'fire were removed from results')
-        _puzzleedit('/delpart', recipe_dbref, ['steel', 'steel'], 'steel, steel were removed from parts')
+        _puzzleedit("/delresult", recipe_dbref, ["fire"], "fire were removed from results")
+        _puzzleedit(
+            "/delpart", recipe_dbref, ["steel", "steel"], "steel, steel were removed from parts"
+        )
 
         _box_all()
 
-        self._arm(recipe_dbref, 'makefire', ['flint', 'red steel'])
-        self._check_room_contents({
-            'red steel': 1,
-            'flint': 1,
-        })
-        self._use('red steel, flint', 'You are a Genius')
-        self._check_room_contents({
-            'smoke': 1,
-            'fire': 0
-        })
+        self._arm(recipe_dbref, "makefire", ["flint", "red steel"])
+        self._check_room_contents({"red steel": 1, "flint": 1})
+        self._use("red steel, flint", "You are a Genius")
+        self._check_room_contents({"smoke": 1, "fire": 0})
 
     def test_lspuzzlerecipes_lsarmedpuzzles(self):
-        msg = self.call(
-            puzzles.CmdListPuzzleRecipes(),
-            '',
-            caller=self.char1
-        )
+        msg = self.call(puzzles.CmdListPuzzleRecipes(), "", caller=self.char1)
         self._assert_msg_matched(
-                msg,
-                [
-                    r"^-+$",
-                    r"^Found 0 puzzle\(s\)\.$",
-                    r"-+$",
-                ],
-                re.MULTILINE | re.DOTALL
+            msg, [r"^-+$", r"^Found 0 puzzle\(s\)\.$", r"-+$"], re.MULTILINE | re.DOTALL
         )
 
         recipe_dbref = self._good_recipe(
-                'makefire', ['steel', 'flint'], ['fire'],
-                and_destroy_it=False)
-
-        msg = self.call(
-            puzzles.CmdListPuzzleRecipes(),
-            '',
-            caller=self.char1
+            "makefire", ["steel", "flint"], ["fire"], and_destroy_it=False
         )
+
+        msg = self.call(puzzles.CmdListPuzzleRecipes(), "", caller=self.char1)
         self._assert_msg_matched(
-                msg,
-                [
-                    r"^-+$",
-                    r"^Puzzle 'makefire'.*$",
-                    r"^Success Caller message:$",
-                    r"^Success Location message:$",
-                    r"^Mask:$",
-                    r"^Parts$",
-                    r"^.*key: steel$",
-                    r"^.*key: flint$",
-                    r"^Results$",
-                    r"^.*key: fire$",
-                    r"^.*key: steel$",
-                    r"^.*key: flint$",
-                    r"^-+$",
-                    r"^Found 1 puzzle\(s\)\.$",
-                    r"^-+$",
-                ],
-                re.MULTILINE | re.DOTALL
-        )
-
-        msg = self.call(
-            puzzles.CmdListArmedPuzzles(),
-            '',
-            caller=self.char1
+            msg,
+            [
+                r"^-+$",
+                r"^Puzzle 'makefire'.*$",
+                r"^Success Caller message:$",
+                r"^Success Location message:$",
+                r"^Mask:$",
+                r"^Parts$",
+                r"^.*key: steel$",
+                r"^.*key: flint$",
+                r"^Results$",
+                r"^.*key: fire$",
+                r"^.*key: steel$",
+                r"^.*key: flint$",
+                r"^-+$",
+                r"^Found 1 puzzle\(s\)\.$",
+                r"^-+$",
+            ],
+            re.MULTILINE | re.DOTALL,
         )
+
+        msg = self.call(puzzles.CmdListArmedPuzzles(), "", caller=self.char1)
         self._assert_msg_matched(
-                msg,
-                [
-                    r"^-+$",
-                    r"^-+$",
-                    r"^Found 0 armed puzzle\(s\)\.$",
-                    r"^-+$"
-                ],
-                re.MULTILINE | re.DOTALL
+            msg,
+            [r"^-+$", r"^-+$", r"^Found 0 armed puzzle\(s\)\.$", r"^-+$"],
+            re.MULTILINE | re.DOTALL,
         )
 
-        self._arm(recipe_dbref, 'makefire', ['steel', 'flint'])
+        self._arm(recipe_dbref, "makefire", ["steel", "flint"])
 
-        msg = self.call(
-            puzzles.CmdListArmedPuzzles(),
-            '',
-            caller=self.char1
-        )
+        msg = self.call(puzzles.CmdListArmedPuzzles(), "", caller=self.char1)
         self._assert_msg_matched(
-                msg,
-                [
-                    r"^-+$",
-                    r"^Puzzle name: makefire$",
-                    r"^.*steel.* at \s+ Room.*$",
-                    r"^.*flint.* at \s+ Room.*$",
-                    r"^Found 1 armed puzzle\(s\)\.$",
-                    r"^-+$",
-                ],
-                re.MULTILINE | re.DOTALL
+            msg,
+            [
+                r"^-+$",
+                r"^Puzzle name: makefire$",
+                r"^.*steel.* at \s+ Room.*$",
+                r"^.*flint.* at \s+ Room.*$",
+                r"^Found 1 armed puzzle\(s\)\.$",
+                r"^-+$",
+            ],
+            re.MULTILINE | re.DOTALL,
         )
 
     def test_e2e(self):
-
         def _destroy_objs_in_room(keys):
             for obj in self.room1.contents:
                 if obj.key in keys:
@@ -2234,31 +2583,17 @@ def _destroy_objs_in_room(keys):
 
         # parts don't survive resolution
         # but produce a large result set
-        tree = create_object(
-                self.object_typeclass,
-                key='tree', location=self.char1.location)
-        axe = create_object(
-                self.object_typeclass,
-                key='axe', location=self.char1.location)
-        sweat = create_object(
-                self.object_typeclass,
-                key='sweat', location=self.char1.location)
+        tree = create_object(self.object_typeclass, key="tree", location=self.char1.location)
+        axe = create_object(self.object_typeclass, key="axe", location=self.char1.location)
+        sweat = create_object(self.object_typeclass, key="sweat", location=self.char1.location)
         dull_axe = create_object(
-                self.object_typeclass,
-                key='dull axe', location=self.char1.location)
-        timber = create_object(
-                self.object_typeclass,
-                key='timber', location=self.char1.location)
-        log = create_object(
-                self.object_typeclass,
-                key='log', location=self.char1.location)
-        parts = ['tree', 'axe']
-        results = (['sweat'] * 10) + ['dull axe'] + (['timber'] * 20) + (['log'] * 50)
-        recipe_dbref = self._good_recipe(
-            'lumberjack',
-            parts, results,
-            and_destroy_it=False
+            self.object_typeclass, key="dull axe", location=self.char1.location
         )
+        timber = create_object(self.object_typeclass, key="timber", location=self.char1.location)
+        log = create_object(self.object_typeclass, key="log", location=self.char1.location)
+        parts = ["tree", "axe"]
+        results = (["sweat"] * 10) + ["dull axe"] + (["timber"] * 20) + (["log"] * 50)
+        recipe_dbref = self._good_recipe("lumberjack", parts, results, and_destroy_it=False)
 
         _destroy_objs_in_room(set(parts + results))
 
@@ -2266,10 +2601,10 @@ def _destroy_objs_in_room(keys):
         expected = {key: len(list(grp)) for key, grp in itertools.groupby(sps)}
         expected.update({r: 0 for r in set(results)})
 
-        self._arm(recipe_dbref, 'lumberjack', parts)
+        self._arm(recipe_dbref, "lumberjack", parts)
         self._check_room_contents(expected)
 
-        self._use(','.join(parts), 'You are a Genius')
+        self._use(",".join(parts), "You are a Genius")
         srs = sorted(set(results))
         expected = {(key, len(list(grp))) for key, grp in itertools.groupby(srs)}
         expected.update({p: 0 for p in set(parts)})
@@ -2278,23 +2613,14 @@ def _destroy_objs_in_room(keys):
         # parts also appear in results
         # causing a new puzzle to be armed 'automatically'
         # i.e. the puzzle is self-sustaining
-        hole = create_object(
-                self.object_typeclass,
-                key='hole', location=self.char1.location)
-        shovel = create_object(
-                self.object_typeclass,
-                key='shovel', location=self.char1.location)
-        dirt = create_object(
-                self.object_typeclass,
-                key='dirt', location=self.char1.location)
-
-        parts = ['shovel', 'hole']
-        results = ['dirt', 'hole', 'shovel']
+        hole = create_object(self.object_typeclass, key="hole", location=self.char1.location)
+        shovel = create_object(self.object_typeclass, key="shovel", location=self.char1.location)
+        dirt = create_object(self.object_typeclass, key="dirt", location=self.char1.location)
+
+        parts = ["shovel", "hole"]
+        results = ["dirt", "hole", "shovel"]
         recipe_dbref = self._good_recipe(
-            'digger',
-            parts, results,
-            and_destroy_it=False,
-            expected_count=2
+            "digger", parts, results, and_destroy_it=False, expected_count=2
         )
 
         _destroy_objs_in_room(set(parts + results))
@@ -2303,28 +2629,23 @@ def _destroy_objs_in_room(keys):
 
         sps = sorted(set(parts))
         expected = {key: len(list(grp)) for key, grp in itertools.groupby(sps)}
-        expected.update({'dirt': nresolutions})
+        expected.update({"dirt": nresolutions})
 
-        self._arm(recipe_dbref, 'digger', parts)
+        self._arm(recipe_dbref, "digger", parts)
         self._check_room_contents(expected)
 
         for i in range(10):
-            self._use(','.join(parts), 'You are a Genius')
+            self._use(",".join(parts), "You are a Genius")
             nresolutions += 1
-            expected.update({'dirt': nresolutions})
+            expected.update({"dirt": nresolutions})
             self._check_room_contents(expected)
 
         # Uppercase puzzle name
-        balloon = create_object(
-                self.object_typeclass,
-                key='Balloon', location=self.char1.location)
-        parts = ['Balloon']
-        results = ['Balloon']
+        balloon = create_object(self.object_typeclass, key="Balloon", location=self.char1.location)
+        parts = ["Balloon"]
+        results = ["Balloon"]
         recipe_dbref = self._good_recipe(
-            'boom!!!',
-            parts, results,
-            and_destroy_it=False,
-            expected_count=3
+            "boom!!!", parts, results, and_destroy_it=False, expected_count=3
         )
 
         _destroy_objs_in_room(set(parts + results))
@@ -2332,35 +2653,32 @@ def _destroy_objs_in_room(keys):
         sps = sorted(parts)
         expected = {key: len(list(grp)) for key, grp in itertools.groupby(sps)}
 
-        self._arm(recipe_dbref, 'boom!!!', parts)
+        self._arm(recipe_dbref, "boom!!!", parts)
         self._check_room_contents(expected)
 
-        self._use(','.join(parts), 'You are a Genius')
+        self._use(",".join(parts), "You are a Genius")
         srs = sorted(set(results))
         expected = {(key, len(list(grp))) for key, grp in itertools.groupby(srs)}
         self._check_room_contents(expected)
 
     def test_e2e_accumulative(self):
         flashlight = create_object(
-                self.object_typeclass,
-                key='flashlight', location=self.char1.location)
+            self.object_typeclass, key="flashlight", location=self.char1.location
+        )
         flashlight_w_1 = create_object(
-                self.object_typeclass,
-                key='flashlight-w-1', location=self.char1.location)
+            self.object_typeclass, key="flashlight-w-1", location=self.char1.location
+        )
         flashlight_w_2 = create_object(
-                self.object_typeclass,
-                key='flashlight-w-2', location=self.char1.location)
+            self.object_typeclass, key="flashlight-w-2", location=self.char1.location
+        )
         flashlight_w_3 = create_object(
-                self.object_typeclass,
-                key='flashlight-w-3',
-                location=self.char1.location)
-        battery = create_object(
-                self.object_typeclass,
-                key='battery', location=self.char1.location)
+            self.object_typeclass, key="flashlight-w-3", location=self.char1.location
+        )
+        battery = create_object(self.object_typeclass, key="battery", location=self.char1.location)
 
-        battery.tags.add('flashlight-1', category=puzzles._PUZZLES_TAG_CATEGORY)
-        battery.tags.add('flashlight-2', category=puzzles._PUZZLES_TAG_CATEGORY)
-        battery.tags.add('flashlight-3', category=puzzles._PUZZLES_TAG_CATEGORY)
+        battery.tags.add("flashlight-1", category=puzzles._PUZZLES_TAG_CATEGORY)
+        battery.tags.add("flashlight-2", category=puzzles._PUZZLES_TAG_CATEGORY)
+        battery.tags.add("flashlight-3", category=puzzles._PUZZLES_TAG_CATEGORY)
 
         # TODO: instead of tagging each flashlight,
         # arm and resolve each puzzle in order so they all
@@ -2368,19 +2686,33 @@ def test_e2e_accumulative(self):
         # it will be necessary to add/remove parts/results because
         # each battery is supposed to be consumed during resolution
         # as the new flashlight has one more battery than before
-        flashlight_w_1.tags.add('flashlight-2', category=puzzles._PUZZLES_TAG_CATEGORY)
-        flashlight_w_2.tags.add('flashlight-3', category=puzzles._PUZZLES_TAG_CATEGORY)
+        flashlight_w_1.tags.add("flashlight-2", category=puzzles._PUZZLES_TAG_CATEGORY)
+        flashlight_w_2.tags.add("flashlight-3", category=puzzles._PUZZLES_TAG_CATEGORY)
 
-        recipe_fl1_dbref = self._good_recipe('flashlight-1', ['flashlight', 'battery'], ['flashlight-w-1'] , and_destroy_it=False,
-                expected_count=1)
-        recipe_fl2_dbref = self._good_recipe('flashlight-2', ['flashlight-w-1', 'battery'], ['flashlight-w-2'] , and_destroy_it=False,
-                expected_count=2)
-        recipe_fl3_dbref = self._good_recipe('flashlight-3', ['flashlight-w-2', 'battery'], ['flashlight-w-3'] , and_destroy_it=False,
-                expected_count=3)
+        recipe_fl1_dbref = self._good_recipe(
+            "flashlight-1",
+            ["flashlight", "battery"],
+            ["flashlight-w-1"],
+            and_destroy_it=False,
+            expected_count=1,
+        )
+        recipe_fl2_dbref = self._good_recipe(
+            "flashlight-2",
+            ["flashlight-w-1", "battery"],
+            ["flashlight-w-2"],
+            and_destroy_it=False,
+            expected_count=2,
+        )
+        recipe_fl3_dbref = self._good_recipe(
+            "flashlight-3",
+            ["flashlight-w-2", "battery"],
+            ["flashlight-w-3"],
+            and_destroy_it=False,
+            expected_count=3,
+        )
 
         # delete protoparts
-        for obj in [battery, flashlight, flashlight_w_1,
-                flashlight_w_2, flashlight_w_3]:
+        for obj in [battery, flashlight, flashlight_w_1, flashlight_w_2, flashlight_w_3]:
             obj.delete()
 
         def _group_parts(parts, excluding=set()):
@@ -2395,55 +2727,68 @@ def _group_parts(parts, excluding=set()):
             return group, dbrefs
 
         # arm each puzzle and group its parts
-        self._arm(recipe_fl1_dbref, 'flashlight-1', ['battery', 'flashlight'])
-        fl1_parts, fl1_dbrefs = _group_parts(['battery', 'flashlight'])
-        self._arm(recipe_fl2_dbref, 'flashlight-2', ['battery', 'flashlight-w-1'])
+        self._arm(recipe_fl1_dbref, "flashlight-1", ["battery", "flashlight"])
+        fl1_parts, fl1_dbrefs = _group_parts(["battery", "flashlight"])
+        self._arm(recipe_fl2_dbref, "flashlight-2", ["battery", "flashlight-w-1"])
         fl2_parts, fl2_dbrefs = _group_parts(
-            ['battery', 'flashlight-w-1'], excluding=list(fl1_dbrefs.keys()))
-        self._arm(recipe_fl3_dbref, 'flashlight-3', ['battery', 'flashlight-w-2'])
+            ["battery", "flashlight-w-1"], excluding=list(fl1_dbrefs.keys())
+        )
+        self._arm(recipe_fl3_dbref, "flashlight-3", ["battery", "flashlight-w-2"])
         fl3_parts, fl3_dbrefs = _group_parts(
-            ['battery', 'flashlight-w-2'],
-            excluding=set(list(fl1_dbrefs.keys()) + list(fl2_dbrefs.keys())))
+            ["battery", "flashlight-w-2"],
+            excluding=set(list(fl1_dbrefs.keys()) + list(fl2_dbrefs.keys())),
+        )
 
-        self._check_room_contents({
-            'battery': 3,
-            'flashlight': 1,
-            'flashlight-w-1': 1,
-            'flashlight-w-2': 1,
-            'flashlight-w-3': 0
-        })
+        self._check_room_contents(
+            {
+                "battery": 3,
+                "flashlight": 1,
+                "flashlight-w-1": 1,
+                "flashlight-w-2": 1,
+                "flashlight-w-3": 0,
+            }
+        )
 
         # all batteries have identical protodefs
-        battery_1 = fl1_dbrefs[fl1_parts['battery'][0]]
-        battery_2 = fl2_dbrefs[fl2_parts['battery'][0]]
-        battery_3 = fl3_dbrefs[fl3_parts['battery'][0]]
+        battery_1 = fl1_dbrefs[fl1_parts["battery"][0]]
+        battery_2 = fl2_dbrefs[fl2_parts["battery"][0]]
+        battery_3 = fl3_dbrefs[fl3_parts["battery"][0]]
         protodef_battery_1 = puzzles.proto_def(battery_1, with_tags=False)
-        del(protodef_battery_1['prototype_key'])
+        del protodef_battery_1["prototype_key"]
         protodef_battery_2 = puzzles.proto_def(battery_2, with_tags=False)
-        del(protodef_battery_2['prototype_key'])
+        del protodef_battery_2["prototype_key"]
         protodef_battery_3 = puzzles.proto_def(battery_3, with_tags=False)
-        del(protodef_battery_3['prototype_key'])
+        del protodef_battery_3["prototype_key"]
         assert protodef_battery_1 == protodef_battery_2 == protodef_battery_3
 
         # each battery can be used in every other puzzle
 
-        b1_parts_dict, b1_puzzlenames, b1_protodefs = puzzles._lookups_parts_puzzlenames_protodefs([battery_1])
+        b1_parts_dict, b1_puzzlenames, b1_protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+            [battery_1]
+        )
         _puzzles = puzzles._puzzles_by_names(b1_puzzlenames.keys())
-        assert set(['flashlight-1', 'flashlight-2', 'flashlight-3']) \
-                == set([p.db.puzzle_name for p in _puzzles])
+        assert set(["flashlight-1", "flashlight-2", "flashlight-3"]) == set(
+            [p.db.puzzle_name for p in _puzzles]
+        )
         matched_puzzles = puzzles._matching_puzzles(_puzzles, b1_puzzlenames, b1_protodefs)
         assert 0 == len(matched_puzzles)
 
-        b2_parts_dict, b2_puzzlenames, b2_protodefs = puzzles._lookups_parts_puzzlenames_protodefs([battery_2])
+        b2_parts_dict, b2_puzzlenames, b2_protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+            [battery_2]
+        )
         _puzzles = puzzles._puzzles_by_names(b2_puzzlenames.keys())
-        assert set(['flashlight-1', 'flashlight-2', 'flashlight-3']) \
-                == set([p.db.puzzle_name for p in _puzzles])
+        assert set(["flashlight-1", "flashlight-2", "flashlight-3"]) == set(
+            [p.db.puzzle_name for p in _puzzles]
+        )
         matched_puzzles = puzzles._matching_puzzles(_puzzles, b2_puzzlenames, b2_protodefs)
         assert 0 == len(matched_puzzles)
-        b3_parts_dict, b3_puzzlenames, b3_protodefs = puzzles._lookups_parts_puzzlenames_protodefs([battery_3])
+        b3_parts_dict, b3_puzzlenames, b3_protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+            [battery_3]
+        )
         _puzzles = puzzles._puzzles_by_names(b3_puzzlenames.keys())
-        assert set(['flashlight-1', 'flashlight-2', 'flashlight-3']) \
-                == set([p.db.puzzle_name for p in _puzzles])
+        assert set(["flashlight-1", "flashlight-2", "flashlight-3"]) == set(
+            [p.db.puzzle_name for p in _puzzles]
+        )
         matched_puzzles = puzzles._matching_puzzles(_puzzles, b3_puzzlenames, b3_protodefs)
         assert 0 == len(matched_puzzles)
 
@@ -2451,189 +2796,228 @@ def _group_parts(parts, excluding=set()):
         assert battery_2 == list(b2_parts_dict.values())[0]
         assert battery_3 == list(b3_parts_dict.values())[0]
         assert b1_puzzlenames.keys() == b2_puzzlenames.keys() == b3_puzzlenames.keys()
-        for puzzle_name in ['flashlight-1', 'flashlight-2', 'flashlight-3']:
+        for puzzle_name in ["flashlight-1", "flashlight-2", "flashlight-3"]:
             assert puzzle_name in b1_puzzlenames
             assert puzzle_name in b2_puzzlenames
             assert puzzle_name in b3_puzzlenames
-        assert list(b1_protodefs.values())[0] == list(b2_protodefs.values())[0] == list(b3_protodefs.values())[0] \
-                == protodef_battery_1 == protodef_battery_2 == protodef_battery_3
+        assert (
+            list(b1_protodefs.values())[0]
+            == list(b2_protodefs.values())[0]
+            == list(b3_protodefs.values())[0]
+            == protodef_battery_1
+            == protodef_battery_2
+            == protodef_battery_3
+        )
 
         # all flashlights have similar protodefs except their key
-        flashlight_1 = fl1_dbrefs[fl1_parts['flashlight'][0]]
-        flashlight_2 = fl2_dbrefs[fl2_parts['flashlight-w-1'][0]]
-        flashlight_3 = fl3_dbrefs[fl3_parts['flashlight-w-2'][0]]
+        flashlight_1 = fl1_dbrefs[fl1_parts["flashlight"][0]]
+        flashlight_2 = fl2_dbrefs[fl2_parts["flashlight-w-1"][0]]
+        flashlight_3 = fl3_dbrefs[fl3_parts["flashlight-w-2"][0]]
         protodef_flashlight_1 = puzzles.proto_def(flashlight_1, with_tags=False)
-        del(protodef_flashlight_1['prototype_key'])
-        assert protodef_flashlight_1['key'] == 'flashlight'
-        del(protodef_flashlight_1['key'])
+        del protodef_flashlight_1["prototype_key"]
+        assert protodef_flashlight_1["key"] == "flashlight"
+        del protodef_flashlight_1["key"]
         protodef_flashlight_2 = puzzles.proto_def(flashlight_2, with_tags=False)
-        del(protodef_flashlight_2['prototype_key'])
-        assert protodef_flashlight_2['key'] == 'flashlight-w-1'
-        del(protodef_flashlight_2['key'])
+        del protodef_flashlight_2["prototype_key"]
+        assert protodef_flashlight_2["key"] == "flashlight-w-1"
+        del protodef_flashlight_2["key"]
         protodef_flashlight_3 = puzzles.proto_def(flashlight_3, with_tags=False)
-        del(protodef_flashlight_3['prototype_key'])
-        assert protodef_flashlight_3['key'] == 'flashlight-w-2'
-        del(protodef_flashlight_3['key'])
+        del protodef_flashlight_3["prototype_key"]
+        assert protodef_flashlight_3["key"] == "flashlight-w-2"
+        del protodef_flashlight_3["key"]
         assert protodef_flashlight_1 == protodef_flashlight_2 == protodef_flashlight_3
 
         # each flashlight can only be used in its own puzzle
 
-        f1_parts_dict, f1_puzzlenames, f1_protodefs = puzzles._lookups_parts_puzzlenames_protodefs([flashlight_1])
+        f1_parts_dict, f1_puzzlenames, f1_protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+            [flashlight_1]
+        )
         _puzzles = puzzles._puzzles_by_names(f1_puzzlenames.keys())
-        assert set(['flashlight-1']) \
-                == set([p.db.puzzle_name for p in _puzzles])
+        assert set(["flashlight-1"]) == set([p.db.puzzle_name for p in _puzzles])
         matched_puzzles = puzzles._matching_puzzles(_puzzles, f1_puzzlenames, f1_protodefs)
         assert 0 == len(matched_puzzles)
-        f2_parts_dict, f2_puzzlenames, f2_protodefs = puzzles._lookups_parts_puzzlenames_protodefs([flashlight_2])
+        f2_parts_dict, f2_puzzlenames, f2_protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+            [flashlight_2]
+        )
         _puzzles = puzzles._puzzles_by_names(f2_puzzlenames.keys())
-        assert set(['flashlight-2']) \
-                == set([p.db.puzzle_name for p in _puzzles])
+        assert set(["flashlight-2"]) == set([p.db.puzzle_name for p in _puzzles])
         matched_puzzles = puzzles._matching_puzzles(_puzzles, f2_puzzlenames, f2_protodefs)
         assert 0 == len(matched_puzzles)
-        f3_parts_dict, f3_puzzlenames, f3_protodefs = puzzles._lookups_parts_puzzlenames_protodefs([flashlight_3])
+        f3_parts_dict, f3_puzzlenames, f3_protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+            [flashlight_3]
+        )
         _puzzles = puzzles._puzzles_by_names(f3_puzzlenames.keys())
-        assert set(['flashlight-3']) \
-                == set([p.db.puzzle_name for p in _puzzles])
+        assert set(["flashlight-3"]) == set([p.db.puzzle_name for p in _puzzles])
         matched_puzzles = puzzles._matching_puzzles(_puzzles, f3_puzzlenames, f3_protodefs)
         assert 0 == len(matched_puzzles)
 
         assert flashlight_1 == list(f1_parts_dict.values())[0]
         assert flashlight_2 == list(f2_parts_dict.values())[0]
         assert flashlight_3 == list(f3_parts_dict.values())[0]
-        for puzzle_name in set(list(f1_puzzlenames.keys()) + list(f2_puzzlenames.keys()) + list(f3_puzzlenames.keys())):
-            assert puzzle_name in ['flashlight-1', 'flashlight-2', 'flashlight-3', 'puzzle_member']
-        protodef_flashlight_1['key'] = 'flashlight'
+        for puzzle_name in set(
+            list(f1_puzzlenames.keys()) + list(f2_puzzlenames.keys()) + list(f3_puzzlenames.keys())
+        ):
+            assert puzzle_name in ["flashlight-1", "flashlight-2", "flashlight-3", "puzzle_member"]
+        protodef_flashlight_1["key"] = "flashlight"
         assert list(f1_protodefs.values())[0] == protodef_flashlight_1
-        protodef_flashlight_2['key'] = 'flashlight-w-1'
+        protodef_flashlight_2["key"] = "flashlight-w-1"
         assert list(f2_protodefs.values())[0] == protodef_flashlight_2
-        protodef_flashlight_3['key'] = 'flashlight-w-2'
+        protodef_flashlight_3["key"] = "flashlight-w-2"
         assert list(f3_protodefs.values())[0] == protodef_flashlight_3
 
         # each battery can be matched with every other flashlight
         # to potentially resolve each puzzle
         for batt in [battery_1, battery_2, battery_3]:
-            parts_dict, puzzlenames, protodefs = puzzles._lookups_parts_puzzlenames_protodefs([batt, flashlight_1])
-            assert set([batt.dbref, flashlight_1.dbref]) == set(puzzlenames['flashlight-1'])
-            assert set([batt.dbref]) == set(puzzlenames['flashlight-2'])
-            assert set([batt.dbref]) == set(puzzlenames['flashlight-3'])
+            parts_dict, puzzlenames, protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+                [batt, flashlight_1]
+            )
+            assert set([batt.dbref, flashlight_1.dbref]) == set(puzzlenames["flashlight-1"])
+            assert set([batt.dbref]) == set(puzzlenames["flashlight-2"])
+            assert set([batt.dbref]) == set(puzzlenames["flashlight-3"])
             _puzzles = puzzles._puzzles_by_names(puzzlenames.keys())
-            assert set(['flashlight-1', 'flashlight-2', 'flashlight-3']) == set([p.db.puzzle_name for p in _puzzles])
+            assert set(["flashlight-1", "flashlight-2", "flashlight-3"]) == set(
+                [p.db.puzzle_name for p in _puzzles]
+            )
             matched_puzzles = puzzles._matching_puzzles(_puzzles, puzzlenames, protodefs)
             assert 1 == len(matched_puzzles)
-            parts_dict, puzzlenames, protodefs = puzzles._lookups_parts_puzzlenames_protodefs([batt, flashlight_2])
-            assert set([batt.dbref]) == set(puzzlenames['flashlight-1'])
-            assert set([batt.dbref, flashlight_2.dbref]) == set(puzzlenames['flashlight-2'])
-            assert set([batt.dbref]) == set(puzzlenames['flashlight-3'])
+            parts_dict, puzzlenames, protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+                [batt, flashlight_2]
+            )
+            assert set([batt.dbref]) == set(puzzlenames["flashlight-1"])
+            assert set([batt.dbref, flashlight_2.dbref]) == set(puzzlenames["flashlight-2"])
+            assert set([batt.dbref]) == set(puzzlenames["flashlight-3"])
             _puzzles = puzzles._puzzles_by_names(puzzlenames.keys())
-            assert set(['flashlight-1','flashlight-2', 'flashlight-3']) == set([p.db.puzzle_name for p in _puzzles])
+            assert set(["flashlight-1", "flashlight-2", "flashlight-3"]) == set(
+                [p.db.puzzle_name for p in _puzzles]
+            )
             matched_puzzles = puzzles._matching_puzzles(_puzzles, puzzlenames, protodefs)
             assert 1 == len(matched_puzzles)
-            parts_dict, puzzlenames, protodefs = puzzles._lookups_parts_puzzlenames_protodefs([batt, flashlight_3])
-            assert set([batt.dbref]) == set(puzzlenames['flashlight-1'])
-            assert set([batt.dbref]) == set(puzzlenames['flashlight-2'])
-            assert set([batt.dbref, flashlight_3.dbref]) == set(puzzlenames['flashlight-3'])
+            parts_dict, puzzlenames, protodefs = puzzles._lookups_parts_puzzlenames_protodefs(
+                [batt, flashlight_3]
+            )
+            assert set([batt.dbref]) == set(puzzlenames["flashlight-1"])
+            assert set([batt.dbref]) == set(puzzlenames["flashlight-2"])
+            assert set([batt.dbref, flashlight_3.dbref]) == set(puzzlenames["flashlight-3"])
             _puzzles = puzzles._puzzles_by_names(puzzlenames.keys())
-            assert set(['flashlight-1','flashlight-2', 'flashlight-3']) == set([p.db.puzzle_name for p in _puzzles])
+            assert set(["flashlight-1", "flashlight-2", "flashlight-3"]) == set(
+                [p.db.puzzle_name for p in _puzzles]
+            )
             matched_puzzles = puzzles._matching_puzzles(_puzzles, puzzlenames, protodefs)
             assert 1 == len(matched_puzzles)
 
         # delete all parts
-        for part in list(fl1_dbrefs.values()) + list(fl2_dbrefs.values()) + list(fl3_dbrefs.values()):
+        for part in (
+            list(fl1_dbrefs.values()) + list(fl2_dbrefs.values()) + list(fl3_dbrefs.values())
+        ):
             part.delete()
 
-        self._check_room_contents({
-            'battery': 0,
-            'flashlight': 0,
-            'flashlight-w-1': 0,
-            'flashlight-w-2': 0,
-            'flashlight-w-3': 0
-        })
+        self._check_room_contents(
+            {
+                "battery": 0,
+                "flashlight": 0,
+                "flashlight-w-1": 0,
+                "flashlight-w-2": 0,
+                "flashlight-w-3": 0,
+            }
+        )
 
         # arm first puzzle 3 times and group its parts so we can solve
         # all puzzles with the parts from the 1st armed
         for i in range(3):
-            self._arm(recipe_fl1_dbref, 'flashlight-1', ['battery', 'flashlight'])
-        fl1_parts, fl1_dbrefs = _group_parts(['battery', 'flashlight'])
+            self._arm(recipe_fl1_dbref, "flashlight-1", ["battery", "flashlight"])
+        fl1_parts, fl1_dbrefs = _group_parts(["battery", "flashlight"])
 
         # delete the 2 extra flashlights so we can start solving
-        for flashlight_dbref in fl1_parts['flashlight'][1:]:
+        for flashlight_dbref in fl1_parts["flashlight"][1:]:
             fl1_dbrefs[flashlight_dbref].delete()
 
-        self._check_room_contents({
-            'battery': 3,
-            'flashlight': 1,
-            'flashlight-w-1': 0,
-            'flashlight-w-2': 0,
-            'flashlight-w-3': 0
-        })
-
-        self._use('1-battery, flashlight', 'You are a Genius')
-        self._check_room_contents({
-            'battery': 2,
-            'flashlight': 0,
-            'flashlight-w-1': 1,
-            'flashlight-w-2': 0,
-            'flashlight-w-3': 0
-        })
-
-        self._use('1-battery, flashlight-w-1', 'You are a Genius')
-        self._check_room_contents({
-            'battery': 1,
-            'flashlight': 0,
-            'flashlight-w-1': 0,
-            'flashlight-w-2': 1,
-            'flashlight-w-3': 0
-        })
-
-        self._use('battery, flashlight-w-2', 'You are a Genius')
-        self._check_room_contents({
-            'battery': 0,
-            'flashlight': 0,
-            'flashlight-w-1': 0,
-            'flashlight-w-2': 0,
-            'flashlight-w-3': 1
-        })
+        self._check_room_contents(
+            {
+                "battery": 3,
+                "flashlight": 1,
+                "flashlight-w-1": 0,
+                "flashlight-w-2": 0,
+                "flashlight-w-3": 0,
+            }
+        )
+
+        self._use("1-battery, flashlight", "You are a Genius")
+        self._check_room_contents(
+            {
+                "battery": 2,
+                "flashlight": 0,
+                "flashlight-w-1": 1,
+                "flashlight-w-2": 0,
+                "flashlight-w-3": 0,
+            }
+        )
+
+        self._use("1-battery, flashlight-w-1", "You are a Genius")
+        self._check_room_contents(
+            {
+                "battery": 1,
+                "flashlight": 0,
+                "flashlight-w-1": 0,
+                "flashlight-w-2": 1,
+                "flashlight-w-3": 0,
+            }
+        )
+
+        self._use("battery, flashlight-w-2", "You are a Genius")
+        self._check_room_contents(
+            {
+                "battery": 0,
+                "flashlight": 0,
+                "flashlight-w-1": 0,
+                "flashlight-w-2": 0,
+                "flashlight-w-3": 1,
+            }
+        )
 
     def test_e2e_interchangeable_parts_and_results(self):
         # Parts and Results can be used in multiple puzzles
-        egg = create_object(
-                self.object_typeclass,
-                key='egg', location=self.char1.location)
-        flour = create_object(
-                self.object_typeclass,
-                key='flour', location=self.char1.location)
+        egg = create_object(self.object_typeclass, key="egg", location=self.char1.location)
+        flour = create_object(self.object_typeclass, key="flour", location=self.char1.location)
         boiling_water = create_object(
-                self.object_typeclass,
-                key='boiling water', location=self.char1.location)
+            self.object_typeclass, key="boiling water", location=self.char1.location
+        )
         boiled_egg = create_object(
-                self.object_typeclass,
-                key='boiled egg', location=self.char1.location)
-        dough = create_object(
-                self.object_typeclass,
-                key='dough', location=self.char1.location)
-        pasta = create_object(
-                self.object_typeclass,
-                key='pasta', location=self.char1.location)
+            self.object_typeclass, key="boiled egg", location=self.char1.location
+        )
+        dough = create_object(self.object_typeclass, key="dough", location=self.char1.location)
+        pasta = create_object(self.object_typeclass, key="pasta", location=self.char1.location)
 
         # Three recipes:
         # 1. breakfast: egg + boiling water = boiled egg & boiling water
         # 2. dough: egg + flour = dough
         # 3. entree: dough + boiling water = pasta & boiling water
         # tag interchangeable parts according to their puzzles' name
-        egg.tags.add('breakfast', category=puzzles._PUZZLES_TAG_CATEGORY)
-        egg.tags.add('dough', category=puzzles._PUZZLES_TAG_CATEGORY)
-        dough.tags.add('entree', category=puzzles._PUZZLES_TAG_CATEGORY)
-        boiling_water.tags.add('breakfast', category=puzzles._PUZZLES_TAG_CATEGORY)
-        boiling_water.tags.add('entree', category=puzzles._PUZZLES_TAG_CATEGORY)
+        egg.tags.add("breakfast", category=puzzles._PUZZLES_TAG_CATEGORY)
+        egg.tags.add("dough", category=puzzles._PUZZLES_TAG_CATEGORY)
+        dough.tags.add("entree", category=puzzles._PUZZLES_TAG_CATEGORY)
+        boiling_water.tags.add("breakfast", category=puzzles._PUZZLES_TAG_CATEGORY)
+        boiling_water.tags.add("entree", category=puzzles._PUZZLES_TAG_CATEGORY)
 
         # create recipes
-        recipe1_dbref = self._good_recipe('breakfast', ['egg', 'boiling water'], ['boiled egg', 'boiling water'] , and_destroy_it=False)
-        recipe2_dbref = self._good_recipe('dough', ['egg', 'flour'], ['dough'] , and_destroy_it=False, expected_count=2)
-        recipe3_dbref = self._good_recipe('entree', ['dough', 'boiling water'], ['pasta', 'boiling water'] , and_destroy_it=False, expected_count=3)
+        recipe1_dbref = self._good_recipe(
+            "breakfast",
+            ["egg", "boiling water"],
+            ["boiled egg", "boiling water"],
+            and_destroy_it=False,
+        )
+        recipe2_dbref = self._good_recipe(
+            "dough", ["egg", "flour"], ["dough"], and_destroy_it=False, expected_count=2
+        )
+        recipe3_dbref = self._good_recipe(
+            "entree",
+            ["dough", "boiling water"],
+            ["pasta", "boiling water"],
+            and_destroy_it=False,
+            expected_count=3,
+        )
 
         # delete protoparts
-        for obj in [egg, flour, boiling_water,
-                boiled_egg, dough, pasta]:
+        for obj in [egg, flour, boiling_water, boiled_egg, dough, pasta]:
             obj.delete()
 
         # arm each puzzle and group its parts
@@ -2648,26 +3032,26 @@ def _group_parts(parts, excluding=set()):
                     dbrefs[o.dbref] = o
             return group, dbrefs
 
-        self._arm(recipe1_dbref, 'breakfast', ['egg', 'boiling water'])
-        breakfast_parts, breakfast_dbrefs = _group_parts(['egg', 'boiling water'])
-        self._arm(recipe2_dbref, 'dough', ['egg', 'flour'])
+        self._arm(recipe1_dbref, "breakfast", ["egg", "boiling water"])
+        breakfast_parts, breakfast_dbrefs = _group_parts(["egg", "boiling water"])
+        self._arm(recipe2_dbref, "dough", ["egg", "flour"])
         dough_parts, dough_dbrefs = _group_parts(
-            ['egg', 'flour'], excluding=list(breakfast_dbrefs.keys()))
-        self._arm(recipe3_dbref, 'entree', ['dough', 'boiling water'])
+            ["egg", "flour"], excluding=list(breakfast_dbrefs.keys())
+        )
+        self._arm(recipe3_dbref, "entree", ["dough", "boiling water"])
         entree_parts, entree_dbrefs = _group_parts(
-            ['dough', 'boiling water'],
-            excluding=set(list(breakfast_dbrefs.keys()) + list(dough_dbrefs.keys())))
+            ["dough", "boiling water"],
+            excluding=set(list(breakfast_dbrefs.keys()) + list(dough_dbrefs.keys())),
+        )
 
         # create a box so we can put all objects in
         # so that they can't be found during puzzle resolution
-        self.box = create_object(
-                self.object_typeclass,
-                key='box', location=self.char1.location)
+        self.box = create_object(self.object_typeclass, key="box", location=self.char1.location)
+
         def _box_all():
             # print "boxing all\n", "-"*20
             for o in self.room1.contents:
-                if o not in [self.char1, self.char2, self.exit,
-                        self.obj1, self.obj2, self.box]:
+                if o not in [self.char1, self.char2, self.exit, self.obj1, self.obj2, self.box]:
                     o.location = self.box
                     # print o.key, o.dbref, "boxed"
                 else:
@@ -2684,42 +3068,40 @@ def _unbox(dbrefs):
         # solve dough puzzle using breakfast's egg
         # and dough's flour. A new dough will be created
         _box_all()
-        _unbox(breakfast_parts.pop('egg') + dough_parts.pop('flour'))
-        self._use('egg, flour', 'You are a Genius')
+        _unbox(breakfast_parts.pop("egg") + dough_parts.pop("flour"))
+        self._use("egg, flour", "You are a Genius")
 
         # solve entree puzzle with newly created dough
         # and breakfast's boiling water. A new
         # boiling water and pasta will be created
-        _unbox(breakfast_parts.pop('boiling water'))
-        self._use('boiling water, dough', 'You are a Genius')
+        _unbox(breakfast_parts.pop("boiling water"))
+        self._use("boiling water, dough", "You are a Genius")
 
         # solve breakfast puzzle with dough's egg
         # and newly created boiling water. A new
         # boiling water and boiled egg will be created
-        _unbox(dough_parts.pop('egg'))
-        self._use('boiling water, egg', 'You are a Genius')
+        _unbox(dough_parts.pop("egg"))
+        self._use("boiling water, egg", "You are a Genius")
 
         # solve entree puzzle using entree's dough
         # and newly created boiling water. A new
         # boiling water and pasta will be created
-        _unbox(entree_parts.pop('dough'))
-        self._use('boiling water, dough', 'You are a Genius')
+        _unbox(entree_parts.pop("dough"))
+        self._use("boiling water, dough", "You are a Genius")
+
+        self._check_room_contents({"boiling water": 1, "pasta": 2, "boiled egg": 1})
 
-        self._check_room_contents({
-            'boiling water': 1,
-            'pasta': 2,
-            'boiled egg': 1,
-        })
 
 # Tests for the building_menu contrib
 from evennia.contrib.building_menu import BuildingMenu, CmdNoInput, CmdNoMatch
 
+
 class Submenu(BuildingMenu):
     def init(self, exit):
         self.add_choice("title", key="t", attr="key")
 
-class TestBuildingMenu(CommandTest):
 
+class TestBuildingMenu(CommandTest):
     def setUp(self):
         super(TestBuildingMenu, self).setUp()
         self.menu = BuildingMenu(caller=self.char1, obj=self.room1, title="test")
@@ -2752,7 +3134,28 @@ def test_add_choice_without_key(self):
         for i in range(20):
             choices.append(self.menu.add_choice("choice", attr="test"))
         self.menu._add_keys_choice()
-        keys = ["c", "h", "o", "i", "e", "ch", "ho", "oi", "ic", "ce", "cho", "hoi", "oic", "ice", "choi", "hoic", "oice", "choic", "hoice", "choice"]
+        keys = [
+            "c",
+            "h",
+            "o",
+            "i",
+            "e",
+            "ch",
+            "ho",
+            "oi",
+            "ic",
+            "ce",
+            "cho",
+            "hoi",
+            "oic",
+            "ice",
+            "choi",
+            "hoic",
+            "oice",
+            "choic",
+            "hoice",
+            "choice",
+        ]
         for i in range(20):
             self.assertEqual(choices[i].key, keys[i])
 
@@ -2764,13 +3167,19 @@ def test_add_choice_without_key(self):
     def test_callbacks(self):
         """Test callbacks in menus."""
         self.room1.key = "room1"
+
         def on_enter(caller, menu):
             caller.msg("on_enter:{}".format(menu.title))
+
         def on_nomatch(caller, string, choice):
             caller.msg("on_nomatch:{},{}".format(string, choice.key))
+
         def on_leave(caller, obj):
             caller.msg("on_leave:{}".format(obj.key))
-        self.menu.add_choice("test", key="e", on_enter=on_enter, on_nomatch=on_nomatch, on_leave=on_leave)
+
+        self.menu.add_choice(
+            "test", key="e", on_enter=on_enter, on_nomatch=on_nomatch, on_leave=on_leave
+        )
         self.call(CmdNoMatch(building_menu=self.menu), "e", "on_enter:test")
         self.call(CmdNoMatch(building_menu=self.menu), "ok", "on_nomatch:ok,e")
         self.call(CmdNoMatch(building_menu=self.menu), "@", "on_leave:room1")
@@ -2780,10 +3189,10 @@ def test_multi_level(self):
         """Test multi-level choices."""
         # Creaste three succeeding menu (t2 is contained in t1, t3 is contained in t2)
         def on_nomatch_t1(caller, menu):
-            menu.move("whatever") # this will be valid since after t1 is a joker
+            menu.move("whatever")  # this will be valid since after t1 is a joker
 
         def on_nomatch_t2(caller, menu):
-            menu.move("t3") # this time the key matters
+            menu.move("t3")  # this time the key matters
 
         t1 = self.menu.add_choice("what", key="t1", on_nomatch=on_nomatch_t1)
         t2 = self.menu.add_choice("and", key="t1.*", on_nomatch=on_nomatch_t2)
@@ -2839,6 +3248,7 @@ def on_nomatch_t2(caller, menu):
 
     def test_submenu(self):
         """Test to add sub-menus."""
+
         def open_exit(menu):
             menu.open_submenu("evennia.contrib.tests.Submenu", self.exit)
             return False
diff --git a/evennia/contrib/tree_select.py b/evennia/contrib/tree_select.py
index d2854fc83f4..bdc600c8e41 100644
--- a/evennia/contrib/tree_select.py
+++ b/evennia/contrib/tree_select.py
@@ -161,10 +161,17 @@
 from evennia.utils.logger import log_trace
 from evennia import Command
 
-def init_tree_selection(treestr, caller, callback,
-                        index=None, mark_category=True, go_back=True,
-                        cmd_on_exit="look",
-                        start_text="Make your selection:"):
+
+def init_tree_selection(
+    treestr,
+    caller,
+    callback,
+    index=None,
+    mark_category=True,
+    go_back=True,
+    cmd_on_exit="look",
+    start_text="Make your selection:",
+):
     """
     Prompts a player to select an option from a menu tree given as a multi-line string.
 
@@ -205,17 +212,24 @@ def init_tree_selection(treestr, caller, callback,
 
     # Pass kwargs to store data needed in the menu
     kwargs = {
-    "index":index,
-    "mark_category":mark_category,
-    "go_back":go_back,
-    "treestr":treestr,
-    "callback":callback,
-    "start_text":start_text
+        "index": index,
+        "mark_category": mark_category,
+        "go_back": go_back,
+        "treestr": treestr,
+        "callback": callback,
+        "start_text": start_text,
     }
 
     # Initialize menu of selections
-    evmenu.EvMenu(caller, "evennia.contrib.tree_select", startnode="menunode_treeselect",
-                  startnode_input=None, cmd_on_exit=cmd_on_exit, **kwargs)
+    evmenu.EvMenu(
+        caller,
+        "evennia.contrib.tree_select",
+        startnode="menunode_treeselect",
+        startnode_input=None,
+        cmd_on_exit=cmd_on_exit,
+        **kwargs,
+    )
+
 
 def dashcount(entry):
     """
@@ -236,6 +250,7 @@ def dashcount(entry):
             return dashes
     return dashes
 
+
 def is_category(treestr, index):
     """
     Determines whether an option in a tree string is a category by
@@ -248,12 +263,13 @@ def is_category(treestr, index):
     Returns:
         is_category (bool): Whether the option is a category
     """
-    opt_list = treestr.split('\n')
+    opt_list = treestr.split("\n")
     # Not a category if it's the last one in the list
     if index == len(opt_list) - 1:
         return False
     # Not a category if next option is not one level deeper
-    return not bool(dashcount(opt_list[index+1]) != dashcount(opt_list[index]) + 1)
+    return not bool(dashcount(opt_list[index + 1]) != dashcount(opt_list[index]) + 1)
+
 
 def parse_opts(treestr, category_index=None):
     """
@@ -272,7 +288,7 @@ def parse_opts(treestr, category_index=None):
                                   category or True if a selection was made
     """
     dash_depth = 0
-    opt_list = treestr.split('\n')
+    opt_list = treestr.split("\n")
     kept_opts = []
 
     # If a category index is given
@@ -283,7 +299,7 @@ def parse_opts(treestr, category_index=None):
         # Otherwise, change the dash depth to match the new category.
         dash_depth = dashcount(opt_list[category_index]) + 1
         # Delete everything before the category index
-        opt_list = opt_list [category_index+1:]
+        opt_list = opt_list[category_index + 1 :]
 
     # Keep every option (referenced by index) at the appropriate depth
     cur_index = 0
@@ -299,6 +315,7 @@ def parse_opts(treestr, category_index=None):
         cur_index += 1
     return kept_opts
 
+
 def index_to_selection(treestr, index, desc=False):
     """
     Given a menu tree string and an index, returns the corresponding selection's
@@ -315,15 +332,15 @@ def index_to_selection(treestr, index, desc=False):
     Returns:
         selection (str): Selection key or description if 'desc' is set
     """
-    opt_list = treestr.split('\n')
+    opt_list = treestr.split("\n")
     # Fetch the given line
     selection = opt_list[index]
     # Strip out the dashes at the start
-    selection = selection[dashcount(selection):]
+    selection = selection[dashcount(selection) :]
     # Separate out description, if any
     if ":" in selection:
         # Split string into key and description
-        selection = selection.split(':', 1)
+        selection = selection.split(":", 1)
         selection[1] = selection[1].strip(" ")
     else:
         # If no description given, set description to None
@@ -333,6 +350,7 @@ def index_to_selection(treestr, index, desc=False):
     else:
         return selection[1]
 
+
 def go_up_one_category(treestr, index):
     """
     Given a menu tree string and an index, returns the category that the given option
@@ -345,12 +363,11 @@ def go_up_one_category(treestr, index):
     Returns:
         parent_category (int): Index of parent category
     """
-    opt_list = treestr.split('\n')
+    opt_list = treestr.split("\n")
     # Get the number of dashes deep the given index is
     dash_level = dashcount(opt_list[index])
     # Delete everything after the current index
-    opt_list = opt_list[:index+1]
-
+    opt_list = opt_list[: index + 1]
 
     # If there's no dash, return 'None' to return to base menu
     if dash_level == 0:
@@ -362,6 +379,7 @@ def go_up_one_category(treestr, index):
             return current_index
         current_index -= 1
 
+
 def optlist_to_menuoptions(treestr, optlist, index, mark_category, go_back):
     """
     Takes a list of options processed by parse_opts and turns it into
@@ -396,17 +414,20 @@ def optlist_to_menuoptions(treestr, optlist, index, mark_category, go_back):
         if desc:
             menuitem["desc"] = desc
         # Passing 'newindex' as a kwarg to the node is how we move through the menu!
-        menuitem["goto"] = ["menunode_treeselect", {"newindex":index_to_add}]
+        menuitem["goto"] = ["menunode_treeselect", {"newindex": index_to_add}]
         menuoptions.append(menuitem)
         cur_index += 1
     # Add option to go back, if needed
     if index != None and go_back == True:
-        gobackitem = {"key":["<< Go Back", "go back", "back"],
-                      "desc":"Return to the previous menu.",
-                      "goto":["menunode_treeselect", {"newindex":go_up_one_category(treestr, index)}]}
+        gobackitem = {
+            "key": ["<< Go Back", "go back", "back"],
+            "desc": "Return to the previous menu.",
+            "goto": ["menunode_treeselect", {"newindex": go_up_one_category(treestr, index)}],
+        }
         menuoptions.append(gobackitem)
     return menuoptions
 
+
 def menunode_treeselect(caller, raw_string, **kwargs):
     """
     This is the repeating menu node that handles the tree selection.
@@ -447,11 +468,17 @@ def menunode_treeselect(caller, raw_string, **kwargs):
         else:
             # Use the category name and description (if any) as the menu text
             if index_to_selection(treestr, index, desc=True) != None:
-                text = "|w" + index_to_selection(treestr, index) + "|n: " + index_to_selection(treestr, index, desc=True)
+                text = (
+                    "|w"
+                    + index_to_selection(treestr, index)
+                    + "|n: "
+                    + index_to_selection(treestr, index, desc=True)
+                )
             else:
                 text = "|w" + index_to_selection(treestr, index) + "|n"
         return text, options
 
+
 # The rest of this module is for the example menu and command! It'll change the color of your name.
 
 """
@@ -486,6 +513,7 @@ def menunode_treeselect(caller, raw_string, **kwargs):
 --Fuchsia: |503Set your name to Fuchsia|n
 Remove name color: Remove your name color, if any"""
 
+
 class CmdNameColor(Command):
     """
     Set or remove a special color on your name. Just an example for the
@@ -496,9 +524,10 @@ class CmdNameColor(Command):
 
     def func(self):
         # This is all you have to do to initialize a menu!
-        init_tree_selection(NAMECOLOR_MENU, self.caller,
-                            change_name_color,
-                            start_text="Name color options:")
+        init_tree_selection(
+            NAMECOLOR_MENU, self.caller, change_name_color, start_text="Name color options:"
+        )
+
 
 def change_name_color(caller, treestr, index, selection):
     """
@@ -517,19 +546,32 @@ def change_name_color(caller, treestr, index, selection):
         caller.db.uncolored_name = caller.key
 
     # Dictionary matching color selection names to color codes
-    colordict = { "Red":"|511", "Pink":"|533", "Maroon":"|301",
-    "Orange":"|531", "Brown":"|321", "Sienna":"|420",
-    "Yellow":"|551", "Gold":"|540", "Dandelion":"|553",
-    "Green":"|141", "Lime":"|350", "Forest":"|032",
-    "Blue":"|115", "Cyan":"|155", "Navy":"|113",
-    "Purple":"|415", "Lavender":"|535", "Fuchsia":"|503"}
+    colordict = {
+        "Red": "|511",
+        "Pink": "|533",
+        "Maroon": "|301",
+        "Orange": "|531",
+        "Brown": "|321",
+        "Sienna": "|420",
+        "Yellow": "|551",
+        "Gold": "|540",
+        "Dandelion": "|553",
+        "Green": "|141",
+        "Lime": "|350",
+        "Forest": "|032",
+        "Blue": "|115",
+        "Cyan": "|155",
+        "Navy": "|113",
+        "Purple": "|415",
+        "Lavender": "|535",
+        "Fuchsia": "|503",
+    }
 
     # I know this probably isn't the best way to do this. It's just an example!
-    if selection == "Remove name color": # Player chose to remove their name color
+    if selection == "Remove name color":  # Player chose to remove their name color
         caller.key = caller.db.uncolored_name
         caller.msg("Name color removed.")
     elif selection in colordict:
-        newcolor = colordict[selection] # Retrieve color code based on menu selection
-        caller.key = newcolor + caller.db.uncolored_name + "|n" # Add color code to caller's name
+        newcolor = colordict[selection]  # Retrieve color code based on menu selection
+        caller.key = newcolor + caller.db.uncolored_name + "|n"  # Add color code to caller's name
         caller.msg(newcolor + ("Name color changed to %s!" % selection) + "|n")
-
diff --git a/evennia/contrib/turnbattle/tb_basic.py b/evennia/contrib/turnbattle/tb_basic.py
index 20fafac0220..da8915ec864 100644
--- a/evennia/contrib/turnbattle/tb_basic.py
+++ b/evennia/contrib/turnbattle/tb_basic.py
@@ -52,8 +52,8 @@ class Character(TBBasicCharacter):
 ----------------------------------------------------------------------------
 """
 
-TURN_TIMEOUT = 30 # Time before turns automatically end, in seconds
-ACTIONS_PER_TURN = 1 # Number of actions allowed per turn
+TURN_TIMEOUT = 30  # Time before turns automatically end, in seconds
+ACTIONS_PER_TURN = 1  # Number of actions allowed per turn
 
 """
 ----------------------------------------------------------------------------
@@ -61,6 +61,7 @@ class Character(TBBasicCharacter):
 ----------------------------------------------------------------------------
 """
 
+
 def roll_init(character):
     """
     Rolls a number between 1-1000 to determine initiative.
@@ -175,6 +176,7 @@ def apply_damage(defender, damage):
     if defender.db.hp <= 0:
         defender.db.hp = 0
 
+
 def at_defeat(defeated):
     """
     Announces the defeat of a fighter in combat.
@@ -190,6 +192,7 @@ def at_defeat(defeated):
     """
     defeated.location.msg_contents("%s has been defeated!" % defeated)
 
+
 def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
     """
     Resolves an attack and outputs the result.
@@ -215,12 +218,15 @@ def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
     else:
         damage_value = get_damage(attacker, defender)  # Calculate damage value.
         # Announce damage dealt and apply damage.
-        attacker.location.msg_contents("%s hits %s for %i damage!" % (attacker, defender, damage_value))
+        attacker.location.msg_contents(
+            "%s hits %s for %i damage!" % (attacker, defender, damage_value)
+        )
         apply_damage(defender, damage_value)
         # If defender HP is reduced to 0 or less, call at_defeat.
         if defender.db.hp <= 0:
             at_defeat(defender)
 
+
 def combat_cleanup(character):
     """
     Cleans up all the temporary combat-related attributes on a character.
@@ -279,7 +285,7 @@ def spend_action(character, actions, action_name=None):
     """
     if action_name:
         character.db.combat_lastaction = action_name
-    if actions == 'all':  # If spending all actions
+    if actions == "all":  # If spending all actions
         character.db.combat_actionsleft = 0  # Set actions to 0
     else:
         character.db.combat_actionsleft -= actions  # Use up actions.
@@ -341,6 +347,7 @@ def at_before_move(self, destination):
             return False
         return True
 
+
 """
 ----------------------------------------------------------------------------
 SCRIPTS START HERE
@@ -388,7 +395,7 @@ def at_script_creation(self):
 
         # Announce the turn order.
         self.obj.msg_contents("Turn order is: %s " % ", ".join(obj.key for obj in self.db.fighters))
-        
+
         # Start first fighter's turn.
         self.start_turn(self.db.fighters[0])
 
@@ -408,13 +415,17 @@ def at_repeat(self):
         """
         Called once every self.interval seconds.
         """
-        currentchar = self.db.fighters[self.db.turn]  # Note the current character in the turn order.
+        currentchar = self.db.fighters[
+            self.db.turn
+        ]  # Note the current character in the turn order.
         self.db.timer -= self.interval  # Count down the timer.
 
         if self.db.timer <= 0:
             # Force current character to disengage if timer runs out.
             self.obj.msg_contents("%s's turn timed out!" % currentchar)
-            spend_action(currentchar, 'all', action_name="disengage")  # Spend all remaining actions.
+            spend_action(
+                currentchar, "all", action_name="disengage"
+            )  # Spend all remaining actions.
             return
         elif self.db.timer <= 10 and not self.db.timeout_warning_given:  # 10 seconds left
             # Warn the current character if they're about to time out.
@@ -429,8 +440,12 @@ def initialize_for_combat(self, character):
             character (obj): Character to initialize for combat.
         """
         combat_cleanup(character)  # Clean up leftover combat attributes beforehand, just in case.
-        character.db.combat_actionsleft = 0  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
-        character.db.combat_turnhandler = self  # Add a reference to this turn handler script to the character
+        character.db.combat_actionsleft = (
+            0
+        )  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
+        character.db.combat_turnhandler = (
+            self
+        )  # Add a reference to this turn handler script to the character
         character.db.combat_lastaction = "null"  # Track last action taken in combat
 
     def start_turn(self, character):
@@ -460,7 +475,9 @@ def next_turn(self):
         # Check to see if every character disengaged as their last action. If so, end combat.
         disengage_check = True
         for fighter in self.db.fighters:
-            if fighter.db.combat_lastaction != "disengage":  # If a character has done anything but disengage
+            if (
+                fighter.db.combat_lastaction != "disengage"
+            ):  # If a character has done anything but disengage
                 disengage_check = False
         if disengage_check:  # All characters have disengaged
             self.obj.msg_contents("All fighters have disengaged! Combat is over!")
@@ -472,7 +489,9 @@ def next_turn(self):
         for fighter in self.db.fighters:
             if fighter.db.HP == 0:
                 defeated_characters += 1  # Add 1 for every fighter with 0 HP left (defeated)
-        if defeated_characters == (len(self.db.fighters) - 1):  # If only one character isn't defeated
+        if defeated_characters == (
+            len(self.db.fighters) - 1
+        ):  # If only one character isn't defeated
             for fighter in self.db.fighters:
                 if fighter.db.HP != 0:
                     LastStanding = fighter  # Pick the one fighter left with HP remaining
@@ -516,7 +535,7 @@ def join_fight(self, character):
         # Initialize the character like you do at the start.
         self.initialize_for_combat(character)
 
-        
+
 """
 ----------------------------------------------------------------------------
 COMMANDS START HERE
@@ -535,6 +554,7 @@ class CmdFight(Command):
     fight is added to combat, and a turn order is randomly rolled.
     When it's your turn, you can attack other characters.
     """
+
     key = "fight"
     help_category = "combat"
 
@@ -643,8 +663,10 @@ def func(self):
             self.caller.msg("You can only do that on your turn.")
             return
 
-        self.caller.location.msg_contents("%s takes no further action, passing the turn." % self.caller)
-        spend_action(self.caller, 'all', action_name="pass")  # Spend all remaining actions.
+        self.caller.location.msg_contents(
+            "%s takes no further action, passing the turn." % self.caller
+        )
+        spend_action(self.caller, "all", action_name="pass")  # Spend all remaining actions.
 
 
 class CmdDisengage(Command):
@@ -676,7 +698,7 @@ def func(self):
             return
 
         self.caller.location.msg_contents("%s disengages, ready to stop fighting." % self.caller)
-        spend_action(self.caller, 'all', action_name="disengage")  # Spend all remaining actions.
+        spend_action(self.caller, "all", action_name="disengage")  # Spend all remaining actions.
         """
         The action_name kwarg sets the character's last action to "disengage", which is checked by
         the turn handler script to see if all fighters have disengaged.
@@ -723,15 +745,18 @@ class CmdCombatHelp(CmdHelp):
     This will search for help on commands and other
     topics related to the game.
     """
+
     # Just like the default help command, but will give quick
     # tips on combat when used in a fight with no arguments.
 
     def func(self):
         if is_in_combat(self.caller) and not self.args:  # In combat and entered 'help' alone
-            self.caller.msg("Available combat commands:|/" +
-                            "|wAttack:|n Attack a target, attempting to deal damage.|/" +
-                            "|wPass:|n Pass your turn without further action.|/" +
-                            "|wDisengage:|n End your turn and attempt to end combat.|/")
+            self.caller.msg(
+                "Available combat commands:|/"
+                + "|wAttack:|n Attack a target, attempting to deal damage.|/"
+                + "|wPass:|n Pass your turn without further action.|/"
+                + "|wDisengage:|n End your turn and attempt to end combat.|/"
+            )
         else:
             super().func()  # Call the default help command
 
@@ -740,6 +765,7 @@ class BattleCmdSet(default_cmds.CharacterCmdSet):
     """
     This command set includes all the commmands used in the battle system.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
@@ -751,4 +777,4 @@ def at_cmdset_creation(self):
         self.add(CmdRest())
         self.add(CmdPass())
         self.add(CmdDisengage())
-        self.add(CmdCombatHelp())
\ No newline at end of file
+        self.add(CmdCombatHelp())
diff --git a/evennia/contrib/turnbattle/tb_equip.py b/evennia/contrib/turnbattle/tb_equip.py
index d2b307bc6e3..e516e64ac10 100644
--- a/evennia/contrib/turnbattle/tb_equip.py
+++ b/evennia/contrib/turnbattle/tb_equip.py
@@ -64,8 +64,8 @@ class Character(TBEquipCharacter):
 ----------------------------------------------------------------------------
 """
 
-TURN_TIMEOUT = 30 # Time before turns automatically end, in seconds
-ACTIONS_PER_TURN = 1 # Number of actions allowed per turn
+TURN_TIMEOUT = 30  # Time before turns automatically end, in seconds
+ACTIONS_PER_TURN = 1  # Number of actions allowed per turn
 
 """
 ----------------------------------------------------------------------------
@@ -73,6 +73,7 @@ class Character(TBEquipCharacter):
 ----------------------------------------------------------------------------
 """
 
+
 def roll_init(character):
     """
     Rolls a number between 1-1000 to determine initiative.
@@ -186,7 +187,9 @@ def get_damage(attacker, defender):
         damage_value = randint(weapon.db.damage_range[0], weapon.db.damage_range[1])
     # Use attacker's unarmed damage otherwise
     else:
-        damage_value = randint(attacker.db.unarmed_damage_range[0], attacker.db.unarmed_damage_range[1])
+        damage_value = randint(
+            attacker.db.unarmed_damage_range[0], attacker.db.unarmed_damage_range[1]
+        )
     # If defender is armored, reduce incoming damage
     if defender.db.worn_armor:
         armor = defender.db.worn_armor
@@ -211,6 +214,7 @@ def apply_damage(defender, damage):
     if defender.db.hp <= 0:
         defender.db.hp = 0
 
+
 def at_defeat(defeated):
     """
     Announces the defeat of a fighter in combat.
@@ -226,6 +230,7 @@ def at_defeat(defeated):
     """
     defeated.location.msg_contents("%s has been defeated!" % defeated)
 
+
 def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
     """
     Resolves an attack and outputs the result.
@@ -252,14 +257,21 @@ def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
         defense_value = get_defense(attacker, defender)
     # If the attack value is lower than the defense value, miss. Otherwise, hit.
     if attack_value < defense_value:
-        attacker.location.msg_contents("%s's %s misses %s!" % (attacker, attackers_weapon, defender))
+        attacker.location.msg_contents(
+            "%s's %s misses %s!" % (attacker, attackers_weapon, defender)
+        )
     else:
         damage_value = get_damage(attacker, defender)  # Calculate damage value.
         # Announce damage dealt and apply damage.
         if damage_value > 0:
-            attacker.location.msg_contents("%s's %s strikes %s for %i damage!" % (attacker, attackers_weapon, defender, damage_value))
+            attacker.location.msg_contents(
+                "%s's %s strikes %s for %i damage!"
+                % (attacker, attackers_weapon, defender, damage_value)
+            )
         else:
-            attacker.location.msg_contents("%s's %s bounces harmlessly off %s!" % (attacker, attackers_weapon, defender))
+            attacker.location.msg_contents(
+                "%s's %s bounces harmlessly off %s!" % (attacker, attackers_weapon, defender)
+            )
         apply_damage(defender, damage_value)
         # If defender HP is reduced to 0 or less, call at_defeat.
         if defender.db.hp <= 0:
@@ -324,7 +336,7 @@ def spend_action(character, actions, action_name=None):
     """
     if action_name:
         character.db.combat_lastaction = action_name
-    if actions == 'all':  # If spending all actions
+    if actions == "all":  # If spending all actions
         character.db.combat_actionsleft = 0  # Set actions to 0
     else:
         character.db.combat_actionsleft -= actions  # Use up actions.
@@ -332,6 +344,7 @@ def spend_action(character, actions, action_name=None):
             character.db.combat_actionsleft = 0  # Can't have fewer than 0 actions
     character.db.combat_turnhandler.turn_end_check(character)  # Signal potential end of turn.
 
+
 """
 ----------------------------------------------------------------------------
 SCRIPTS START HERE
@@ -379,7 +392,7 @@ def at_script_creation(self):
 
         # Announce the turn order.
         self.obj.msg_contents("Turn order is: %s " % ", ".join(obj.key for obj in self.db.fighters))
-        
+
         # Start first fighter's turn.
         self.start_turn(self.db.fighters[0])
 
@@ -399,13 +412,17 @@ def at_repeat(self):
         """
         Called once every self.interval seconds.
         """
-        currentchar = self.db.fighters[self.db.turn]  # Note the current character in the turn order.
+        currentchar = self.db.fighters[
+            self.db.turn
+        ]  # Note the current character in the turn order.
         self.db.timer -= self.interval  # Count down the timer.
 
         if self.db.timer <= 0:
             # Force current character to disengage if timer runs out.
             self.obj.msg_contents("%s's turn timed out!" % currentchar)
-            spend_action(currentchar, 'all', action_name="disengage")  # Spend all remaining actions.
+            spend_action(
+                currentchar, "all", action_name="disengage"
+            )  # Spend all remaining actions.
             return
         elif self.db.timer <= 10 and not self.db.timeout_warning_given:  # 10 seconds left
             # Warn the current character if they're about to time out.
@@ -420,8 +437,12 @@ def initialize_for_combat(self, character):
             character (obj): Character to initialize for combat.
         """
         combat_cleanup(character)  # Clean up leftover combat attributes beforehand, just in case.
-        character.db.combat_actionsleft = 0  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
-        character.db.combat_turnhandler = self  # Add a reference to this turn handler script to the character
+        character.db.combat_actionsleft = (
+            0
+        )  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
+        character.db.combat_turnhandler = (
+            self
+        )  # Add a reference to this turn handler script to the character
         character.db.combat_lastaction = "null"  # Track last action taken in combat
 
     def start_turn(self, character):
@@ -451,7 +472,9 @@ def next_turn(self):
         # Check to see if every character disengaged as their last action. If so, end combat.
         disengage_check = True
         for fighter in self.db.fighters:
-            if fighter.db.combat_lastaction != "disengage":  # If a character has done anything but disengage
+            if (
+                fighter.db.combat_lastaction != "disengage"
+            ):  # If a character has done anything but disengage
                 disengage_check = False
         if disengage_check:  # All characters have disengaged
             self.obj.msg_contents("All fighters have disengaged! Combat is over!")
@@ -463,7 +486,9 @@ def next_turn(self):
         for fighter in self.db.fighters:
             if fighter.db.HP == 0:
                 defeated_characters += 1  # Add 1 for every fighter with 0 HP left (defeated)
-        if defeated_characters == (len(self.db.fighters) - 1):  # If only one character isn't defeated
+        if defeated_characters == (
+            len(self.db.fighters) - 1
+        ):  # If only one character isn't defeated
             for fighter in self.db.fighters:
                 if fighter.db.HP != 0:
                     LastStanding = fighter  # Pick the one fighter left with HP remaining
@@ -507,24 +532,30 @@ def join_fight(self, character):
         # Initialize the character like you do at the start.
         self.initialize_for_combat(character)
 
+
 """
 ----------------------------------------------------------------------------
 TYPECLASSES START HERE
 ----------------------------------------------------------------------------
 """
 
+
 class TBEWeapon(DefaultObject):
     """
     A weapon which can be wielded in combat with the 'wield' command.
     """
+
     def at_object_creation(self):
         """
         Called once, when this object is first created. This is the
         normal hook to overload for most object types.
         """
-        self.db.damage_range = (15, 25) # Minimum and maximum damage on hit
-        self.db.accuracy_bonus = 0 # Bonus to attack rolls (or penalty if negative)
-        self.db.weapon_type_name = "weapon" # Single word for weapon - I.E. "dagger", "staff", "scimitar"
+        self.db.damage_range = (15, 25)  # Minimum and maximum damage on hit
+        self.db.accuracy_bonus = 0  # Bonus to attack rolls (or penalty if negative)
+        self.db.weapon_type_name = (
+            "weapon"
+        )  # Single word for weapon - I.E. "dagger", "staff", "scimitar"
+
     def at_drop(self, dropper):
         """
         Stop being wielded if dropped.
@@ -532,6 +563,7 @@ def at_drop(self, dropper):
         if dropper.db.wielded_weapon == self:
             dropper.db.wielded_weapon = None
             dropper.location.msg_contents("%s stops wielding %s." % (dropper, self))
+
     def at_give(self, giver, getter):
         """
         Stop being wielded if given.
@@ -539,18 +571,23 @@ def at_give(self, giver, getter):
         if giver.db.wielded_weapon == self:
             giver.db.wielded_weapon = None
             giver.location.msg_contents("%s stops wielding %s." % (giver, self))
-        
+
+
 class TBEArmor(DefaultObject):
     """
     A set of armor which can be worn with the 'don' command.
     """
+
     def at_object_creation(self):
         """
         Called once, when this object is first created. This is the
         normal hook to overload for most object types.
         """
-        self.db.damage_reduction = 4 # Amount of incoming damage reduced by armor
-        self.db.defense_modifier = -4 # Amount to modify defense value (pos = harder to hit, neg = easier)
+        self.db.damage_reduction = 4  # Amount of incoming damage reduced by armor
+        self.db.defense_modifier = (
+            -4
+        )  # Amount to modify defense value (pos = harder to hit, neg = easier)
+
     def at_before_drop(self, dropper):
         """
         Can't drop in combat.
@@ -559,6 +596,7 @@ def at_before_drop(self, dropper):
             dropper.msg("You can't doff armor in a fight!")
             return False
         return True
+
     def at_drop(self, dropper):
         """
         Stop being wielded if dropped.
@@ -566,6 +604,7 @@ def at_drop(self, dropper):
         if dropper.db.worn_armor == self:
             dropper.db.worn_armor = None
             dropper.location.msg_contents("%s removes %s." % (dropper, self))
+
     def at_before_give(self, giver, getter):
         """
         Can't give away in combat.
@@ -574,6 +613,7 @@ def at_before_give(self, giver, getter):
             dropper.msg("You can't doff armor in a fight!")
             return False
         return True
+
     def at_give(self, giver, getter):
         """
         Stop being wielded if given.
@@ -582,6 +622,7 @@ def at_give(self, giver, getter):
             giver.db.worn_armor = None
             giver.location.msg_contents("%s removes %s." % (giver, self))
 
+
 class TBEquipCharacter(DefaultCharacter):
     """
     A character able to participate in turn-based combat. Has attributes for current
@@ -595,11 +636,11 @@ def at_object_creation(self):
         """
         self.db.max_hp = 100  # Set maximum HP to 100
         self.db.hp = self.db.max_hp  # Set current HP to maximum
-        self.db.wielded_weapon = None # Currently used weapon
-        self.db.worn_armor = None # Currently worn armor
-        self.db.unarmed_damage_range = (5, 15) # Minimum and maximum unarmed damage
-        self.db.unarmed_accuracy = 30 # Accuracy bonus for unarmed attacks
-        
+        self.db.wielded_weapon = None  # Currently used weapon
+        self.db.worn_armor = None  # Currently worn armor
+        self.db.unarmed_damage_range = (5, 15)  # Minimum and maximum unarmed damage
+        self.db.unarmed_accuracy = 30  # Accuracy bonus for unarmed attacks
+
         """
         Adds attributes for a character's current and maximum HP.
         We're just going to set this value at '100' by default.
@@ -652,6 +693,7 @@ class CmdFight(Command):
     fight is added to combat, and a turn order is randomly rolled.
     When it's your turn, you can attack other characters.
     """
+
     key = "fight"
     help_category = "combat"
 
@@ -760,8 +802,10 @@ def func(self):
             self.caller.msg("You can only do that on your turn.")
             return
 
-        self.caller.location.msg_contents("%s takes no further action, passing the turn." % self.caller)
-        spend_action(self.caller, 'all', action_name="pass")  # Spend all remaining actions.
+        self.caller.location.msg_contents(
+            "%s takes no further action, passing the turn." % self.caller
+        )
+        spend_action(self.caller, "all", action_name="pass")  # Spend all remaining actions.
 
 
 class CmdDisengage(Command):
@@ -793,7 +837,7 @@ def func(self):
             return
 
         self.caller.location.msg_contents("%s disengages, ready to stop fighting." % self.caller)
-        spend_action(self.caller, 'all', action_name="disengage")  # Spend all remaining actions.
+        spend_action(self.caller, "all", action_name="disengage")  # Spend all remaining actions.
         """
         The action_name kwarg sets the character's last action to "disengage", which is checked by
         the turn handler script to see if all fighters have disengaged.
@@ -840,18 +884,22 @@ class CmdCombatHelp(CmdHelp):
     This will search for help on commands and other
     topics related to the game.
     """
+
     # Just like the default help command, but will give quick
     # tips on combat when used in a fight with no arguments.
 
     def func(self):
         if is_in_combat(self.caller) and not self.args:  # In combat and entered 'help' alone
-            self.caller.msg("Available combat commands:|/" +
-                            "|wAttack:|n Attack a target, attempting to deal damage.|/" +
-                            "|wPass:|n Pass your turn without further action.|/" +
-                            "|wDisengage:|n End your turn and attempt to end combat.|/")
+            self.caller.msg(
+                "Available combat commands:|/"
+                + "|wAttack:|n Attack a target, attempting to deal damage.|/"
+                + "|wPass:|n Pass your turn without further action.|/"
+                + "|wDisengage:|n End your turn and attempt to end combat.|/"
+            )
         else:
             super().func()  # Call the default help command
-            
+
+
 class CmdWield(Command):
     """
     Wield a weapon you are carrying
@@ -866,10 +914,10 @@ class CmdWield(Command):
     "unwield" command to stop wielding any weapon you are
     currently wielding.
     """
-    
+
     key = "wield"
     help_category = "combat"
-    
+
     def func(self):
         """
         This performs the actual command.
@@ -889,18 +937,21 @@ def func(self):
             self.caller.msg("That's not a weapon!")
             # Remember to update the path to the weapon typeclass if you move this module!
             return
-            
+
         if not self.caller.db.wielded_weapon:
             self.caller.db.wielded_weapon = weapon
             self.caller.location.msg_contents("%s wields %s." % (self.caller, weapon))
         else:
             old_weapon = self.caller.db.wielded_weapon
             self.caller.db.wielded_weapon = weapon
-            self.caller.location.msg_contents("%s lowers %s and wields %s." % (self.caller, old_weapon, weapon))
+            self.caller.location.msg_contents(
+                "%s lowers %s and wields %s." % (self.caller, old_weapon, weapon)
+            )
         # Spend an action if in combat.
         if is_in_combat(self.caller):
             spend_action(self.caller, 1, action_name="wield")  # Use up one action.
-            
+
+
 class CmdUnwield(Command):
     """
     Stop wielding a weapon.
@@ -911,10 +962,10 @@ class CmdUnwield(Command):
     After using this command, you will stop wielding any
     weapon you are currently wielding and become unarmed.
     """
-    
+
     key = "unwield"
     help_category = "combat"
-    
+
     def func(self):
         """
         This performs the actual command.
@@ -930,7 +981,8 @@ def func(self):
             old_weapon = self.caller.db.wielded_weapon
             self.caller.db.wielded_weapon = None
             self.caller.location.msg_contents("%s lowers %s." % (self.caller, old_weapon))
-            
+
+
 class CmdDon(Command):
     """
     Don armor that you are carrying
@@ -942,10 +994,10 @@ class CmdDon(Command):
     command in the middle of a fight. Use the "doff" 
     command to remove any armor you are wearing.
     """
-    
+
     key = "don"
     help_category = "combat"
-    
+
     def func(self):
         """
         This performs the actual command.
@@ -964,15 +1016,18 @@ def func(self):
             self.caller.msg("That's not armor!")
             # Remember to update the path to the armor typeclass if you move this module!
             return
-            
+
         if not self.caller.db.worn_armor:
             self.caller.db.worn_armor = armor
             self.caller.location.msg_contents("%s dons %s." % (self.caller, armor))
         else:
             old_armor = self.caller.db.worn_armor
             self.caller.db.worn_armor = armor
-            self.caller.location.msg_contents("%s removes %s and dons %s." % (self.caller, old_armor, armor))
-            
+            self.caller.location.msg_contents(
+                "%s removes %s and dons %s." % (self.caller, old_armor, armor)
+            )
+
+
 class CmdDoff(Command):
     """
     Stop wearing armor.
@@ -984,10 +1039,10 @@ class CmdDoff(Command):
     armor you are currently using and become unarmored.
     You can't use this command in combat.
     """
-    
+
     key = "doff"
     help_category = "combat"
-    
+
     def func(self):
         """
         This performs the actual command.
@@ -1002,13 +1057,13 @@ def func(self):
             old_armor = self.caller.db.worn_armor
             self.caller.db.worn_armor = None
             self.caller.location.msg_contents("%s removes %s." % (self.caller, old_armor))
-        
 
 
 class BattleCmdSet(default_cmds.CharacterCmdSet):
     """
     This command set includes all the commmands used in the battle system.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
@@ -1026,61 +1081,58 @@ def at_cmdset_creation(self):
         self.add(CmdDon())
         self.add(CmdDoff())
 
+
 """
 ----------------------------------------------------------------------------
 PROTOTYPES START HERE
 ----------------------------------------------------------------------------
 """
-        
-BASEWEAPON = {
- "typeclass": "evennia.contrib.turnbattle.tb_equip.TBEWeapon",
-}
 
-BASEARMOR = {
- "typeclass": "evennia.contrib.turnbattle.tb_equip.TBEArmor",
-}
+BASEWEAPON = {"typeclass": "evennia.contrib.turnbattle.tb_equip.TBEWeapon"}
+
+BASEARMOR = {"typeclass": "evennia.contrib.turnbattle.tb_equip.TBEArmor"}
 
 DAGGER = {
- "prototype" : "BASEWEAPON",
- "damage_range" : (10, 20),
- "accuracy_bonus" : 30,
- "key": "a thin steel dagger",
- "weapon_type_name" : "dagger"
+    "prototype": "BASEWEAPON",
+    "damage_range": (10, 20),
+    "accuracy_bonus": 30,
+    "key": "a thin steel dagger",
+    "weapon_type_name": "dagger",
 }
 
 BROADSWORD = {
- "prototype" : "BASEWEAPON",
- "damage_range" : (15, 30),
- "accuracy_bonus" : 15,
- "key": "an iron broadsword",
- "weapon_type_name" : "broadsword"
+    "prototype": "BASEWEAPON",
+    "damage_range": (15, 30),
+    "accuracy_bonus": 15,
+    "key": "an iron broadsword",
+    "weapon_type_name": "broadsword",
 }
 
 GREATSWORD = {
- "prototype" : "BASEWEAPON",
- "damage_range" : (20, 40),
- "accuracy_bonus" : 0,
- "key": "a rune-etched greatsword",
- "weapon_type_name" : "greatsword"
+    "prototype": "BASEWEAPON",
+    "damage_range": (20, 40),
+    "accuracy_bonus": 0,
+    "key": "a rune-etched greatsword",
+    "weapon_type_name": "greatsword",
 }
 
 LEATHERARMOR = {
- "prototype" : "BASEARMOR",
- "damage_reduction" : 2,
- "defense_modifier" : -2,
- "key": "a suit of leather armor"
+    "prototype": "BASEARMOR",
+    "damage_reduction": 2,
+    "defense_modifier": -2,
+    "key": "a suit of leather armor",
 }
 
 SCALEMAIL = {
- "prototype" : "BASEARMOR",
- "damage_reduction" : 4,
- "defense_modifier" : -4,
- "key": "a suit of scale mail"
+    "prototype": "BASEARMOR",
+    "damage_reduction": 4,
+    "defense_modifier": -4,
+    "key": "a suit of scale mail",
 }
 
 PLATEMAIL = {
- "prototype" : "BASEARMOR",
- "damage_reduction" : 6,
- "defense_modifier" : -6,
- "key": "a suit of plate mail"
+    "prototype": "BASEARMOR",
+    "damage_reduction": 6,
+    "defense_modifier": -6,
+    "key": "a suit of plate mail",
 }
diff --git a/evennia/contrib/turnbattle/tb_items.py b/evennia/contrib/turnbattle/tb_items.py
index cfb511b4ad0..512337478a4 100644
--- a/evennia/contrib/turnbattle/tb_items.py
+++ b/evennia/contrib/turnbattle/tb_items.py
@@ -79,22 +79,22 @@ class Character(TBItemsCharacter):
 ----------------------------------------------------------------------------
 """
 
-TURN_TIMEOUT = 30 # Time before turns automatically end, in seconds
-ACTIONS_PER_TURN = 1 # Number of actions allowed per turn
-NONCOMBAT_TURN_TIME = 30 # Time per turn count out of combat
+TURN_TIMEOUT = 30  # Time before turns automatically end, in seconds
+ACTIONS_PER_TURN = 1  # Number of actions allowed per turn
+NONCOMBAT_TURN_TIME = 30  # Time per turn count out of combat
 
 # Condition options start here.
 # If you need to make changes to how your conditions work later,
 # it's best to put the easily tweakable values all in one place!
 
-REGEN_RATE = (4, 8) # Min and max HP regen for Regeneration
-POISON_RATE = (4, 8) # Min and max damage for Poisoned
-ACC_UP_MOD = 25 # Accuracy Up attack roll bonus
-ACC_DOWN_MOD = -25 # Accuracy Down attack roll penalty
-DMG_UP_MOD = 5 # Damage Up damage roll bonus
-DMG_DOWN_MOD = -5 # Damage Down damage roll penalty
-DEF_UP_MOD = 15 # Defense Up defense bonus
-DEF_DOWN_MOD = -15 # Defense Down defense penalty
+REGEN_RATE = (4, 8)  # Min and max HP regen for Regeneration
+POISON_RATE = (4, 8)  # Min and max damage for Poisoned
+ACC_UP_MOD = 25  # Accuracy Up attack roll bonus
+ACC_DOWN_MOD = -25  # Accuracy Down attack roll penalty
+DMG_UP_MOD = 5  # Damage Up damage roll bonus
+DMG_DOWN_MOD = -5  # Damage Down damage roll penalty
+DEF_UP_MOD = 15  # Defense Up defense bonus
+DEF_DOWN_MOD = -15  # Defense Down defense penalty
 
 """
 ----------------------------------------------------------------------------
@@ -102,6 +102,7 @@ class Character(TBItemsCharacter):
 ----------------------------------------------------------------------------
 """
 
+
 def roll_init(character):
     """
     Rolls a number between 1-1000 to determine initiative.
@@ -227,6 +228,7 @@ def apply_damage(defender, damage):
     if defender.db.hp <= 0:
         defender.db.hp = 0
 
+
 def at_defeat(defeated):
     """
     Announces the defeat of a fighter in combat.
@@ -242,8 +244,15 @@ def at_defeat(defeated):
     """
     defeated.location.msg_contents("%s has been defeated!" % defeated)
 
-def resolve_attack(attacker, defender, attack_value=None, defense_value=None,
-                   damage_value=None, inflict_condition=[]):
+
+def resolve_attack(
+    attacker,
+    defender,
+    attack_value=None,
+    defense_value=None,
+    damage_value=None,
+    inflict_condition=[],
+):
     """
     Resolves an attack and outputs the result.
 
@@ -275,7 +284,9 @@ def resolve_attack(attacker, defender, attack_value=None, defense_value=None,
         if not damage_value:
             damage_value = get_damage(attacker, defender)  # Calculate damage value.
         # Announce damage dealt and apply damage.
-        attacker.location.msg_contents("%s hits %s for %i damage!" % (attacker, defender, damage_value))
+        attacker.location.msg_contents(
+            "%s hits %s for %i damage!" % (attacker, defender, damage_value)
+        )
         apply_damage(defender, damage_value)
         # Inflict conditions on hit, if any specified
         for condition in inflict_condition:
@@ -284,6 +295,7 @@ def resolve_attack(attacker, defender, attack_value=None, defense_value=None,
         if defender.db.hp <= 0:
             at_defeat(defender)
 
+
 def combat_cleanup(character):
     """
     Cleans up all the temporary combat-related attributes on a character.
@@ -342,7 +354,7 @@ def spend_action(character, actions, action_name=None):
     """
     if action_name:
         character.db.combat_lastaction = action_name
-    if actions == 'all':  # If spending all actions
+    if actions == "all":  # If spending all actions
         character.db.combat_actionsleft = 0  # Set actions to 0
     else:
         character.db.combat_actionsleft -= actions  # Use up actions.
@@ -350,6 +362,7 @@ def spend_action(character, actions, action_name=None):
             character.db.combat_actionsleft = 0  # Can't have fewer than 0 actions
     character.db.combat_turnhandler.turn_end_check(character)  # Signal potential end of turn.
 
+
 def spend_item_use(item, user):
     """
     Spends one use on an item with limited uses.
@@ -364,28 +377,29 @@ def spend_item_use(item, user):
         spawn a new object as residue, using the value of item.db.item_consumable
         as the name of the prototype to spawn.
     """
-    item.db.item_uses -= 1 # Spend one use
+    item.db.item_uses -= 1  # Spend one use
 
-    if item.db.item_uses > 0: # Has uses remaining
+    if item.db.item_uses > 0:  # Has uses remaining
         # Inform the player
         user.msg("%s has %i uses remaining." % (item.key.capitalize(), item.db.item_uses))
 
-    else: # All uses spent
+    else:  # All uses spent
 
-        if not item.db.item_consumable: # Item isn't consumable
+        if not item.db.item_consumable:  # Item isn't consumable
             # Just inform the player that the uses are gone
             user.msg("%s has no uses remaining." % item.key.capitalize())
 
-        else: # If item is consumable
-            if item.db.item_consumable == True: # If the value is 'True', just destroy the item
+        else:  # If item is consumable
+            if item.db.item_consumable == True:  # If the value is 'True', just destroy the item
                 user.msg("%s has been consumed." % item.key.capitalize())
-                item.delete() # Delete the spent item
+                item.delete()  # Delete the spent item
 
-            else: # If a string, use value of item_consumable to spawn an object in its place
-                residue = spawn({"prototype":item.db.item_consumable})[0] # Spawn the residue
-                residue.location = item.location # Move the residue to the same place as the item
+            else:  # If a string, use value of item_consumable to spawn an object in its place
+                residue = spawn({"prototype": item.db.item_consumable})[0]  # Spawn the residue
+                residue.location = item.location  # Move the residue to the same place as the item
                 user.msg("After using %s, you are left with %s." % (item, residue))
-                item.delete() # Delete the spent item
+                item.delete()  # Delete the spent item
+
 
 def use_item(user, item, target):
     """
@@ -413,7 +427,7 @@ def use_item(user, item, target):
     # Match item_func string to function
     try:
         item_func = ITEMFUNCS[item.db.item_func]
-    except KeyError: # If item_func string doesn't match to a function in ITEMFUNCS
+    except KeyError:  # If item_func string doesn't match to a function in ITEMFUNCS
         user.msg("ERROR: %s not defined in ITEMFUNCS" % item.db.item_func)
         return
 
@@ -432,6 +446,7 @@ def use_item(user, item, target):
     if is_in_combat(user):
         spend_action(user, 1, action_name="item")
 
+
 def condition_tickdown(character, turnchar):
     """
     Ticks down the duration of conditions on a character at the start of a given character's turn.
@@ -457,9 +472,12 @@ def condition_tickdown(character, turnchar):
                 character.db.conditions[key][0] -= 1
             if character.db.conditions[key][0] <= 0:
                 # If the duration is brought down to 0, remove the condition and inform everyone.
-                character.location.msg_contents("%s no longer has the '%s' condition." % (str(character), str(key)))
+                character.location.msg_contents(
+                    "%s no longer has the '%s' condition." % (str(character), str(key))
+                )
                 del character.db.conditions[key]
 
+
 def add_condition(character, turnchar, condition, duration):
     """
     Adds a condition to a fighter.
@@ -471,10 +489,11 @@ def add_condition(character, turnchar, condition, duration):
         duration (int or True): Number of turns the condition lasts, or True for indefinite
     """
     # The first value is the remaining turns - the second value is whose turn to count down on.
-    character.db.conditions.update({condition:[duration, turnchar]})
+    character.db.conditions.update({condition: [duration, turnchar]})
     # Tell everyone!
     character.location.msg_contents("%s gains the '%s' condition." % (character, condition))
 
+
 """
 ----------------------------------------------------------------------------
 CHARACTER TYPECLASS
@@ -495,7 +514,7 @@ def at_object_creation(self):
         """
         self.db.max_hp = 100  # Set maximum HP to 100
         self.db.hp = self.db.max_hp  # Set current HP to maximum
-        self.db.conditions = {} # Set empty dict for conditions
+        self.db.conditions = {}  # Set empty dict for conditions
         # Subscribe character to the ticker handler
         tickerhandler.add(NONCOMBAT_TURN_TIME, self.at_update, idstring="update")
         """
@@ -554,15 +573,15 @@ def apply_turn_conditions(self):
         """
         # Regeneration: restores 4 to 8 HP at the start of character's turn
         if "Regeneration" in self.db.conditions:
-            to_heal = randint(REGEN_RATE[0], REGEN_RAGE[1]) # Restore HP
+            to_heal = randint(REGEN_RATE[0], REGEN_RAGE[1])  # Restore HP
             if self.db.hp + to_heal > self.db.max_hp:
-                to_heal = self.db.max_hp - self.db.hp # Cap healing to max HP
+                to_heal = self.db.max_hp - self.db.hp  # Cap healing to max HP
             self.db.hp += to_heal
             self.location.msg_contents("%s regains %i HP from Regeneration." % (self, to_heal))
 
         # Poisoned: does 4 to 8 damage at the start of character's turn
         if "Poisoned" in self.db.conditions:
-            to_hurt = randint(POISON_RATE[0], POISON_RATE[1]) # Deal damage
+            to_hurt = randint(POISON_RATE[0], POISON_RATE[1])  # Deal damage
             apply_damage(self, to_hurt)
             self.location.msg_contents("%s takes %i damage from being Poisoned." % (self, to_hurt))
             if self.db.hp <= 0:
@@ -584,7 +603,7 @@ def at_update(self):
         """
         Fires every 30 seconds.
         """
-        if not is_in_combat(self): # Not in combat
+        if not is_in_combat(self):  # Not in combat
             # Change all conditions to update on character's turn.
             for key in self.db.conditions:
                 self.db.conditions[key][1] = self
@@ -593,15 +612,17 @@ def at_update(self):
             # Tick down condition durations
             condition_tickdown(self, self)
 
+
 class TBItemsCharacterTest(TBItemsCharacter):
     """
     Just like the TBItemsCharacter, but doesn't subscribe to the TickerHandler.
     This makes it easier to run unit tests on.
     """
+
     def at_object_creation(self):
         self.db.max_hp = 100  # Set maximum HP to 100
         self.db.hp = self.db.max_hp  # Set current HP to maximum
-        self.db.conditions = {} # Set empty dict for conditions
+        self.db.conditions = {}  # Set empty dict for conditions
 
 
 """
@@ -671,13 +692,17 @@ def at_repeat(self):
         """
         Called once every self.interval seconds.
         """
-        currentchar = self.db.fighters[self.db.turn]  # Note the current character in the turn order.
+        currentchar = self.db.fighters[
+            self.db.turn
+        ]  # Note the current character in the turn order.
         self.db.timer -= self.interval  # Count down the timer.
 
         if self.db.timer <= 0:
             # Force current character to disengage if timer runs out.
             self.obj.msg_contents("%s's turn timed out!" % currentchar)
-            spend_action(currentchar, 'all', action_name="disengage")  # Spend all remaining actions.
+            spend_action(
+                currentchar, "all", action_name="disengage"
+            )  # Spend all remaining actions.
             return
         elif self.db.timer <= 10 and not self.db.timeout_warning_given:  # 10 seconds left
             # Warn the current character if they're about to time out.
@@ -692,8 +717,12 @@ def initialize_for_combat(self, character):
             character (obj): Character to initialize for combat.
         """
         combat_cleanup(character)  # Clean up leftover combat attributes beforehand, just in case.
-        character.db.combat_actionsleft = 0  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
-        character.db.combat_turnhandler = self  # Add a reference to this turn handler script to the character
+        character.db.combat_actionsleft = (
+            0
+        )  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
+        character.db.combat_turnhandler = (
+            self
+        )  # Add a reference to this turn handler script to the character
         character.db.combat_lastaction = "null"  # Track last action taken in combat
 
     def start_turn(self, character):
@@ -723,7 +752,9 @@ def next_turn(self):
         # Check to see if every character disengaged as their last action. If so, end combat.
         disengage_check = True
         for fighter in self.db.fighters:
-            if fighter.db.combat_lastaction != "disengage":  # If a character has done anything but disengage
+            if (
+                fighter.db.combat_lastaction != "disengage"
+            ):  # If a character has done anything but disengage
                 disengage_check = False
         if disengage_check:  # All characters have disengaged
             self.obj.msg_contents("All fighters have disengaged! Combat is over!")
@@ -735,7 +766,9 @@ def next_turn(self):
         for fighter in self.db.fighters:
             if fighter.db.HP == 0:
                 defeated_characters += 1  # Add 1 for every fighter with 0 HP left (defeated)
-        if defeated_characters == (len(self.db.fighters) - 1):  # If only one character isn't defeated
+        if defeated_characters == (
+            len(self.db.fighters) - 1
+        ):  # If only one character isn't defeated
             for fighter in self.db.fighters:
                 if fighter.db.HP != 0:
                     LastStanding = fighter  # Pick the one fighter left with HP remaining
@@ -804,6 +837,7 @@ class CmdFight(Command):
     fight is added to combat, and a turn order is randomly rolled.
     When it's your turn, you can attack other characters.
     """
+
     key = "fight"
     help_category = "combat"
 
@@ -866,7 +900,7 @@ def func(self):
             self.caller.msg("You can't attack, you've been defeated.")
             return
 
-        if "Frightened" in self.caller.db.conditions: # Can't attack if frightened
+        if "Frightened" in self.caller.db.conditions:  # Can't attack if frightened
             self.caller.msg("You're too frightened to attack!")
             return
 
@@ -916,8 +950,10 @@ def func(self):
             self.caller.msg("You can only do that on your turn.")
             return
 
-        self.caller.location.msg_contents("%s takes no further action, passing the turn." % self.caller)
-        spend_action(self.caller, 'all', action_name="pass")  # Spend all remaining actions.
+        self.caller.location.msg_contents(
+            "%s takes no further action, passing the turn." % self.caller
+        )
+        spend_action(self.caller, "all", action_name="pass")  # Spend all remaining actions.
 
 
 class CmdDisengage(Command):
@@ -949,7 +985,7 @@ def func(self):
             return
 
         self.caller.location.msg_contents("%s disengages, ready to stop fighting." % self.caller)
-        spend_action(self.caller, 'all', action_name="disengage")  # Spend all remaining actions.
+        spend_action(self.caller, "all", action_name="disengage")  # Spend all remaining actions.
         """
         The action_name kwarg sets the character's last action to "disengage", which is checked by
         the turn handler script to see if all fighters have disengaged.
@@ -996,16 +1032,19 @@ class CmdCombatHelp(CmdHelp):
     This will search for help on commands and other
     topics related to the game.
     """
+
     # Just like the default help command, but will give quick
     # tips on combat when used in a fight with no arguments.
 
     def func(self):
         if is_in_combat(self.caller) and not self.args:  # In combat and entered 'help' alone
-            self.caller.msg("Available combat commands:|/" +
-                            "|wAttack:|n Attack a target, attempting to deal damage.|/" +
-                            "|wPass:|n Pass your turn without further action.|/" +
-                            "|wDisengage:|n End your turn and attempt to end combat.|/" +
-                            "|wUse:|n Use an item you're carrying.")
+            self.caller.msg(
+                "Available combat commands:|/"
+                + "|wAttack:|n Attack a target, attempting to deal damage.|/"
+                + "|wPass:|n Pass your turn without further action.|/"
+                + "|wDisengage:|n End your turn and attempt to end combat.|/"
+                + "|wUse:|n Use an item you're carrying."
+            )
         else:
             super(CmdCombatHelp, self).func()  # Call the default help command
 
@@ -1047,12 +1086,12 @@ def func(self):
                 self.caller.msg("You can only use items on your turn.")
                 return
 
-        if not item.db.item_func: # Object has no item_func, not usable
+        if not item.db.item_func:  # Object has no item_func, not usable
             self.caller.msg("'%s' is not a usable item." % item.key.capitalize())
             return
 
-        if item.attributes.has("item_uses"): # Item has limited uses
-            if item.db.item_uses <= 0: # Limited uses are spent
+        if item.attributes.has("item_uses"):  # Item has limited uses
+            if item.db.item_uses <= 0:  # Limited uses are spent
                 self.caller.msg("'%s' has no uses remaining." % item.key.capitalize())
                 return
 
@@ -1064,6 +1103,7 @@ class BattleCmdSet(default_cmds.CharacterCmdSet):
     """
     This command set includes all the commmands used in the battle system.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
@@ -1078,6 +1118,7 @@ def at_cmdset_creation(self):
         self.add(CmdCombatHelp())
         self.add(CmdUse())
 
+
 """
 ----------------------------------------------------------------------------
 ITEM FUNCTIONS START HERE
@@ -1101,6 +1142,7 @@ def at_cmdset_creation(self):
 take and the effect they have on the result.
 """
 
+
 def itemfunc_heal(item, user, target, **kwargs):
     """
     Item function that heals HP.
@@ -1110,11 +1152,11 @@ def itemfunc_heal(item, user, target, **kwargs):
         max_healing(int): Maximum amount of HP recovered
     """
     if not target:
-        target = user # Target user if none specified
+        target = user  # Target user if none specified
 
-    if not target.attributes.has("max_hp"): # Has no HP to speak of
+    if not target.attributes.has("max_hp"):  # Has no HP to speak of
         user.msg("You can't use %s on that." % item)
-        return False # Returning false aborts the item use
+        return False  # Returning false aborts the item use
 
     if target.db.hp >= target.db.max_hp:
         user.msg("%s is already at full health." % target)
@@ -1128,13 +1170,14 @@ def itemfunc_heal(item, user, target, **kwargs):
         min_healing = kwargs["healing_range"][0]
         max_healing = kwargs["healing_range"][1]
 
-    to_heal = randint(min_healing, max_healing) # Restore 20 to 40 hp
+    to_heal = randint(min_healing, max_healing)  # Restore 20 to 40 hp
     if target.db.hp + to_heal > target.db.max_hp:
-        to_heal = target.db.max_hp - target.db.hp # Cap healing to max HP
+        to_heal = target.db.max_hp - target.db.hp  # Cap healing to max HP
     target.db.hp += to_heal
 
     user.location.msg_contents("%s uses %s! %s regains %i HP!" % (user, item, target, to_heal))
 
+
 def itemfunc_add_condition(item, user, target, **kwargs):
     """
     Item function that gives the target one or more conditions.
@@ -1150,11 +1193,11 @@ def itemfunc_add_condition(item, user, target, **kwargs):
     conditions = [("Regeneration", 5)]
 
     if not target:
-        target = user # Target user if none specified
+        target = user  # Target user if none specified
 
-    if not target.attributes.has("max_hp"): # Is not a fighter
+    if not target.attributes.has("max_hp"):  # Is not a fighter
         user.msg("You can't use %s on that." % item)
-        return False # Returning false aborts the item use
+        return False  # Returning false aborts the item use
 
     # Retrieve condition / duration from kwargs, if present
     if "conditions" in kwargs:
@@ -1166,6 +1209,7 @@ def itemfunc_add_condition(item, user, target, **kwargs):
     for condition in conditions:
         add_condition(target, user, condition[0], condition[1])
 
+
 def itemfunc_cure_condition(item, user, target, **kwargs):
     """
     Item function that'll remove given conditions from a target.
@@ -1176,11 +1220,11 @@ def itemfunc_cure_condition(item, user, target, **kwargs):
     to_cure = ["Poisoned"]
 
     if not target:
-        target = user # Target user if none specified
+        target = user  # Target user if none specified
 
-    if not target.attributes.has("max_hp"): # Is not a fighter
+    if not target.attributes.has("max_hp"):  # Is not a fighter
         user.msg("You can't use %s on that." % item)
-        return False # Returning false aborts the item use
+        return False  # Returning false aborts the item use
 
     # Retrieve condition(s) to cure from kwargs, if present
     if "to_cure" in kwargs:
@@ -1196,6 +1240,7 @@ def itemfunc_cure_condition(item, user, target, **kwargs):
 
     user.location.msg_contents(item_msg)
 
+
 def itemfunc_attack(item, user, target, **kwargs):
     """
     Item function that attacks a target.
@@ -1213,7 +1258,7 @@ def itemfunc_attack(item, user, target, **kwargs):
     """
     if not is_in_combat(user):
         user.msg("You can only use that in combat.")
-        return False # Returning false aborts the item use
+        return False  # Returning false aborts the item use
 
     if not target:
         user.msg("You have to specify a target to use %s! (use <item> = <target>)" % item)
@@ -1223,7 +1268,7 @@ def itemfunc_attack(item, user, target, **kwargs):
         user.msg("You can't attack yourself!")
         return False
 
-    if not target.db.hp: # Has no HP
+    if not target.db.hp:  # Has no HP
         user.msg("You can't use %s on that." % item)
         return False
 
@@ -1252,17 +1297,23 @@ def itemfunc_attack(item, user, target, **kwargs):
         attack_value -= 25
 
     user.location.msg_contents("%s attacks %s with %s!" % (user, target, item))
-    resolve_attack(user, target, attack_value=attack_value,
-                   damage_value=damage_value, inflict_condition=inflict_condition)
+    resolve_attack(
+        user,
+        target,
+        attack_value=attack_value,
+        damage_value=damage_value,
+        inflict_condition=inflict_condition,
+    )
+
 
 # Match strings to item functions here. We can't store callables on
 # prototypes, so we store a string instead, matching that string to
 # a callable in this dictionary.
 ITEMFUNCS = {
-    "heal":itemfunc_heal,
-    "attack":itemfunc_attack,
-    "add_condition":itemfunc_add_condition,
-    "cure_condition":itemfunc_cure_condition
+    "heal": itemfunc_heal,
+    "attack": itemfunc_attack,
+    "add_condition": itemfunc_add_condition,
+    "cure_condition": itemfunc_cure_condition,
 }
 
 """
@@ -1297,101 +1348,110 @@ def itemfunc_attack(item, user, target, **kwargs):
 """
 
 MEDKIT = {
- "key" : "a medical kit",
- "aliases" : ["medkit"],
- "desc" : "A standard medical kit. It can be used a few times to heal wounds.",
- "item_func" : "heal",
- "item_uses" : 3,
- "item_consumable" : True,
- "item_kwargs" : {"healing_range":(15, 25)}
+    "key": "a medical kit",
+    "aliases": ["medkit"],
+    "desc": "A standard medical kit. It can be used a few times to heal wounds.",
+    "item_func": "heal",
+    "item_uses": 3,
+    "item_consumable": True,
+    "item_kwargs": {"healing_range": (15, 25)},
 }
 
-GLASS_BOTTLE = {
- "key" : "a glass bottle",
- "desc" : "An empty glass bottle."
-}
+GLASS_BOTTLE = {"key": "a glass bottle", "desc": "An empty glass bottle."}
 
 HEALTH_POTION = {
- "key" : "a health potion",
- "desc" : "A glass bottle full of a mystical potion that heals wounds when used.",
- "item_func" : "heal",
- "item_uses" : 1,
- "item_consumable" : "GLASS_BOTTLE",
- "item_kwargs" : {"healing_range":(35, 50)}
+    "key": "a health potion",
+    "desc": "A glass bottle full of a mystical potion that heals wounds when used.",
+    "item_func": "heal",
+    "item_uses": 1,
+    "item_consumable": "GLASS_BOTTLE",
+    "item_kwargs": {"healing_range": (35, 50)},
 }
 
 REGEN_POTION = {
- "key" : "a regeneration potion",
- "desc" : "A glass bottle full of a mystical potion that regenerates wounds over time.",
- "item_func" : "add_condition",
- "item_uses" : 1,
- "item_consumable" : "GLASS_BOTTLE",
- "item_kwargs" : {"conditions":[("Regeneration", 10)]}
+    "key": "a regeneration potion",
+    "desc": "A glass bottle full of a mystical potion that regenerates wounds over time.",
+    "item_func": "add_condition",
+    "item_uses": 1,
+    "item_consumable": "GLASS_BOTTLE",
+    "item_kwargs": {"conditions": [("Regeneration", 10)]},
 }
 
 HASTE_POTION = {
- "key" : "a haste potion",
- "desc" : "A glass bottle full of a mystical potion that hastens its user.",
- "item_func" : "add_condition",
- "item_uses" : 1,
- "item_consumable" : "GLASS_BOTTLE",
- "item_kwargs" : {"conditions":[("Haste", 10)]}
+    "key": "a haste potion",
+    "desc": "A glass bottle full of a mystical potion that hastens its user.",
+    "item_func": "add_condition",
+    "item_uses": 1,
+    "item_consumable": "GLASS_BOTTLE",
+    "item_kwargs": {"conditions": [("Haste", 10)]},
 }
 
 BOMB = {
- "key" : "a rotund bomb",
- "desc" : "A large black sphere with a fuse at the end. Can be used on enemies in combat.",
- "item_func" : "attack",
- "item_uses" : 1,
- "item_consumable" : True,
- "item_kwargs" : {"damage_range":(25, 40), "accuracy":25}
+    "key": "a rotund bomb",
+    "desc": "A large black sphere with a fuse at the end. Can be used on enemies in combat.",
+    "item_func": "attack",
+    "item_uses": 1,
+    "item_consumable": True,
+    "item_kwargs": {"damage_range": (25, 40), "accuracy": 25},
 }
 
 POISON_DART = {
- "key" : "a poison dart",
- "desc" : "A thin dart coated in deadly poison. Can be used on enemies in combat",
- "item_func" : "attack",
- "item_uses" : 1,
- "item_consumable" : True,
- "item_kwargs" : {"damage_range":(5, 10), "accuracy":25, "inflict_condition":[("Poisoned", 10)]}
+    "key": "a poison dart",
+    "desc": "A thin dart coated in deadly poison. Can be used on enemies in combat",
+    "item_func": "attack",
+    "item_uses": 1,
+    "item_consumable": True,
+    "item_kwargs": {
+        "damage_range": (5, 10),
+        "accuracy": 25,
+        "inflict_condition": [("Poisoned", 10)],
+    },
 }
 
 TASER = {
- "key" : "a taser",
- "desc" : "A device that can be used to paralyze enemies in combat.",
- "item_func" : "attack",
- "item_kwargs" : {"damage_range":(10, 20), "accuracy":0, "inflict_condition":[("Paralyzed", 1)]}
+    "key": "a taser",
+    "desc": "A device that can be used to paralyze enemies in combat.",
+    "item_func": "attack",
+    "item_kwargs": {
+        "damage_range": (10, 20),
+        "accuracy": 0,
+        "inflict_condition": [("Paralyzed", 1)],
+    },
 }
 
 GHOST_GUN = {
- "key" : "a ghost gun",
- "desc" : "A gun that fires scary ghosts at people. Anyone hit by a ghost becomes frightened.",
- "item_func" : "attack",
- "item_uses" : 6,
- "item_kwargs" : {"damage_range":(5, 10), "accuracy":15, "inflict_condition":[("Frightened", 1)]}
+    "key": "a ghost gun",
+    "desc": "A gun that fires scary ghosts at people. Anyone hit by a ghost becomes frightened.",
+    "item_func": "attack",
+    "item_uses": 6,
+    "item_kwargs": {
+        "damage_range": (5, 10),
+        "accuracy": 15,
+        "inflict_condition": [("Frightened", 1)],
+    },
 }
 
 ANTIDOTE_POTION = {
- "key" : "an antidote potion",
- "desc" : "A glass bottle full of a mystical potion that cures poison when used.",
- "item_func" : "cure_condition",
- "item_uses" : 1,
- "item_consumable" : "GLASS_BOTTLE",
- "item_kwargs" : {"to_cure":["Poisoned"]}
+    "key": "an antidote potion",
+    "desc": "A glass bottle full of a mystical potion that cures poison when used.",
+    "item_func": "cure_condition",
+    "item_uses": 1,
+    "item_consumable": "GLASS_BOTTLE",
+    "item_kwargs": {"to_cure": ["Poisoned"]},
 }
 
 AMULET_OF_MIGHT = {
- "key" : "The Amulet of Might",
- "desc" : "The one who holds this amulet can call upon its power to gain great strength.",
- "item_func" : "add_condition",
- "item_selfonly" : True,
- "item_kwargs" : {"conditions":[("Damage Up", 3), ("Accuracy Up", 3), ("Defense Up", 3)]}
+    "key": "The Amulet of Might",
+    "desc": "The one who holds this amulet can call upon its power to gain great strength.",
+    "item_func": "add_condition",
+    "item_selfonly": True,
+    "item_kwargs": {"conditions": [("Damage Up", 3), ("Accuracy Up", 3), ("Defense Up", 3)]},
 }
 
 AMULET_OF_WEAKNESS = {
- "key" : "The Amulet of Weakness",
- "desc" : "The one who holds this amulet can call upon its power to gain great weakness. It's not a terribly useful artifact.",
- "item_func" : "add_condition",
- "item_selfonly" : True,
- "item_kwargs" : {"conditions":[("Damage Down", 3), ("Accuracy Down", 3), ("Defense Down", 3)]}
+    "key": "The Amulet of Weakness",
+    "desc": "The one who holds this amulet can call upon its power to gain great weakness. It's not a terribly useful artifact.",
+    "item_func": "add_condition",
+    "item_selfonly": True,
+    "item_kwargs": {"conditions": [("Damage Down", 3), ("Accuracy Down", 3), ("Defense Down", 3)]},
 }
diff --git a/evennia/contrib/turnbattle/tb_magic.py b/evennia/contrib/turnbattle/tb_magic.py
index 7bf87d70be2..87881665243 100644
--- a/evennia/contrib/turnbattle/tb_magic.py
+++ b/evennia/contrib/turnbattle/tb_magic.py
@@ -71,8 +71,8 @@ class Character(TBMagicCharacter):
 ----------------------------------------------------------------------------
 """
 
-TURN_TIMEOUT = 30 # Time before turns automatically end, in seconds
-ACTIONS_PER_TURN = 1 # Number of actions allowed per turn
+TURN_TIMEOUT = 30  # Time before turns automatically end, in seconds
+ACTIONS_PER_TURN = 1  # Number of actions allowed per turn
 
 """
 ----------------------------------------------------------------------------
@@ -80,6 +80,7 @@ class Character(TBMagicCharacter):
 ----------------------------------------------------------------------------
 """
 
+
 def roll_init(character):
     """
     Rolls a number between 1-1000 to determine initiative.
@@ -194,6 +195,7 @@ def apply_damage(defender, damage):
     if defender.db.hp <= 0:
         defender.db.hp = 0
 
+
 def at_defeat(defeated):
     """
     Announces the defeat of a fighter in combat.
@@ -209,6 +211,7 @@ def at_defeat(defeated):
     """
     defeated.location.msg_contents("%s has been defeated!" % defeated)
 
+
 def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
     """
     Resolves an attack and outputs the result.
@@ -234,12 +237,15 @@ def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
     else:
         damage_value = get_damage(attacker, defender)  # Calculate damage value.
         # Announce damage dealt and apply damage.
-        attacker.location.msg_contents("%s hits %s for %i damage!" % (attacker, defender, damage_value))
+        attacker.location.msg_contents(
+            "%s hits %s for %i damage!" % (attacker, defender, damage_value)
+        )
         apply_damage(defender, damage_value)
         # If defender HP is reduced to 0 or less, call at_defeat.
         if defender.db.hp <= 0:
             at_defeat(defender)
 
+
 def combat_cleanup(character):
     """
     Cleans up all the temporary combat-related attributes on a character.
@@ -300,7 +306,7 @@ def spend_action(character, actions, action_name=None):
         return
     if action_name:
         character.db.combat_lastaction = action_name
-    if actions == 'all':  # If spending all actions
+    if actions == "all":  # If spending all actions
         character.db.combat_actionsleft = 0  # Set actions to 0
     else:
         character.db.combat_actionsleft -= actions  # Use up actions.
@@ -335,10 +341,9 @@ def at_object_creation(self):
         """
         self.db.max_hp = 100  # Set maximum HP to 100
         self.db.hp = self.db.max_hp  # Set current HP to maximum
-        self.db.spells_known = [] # Set empty spells known list
-        self.db.max_mp = 20 # Set maximum MP to 20
-        self.db.mp = self.db.max_mp # Set current MP to maximum
-        
+        self.db.spells_known = []  # Set empty spells known list
+        self.db.max_mp = 20  # Set maximum MP to 20
+        self.db.mp = self.db.max_mp  # Set current MP to maximum
 
     def at_before_move(self, destination):
         """
@@ -365,6 +370,7 @@ def at_before_move(self, destination):
             return False
         return True
 
+
 """
 ----------------------------------------------------------------------------
 SCRIPTS START HERE
@@ -412,7 +418,7 @@ def at_script_creation(self):
 
         # Announce the turn order.
         self.obj.msg_contents("Turn order is: %s " % ", ".join(obj.key for obj in self.db.fighters))
-        
+
         # Start first fighter's turn.
         self.start_turn(self.db.fighters[0])
 
@@ -432,13 +438,17 @@ def at_repeat(self):
         """
         Called once every self.interval seconds.
         """
-        currentchar = self.db.fighters[self.db.turn]  # Note the current character in the turn order.
+        currentchar = self.db.fighters[
+            self.db.turn
+        ]  # Note the current character in the turn order.
         self.db.timer -= self.interval  # Count down the timer.
 
         if self.db.timer <= 0:
             # Force current character to disengage if timer runs out.
             self.obj.msg_contents("%s's turn timed out!" % currentchar)
-            spend_action(currentchar, 'all', action_name="disengage")  # Spend all remaining actions.
+            spend_action(
+                currentchar, "all", action_name="disengage"
+            )  # Spend all remaining actions.
             return
         elif self.db.timer <= 10 and not self.db.timeout_warning_given:  # 10 seconds left
             # Warn the current character if they're about to time out.
@@ -453,8 +463,12 @@ def initialize_for_combat(self, character):
             character (obj): Character to initialize for combat.
         """
         combat_cleanup(character)  # Clean up leftover combat attributes beforehand, just in case.
-        character.db.combat_actionsleft = 0  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
-        character.db.combat_turnhandler = self  # Add a reference to this turn handler script to the character
+        character.db.combat_actionsleft = (
+            0
+        )  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
+        character.db.combat_turnhandler = (
+            self
+        )  # Add a reference to this turn handler script to the character
         character.db.combat_lastaction = "null"  # Track last action taken in combat
 
     def start_turn(self, character):
@@ -484,7 +498,9 @@ def next_turn(self):
         # Check to see if every character disengaged as their last action. If so, end combat.
         disengage_check = True
         for fighter in self.db.fighters:
-            if fighter.db.combat_lastaction != "disengage":  # If a character has done anything but disengage
+            if (
+                fighter.db.combat_lastaction != "disengage"
+            ):  # If a character has done anything but disengage
                 disengage_check = False
         if disengage_check:  # All characters have disengaged
             self.obj.msg_contents("All fighters have disengaged! Combat is over!")
@@ -496,7 +512,9 @@ def next_turn(self):
         for fighter in self.db.fighters:
             if fighter.db.HP == 0:
                 defeated_characters += 1  # Add 1 for every fighter with 0 HP left (defeated)
-        if defeated_characters == (len(self.db.fighters) - 1):  # If only one character isn't defeated
+        if defeated_characters == (
+            len(self.db.fighters) - 1
+        ):  # If only one character isn't defeated
             for fighter in self.db.fighters:
                 if fighter.db.HP != 0:
                     LastStanding = fighter  # Pick the one fighter left with HP remaining
@@ -540,7 +558,7 @@ def join_fight(self, character):
         # Initialize the character like you do at the start.
         self.initialize_for_combat(character)
 
-        
+
 """
 ----------------------------------------------------------------------------
 COMMANDS START HERE
@@ -559,6 +577,7 @@ class CmdFight(Command):
     fight is added to combat, and a turn order is randomly rolled.
     When it's your turn, you can attack other characters.
     """
+
     key = "fight"
     help_category = "combat"
 
@@ -667,8 +686,10 @@ def func(self):
             self.caller.msg("You can only do that on your turn.")
             return
 
-        self.caller.location.msg_contents("%s takes no further action, passing the turn." % self.caller)
-        spend_action(self.caller, 'all', action_name="pass")  # Spend all remaining actions.
+        self.caller.location.msg_contents(
+            "%s takes no further action, passing the turn." % self.caller
+        )
+        spend_action(self.caller, "all", action_name="pass")  # Spend all remaining actions.
 
 
 class CmdDisengage(Command):
@@ -700,12 +721,13 @@ def func(self):
             return
 
         self.caller.location.msg_contents("%s disengages, ready to stop fighting." % self.caller)
-        spend_action(self.caller, 'all', action_name="disengage")  # Spend all remaining actions.
+        spend_action(self.caller, "all", action_name="disengage")  # Spend all remaining actions.
         """
         The action_name kwarg sets the character's last action to "disengage", which is checked by
         the turn handler script to see if all fighters have disengaged.
         """
-        
+
+
 class CmdLearnSpell(Command):
     """
     Learn a magic spell.
@@ -731,10 +753,10 @@ class CmdLearnSpell(Command):
         
         |wcactus conjuration|n (2 MP): Creates a cactus.
     """
-    
+
     key = "learnspell"
     help_category = "magic"
-    
+
     def func(self):
         """
         This performs the actual command.
@@ -744,38 +766,39 @@ def func(self):
         args = args.strip(" ")
         caller = self.caller
         spell_to_learn = []
-        
-        if not args or len(args) < 3: # No spell given
+
+        if not args or len(args) < 3:  # No spell given
             caller.msg("Usage: learnspell <spell name>")
             return
-        
-        for spell in spell_list: # Match inputs to spells
+
+        for spell in spell_list:  # Match inputs to spells
             if args in spell.lower():
                 spell_to_learn.append(spell)
-        
-        if spell_to_learn == []: # No spells matched
+
+        if spell_to_learn == []:  # No spells matched
             caller.msg("There is no spell with that name.")
             return
-        if len(spell_to_learn) > 1: # More than one match
-            matched_spells = ', '.join(spell_to_learn)
+        if len(spell_to_learn) > 1:  # More than one match
+            matched_spells = ", ".join(spell_to_learn)
             caller.msg("Which spell do you mean: %s?" % matched_spells)
             return
-            
-        if len(spell_to_learn) == 1: # If one match, extract the string
+
+        if len(spell_to_learn) == 1:  # If one match, extract the string
             spell_to_learn = spell_to_learn[0]
-        
-        if spell_to_learn not in self.caller.db.spells_known: # If the spell isn't known...
-            caller.db.spells_known.append(spell_to_learn) # ...then add the spell to the character
+
+        if spell_to_learn not in self.caller.db.spells_known:  # If the spell isn't known...
+            caller.db.spells_known.append(spell_to_learn)  # ...then add the spell to the character
             caller.msg("You learn the spell '%s'!" % spell_to_learn)
             return
-        if spell_to_learn in self.caller.db.spells_known: # Already has the spell specified
+        if spell_to_learn in self.caller.db.spells_known:  # Already has the spell specified
             caller.msg("You already know the spell '%s'!" % spell_to_learn)
         """
         You will almost definitely want to replace this with your own system
         for learning spells, perhaps tied to character advancement or finding
         items in the game world that spells can be learned from.
         """
-        
+
+
 class CmdCast(MuxCommand):
     """
     Cast a magic spell that you know, provided you have the MP
@@ -788,10 +811,10 @@ class CmdCast(MuxCommand):
     on only yourself, and some don't need a target specified at all.
     Typing 'cast' by itself will give you a list of spells you know.
     """
-    
+
     key = "cast"
     help_category = "magic"
-    
+
     def func(self):
         """
         This performs the actual command.
@@ -804,155 +827,169 @@ def func(self):
         function.
         """
         caller = self.caller
-        
-        if not self.lhs or len(self.lhs) < 3: # No spell name given
+
+        if not self.lhs or len(self.lhs) < 3:  # No spell name given
             caller.msg("Usage: cast <spell name> = <target>, <target2>, ...")
             if not caller.db.spells_known:
                 caller.msg("You don't know any spells.")
                 return
             else:
                 caller.db.spells_known = sorted(caller.db.spells_known)
-                spells_known_msg = "You know the following spells:|/" + "|/".join(caller.db.spells_known)
-                caller.msg(spells_known_msg) # List the spells the player knows
+                spells_known_msg = "You know the following spells:|/" + "|/".join(
+                    caller.db.spells_known
+                )
+                caller.msg(spells_known_msg)  # List the spells the player knows
                 return
-        
+
         spellname = self.lhs.lower()
         spell_to_cast = []
         spell_targets = []
-        
+
         if not self.rhs:
             spell_targets = []
-        elif self.rhs.lower() in ['me', 'self', 'myself']:
+        elif self.rhs.lower() in ["me", "self", "myself"]:
             spell_targets = [caller]
         elif len(self.rhs) > 2:
             spell_targets = self.rhslist
-        
-        for spell in caller.db.spells_known: # Match inputs to spells
+
+        for spell in caller.db.spells_known:  # Match inputs to spells
             if self.lhs in spell.lower():
                 spell_to_cast.append(spell)
-        
-        if spell_to_cast == []: # No spells matched
+
+        if spell_to_cast == []:  # No spells matched
             caller.msg("You don't know a spell of that name.")
             return
-        if len(spell_to_cast) > 1: # More than one match
-            matched_spells = ', '.join(spell_to_cast)
+        if len(spell_to_cast) > 1:  # More than one match
+            matched_spells = ", ".join(spell_to_cast)
             caller.msg("Which spell do you mean: %s?" % matched_spells)
             return
-            
-        if len(spell_to_cast) == 1: # If one match, extract the string
+
+        if len(spell_to_cast) == 1:  # If one match, extract the string
             spell_to_cast = spell_to_cast[0]
-            
-        if spell_to_cast not in SPELLS: # Spell isn't defined
+
+        if spell_to_cast not in SPELLS:  # Spell isn't defined
             caller.msg("ERROR: Spell %s is undefined" % spell_to_cast)
             return
-        
+
         # Time to extract some info from the chosen spell!
         spelldata = SPELLS[spell_to_cast]
-        
+
         # Add in some default data if optional parameters aren't specified
         if "combat_spell" not in spelldata:
-            spelldata.update({"combat_spell":True})
+            spelldata.update({"combat_spell": True})
         if "noncombat_spell" not in spelldata:
-            spelldata.update({"noncombat_spell":True})
+            spelldata.update({"noncombat_spell": True})
         if "max_targets" not in spelldata:
-            spelldata.update({"max_targets":1})
-            
+            spelldata.update({"max_targets": 1})
+
         # Store any superfluous options as kwargs to pass to the spell function
         kwargs = {}
-        spelldata_opts = ["spellfunc", "target", "cost", "combat_spell", "noncombat_spell", "max_targets"]
+        spelldata_opts = [
+            "spellfunc",
+            "target",
+            "cost",
+            "combat_spell",
+            "noncombat_spell",
+            "max_targets",
+        ]
         for key in spelldata:
             if key not in spelldata_opts:
-                kwargs.update({key:spelldata[key]})
-            
+                kwargs.update({key: spelldata[key]})
+
         # If caster doesn't have enough MP to cover the spell's cost, give error and return
         if spelldata["cost"] > caller.db.mp:
             caller.msg("You don't have enough MP to cast '%s'." % spell_to_cast)
             return
-            
+
         # If in combat and the spell isn't a combat spell, give error message and return
         if spelldata["combat_spell"] == False and is_in_combat(caller):
             caller.msg("You can't use the spell '%s' in combat." % spell_to_cast)
             return
-            
+
         # If not in combat and the spell isn't a non-combat spell, error ms and return.
         if spelldata["noncombat_spell"] == False and is_in_combat(caller) == False:
             caller.msg("You can't use the spell '%s' outside of combat." % spell_to_cast)
             return
-        
+
         # If spell takes no targets and one is given, give error message and return
         if len(spell_targets) > 0 and spelldata["target"] == "none":
             caller.msg("The spell '%s' isn't cast on a target." % spell_to_cast)
             return
-            
+
         # If no target is given and spell requires a target, give error message
         if spelldata["target"] not in ["self", "none"]:
             if len(spell_targets) == 0:
                 caller.msg("The spell '%s' requires a target." % spell_to_cast)
                 return
-            
+
         # If more targets given than maximum, give error message
         if len(spell_targets) > spelldata["max_targets"]:
             targplural = "target"
             if spelldata["max_targets"] > 1:
                 targplural = "targets"
-            caller.msg("The spell '%s' can only be cast on %i %s." % (spell_to_cast, spelldata["max_targets"], targplural))
+            caller.msg(
+                "The spell '%s' can only be cast on %i %s."
+                % (spell_to_cast, spelldata["max_targets"], targplural)
+            )
             return
-            
+
         # Set up our candidates for targets
         target_candidates = []
-        
+
         # If spell targets 'any' or 'other', any object in caster's inventory or location
         # can be targeted by the spell.
         if spelldata["target"] in ["any", "other"]:
             target_candidates = caller.location.contents + caller.contents
-        
+
         # If spell targets 'anyobj', only non-character objects can be targeted.
         if spelldata["target"] == "anyobj":
             prefilter_candidates = caller.location.contents + caller.contents
             for thing in prefilter_candidates:
-                if not thing.attributes.has("max_hp"): # Has no max HP, isn't a fighter
+                if not thing.attributes.has("max_hp"):  # Has no max HP, isn't a fighter
                     target_candidates.append(thing)
-                    
+
         # If spell targets 'anychar' or 'otherchar', only characters can be targeted.
         if spelldata["target"] in ["anychar", "otherchar"]:
             prefilter_candidates = caller.location.contents
             for thing in prefilter_candidates:
-                if thing.attributes.has("max_hp"): # Has max HP, is a fighter
+                if thing.attributes.has("max_hp"):  # Has max HP, is a fighter
                     target_candidates.append(thing)
-                    
+
         # Now, match each entry in spell_targets to an object in the search candidates
         matched_targets = []
         for target in spell_targets:
             match = caller.search(target, candidates=target_candidates)
             matched_targets.append(match)
         spell_targets = matched_targets
-                    
+
         # If no target is given and the spell's target is 'self', set target to self
         if len(spell_targets) == 0 and spelldata["target"] == "self":
             spell_targets = [caller]
-                    
+
         # Give error message if trying to cast an "other" target spell on yourself
         if spelldata["target"] in ["other", "otherchar"]:
             if caller in spell_targets:
                 caller.msg("You can't cast '%s' on yourself." % spell_to_cast)
                 return
-                
+
         # Return if "None" in target list, indicating failed match
         if None in spell_targets:
             # No need to give an error message, as 'search' gives one by default.
             return
-                
+
         # Give error message if repeats in target list
         if len(spell_targets) != len(set(spell_targets)):
             caller.msg("You can't specify the same target more than once!")
             return
-        
+
         # Finally, we can cast the spell itself. Note that MP is not deducted here!
         try:
-            spelldata["spellfunc"](caller, spell_to_cast, spell_targets, spelldata["cost"], **kwargs)
+            spelldata["spellfunc"](
+                caller, spell_to_cast, spell_targets, spelldata["cost"], **kwargs
+            )
         except Exception:
             log_trace("Error in callback for spell: %s." % spell_to_cast)
-        
+
 
 class CmdRest(Command):
     """
@@ -979,7 +1016,8 @@ def func(self):
         self.caller.db.mp = self.caller.db.max_mp  # Set current MP to maximum
         self.caller.location.msg_contents("%s rests to recover HP and MP." % self.caller)
         # You'll probably want to replace this with your own system for recovering HP and MP.
-        
+
+
 class CmdStatus(Command):
     """
     Gives combat information.
@@ -997,15 +1035,19 @@ class CmdStatus(Command):
     def func(self):
         "This performs the actual command."
         char = self.caller
-        
-        if not char.db.max_hp: # Character not initialized, IE in unit tests
+
+        if not char.db.max_hp:  # Character not initialized, IE in unit tests
             char.db.hp = 100
             char.db.max_hp = 100
             char.db.spells_known = []
             char.db.max_mp = 20
             char.db.mp = char.db.max_mp
-        
-        char.msg("You have %i / %i HP and %i / %i MP." % (char.db.hp, char.db.max_hp, char.db.mp, char.db.max_mp))
+
+        char.msg(
+            "You have %i / %i HP and %i / %i MP."
+            % (char.db.hp, char.db.max_hp, char.db.mp, char.db.max_mp)
+        )
+
 
 class CmdCombatHelp(CmdHelp):
     """
@@ -1019,15 +1061,18 @@ class CmdCombatHelp(CmdHelp):
     This will search for help on commands and other
     topics related to the game.
     """
+
     # Just like the default help command, but will give quick
     # tips on combat when used in a fight with no arguments.
 
     def func(self):
         if is_in_combat(self.caller) and not self.args:  # In combat and entered 'help' alone
-            self.caller.msg("Available combat commands:|/" +
-                            "|wAttack:|n Attack a target, attempting to deal damage.|/" +
-                            "|wPass:|n Pass your turn without further action.|/" +
-                            "|wDisengage:|n End your turn and attempt to end combat.|/")
+            self.caller.msg(
+                "Available combat commands:|/"
+                + "|wAttack:|n Attack a target, attempting to deal damage.|/"
+                + "|wPass:|n Pass your turn without further action.|/"
+                + "|wDisengage:|n End your turn and attempt to end combat.|/"
+            )
         else:
             super(CmdCombatHelp, self).func()  # Call the default help command
 
@@ -1036,6 +1081,7 @@ class BattleCmdSet(default_cmds.CharacterCmdSet):
     """
     This command set includes all the commmands used in the battle system.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
@@ -1052,6 +1098,7 @@ def at_cmdset_creation(self):
         self.add(CmdCast())
         self.add(CmdStatus())
 
+
 """
 ----------------------------------------------------------------------------
 SPELL FUNCTIONS START HERE
@@ -1072,6 +1119,7 @@ def at_cmdset_creation(self):
 in the docstring for each function.
 """
 
+
 def spell_healing(caster, spell_name, targets, cost, **kwargs):
     """
     Spell that restores HP to a target or targets.
@@ -1081,29 +1129,30 @@ def spell_healing(caster, spell_name, targets, cost, **kwargs):
             each target. (20, 40) by default.
     """
     spell_msg = "%s casts %s!" % (caster, spell_name)
-    
+
     min_healing = 20
     max_healing = 40
-    
+
     # Retrieve healing range from kwargs, if present
     if "healing_range" in kwargs:
         min_healing = kwargs["healing_range"][0]
         max_healing = kwargs["healing_range"][1]
-    
+
     for character in targets:
-        to_heal = randint(min_healing, max_healing) # Restore 20 to 40 hp
+        to_heal = randint(min_healing, max_healing)  # Restore 20 to 40 hp
         if character.db.hp + to_heal > character.db.max_hp:
-            to_heal = character.db.max_hp - character.db.hp # Cap healing to max HP
+            to_heal = character.db.max_hp - character.db.hp  # Cap healing to max HP
         character.db.hp += to_heal
         spell_msg += " %s regains %i HP!" % (character, to_heal)
-    
-    caster.db.mp -= cost # Deduct MP cost
-    
-    caster.location.msg_contents(spell_msg) # Message the room with spell results
-    
-    if is_in_combat(caster): # Spend action if in combat
+
+    caster.db.mp -= cost  # Deduct MP cost
+
+    caster.location.msg_contents(spell_msg)  # Message the room with spell results
+
+    if is_in_combat(caster):  # Spend action if in combat
         spend_action(caster, 1, action_name="cast")
-        
+
+
 def spell_attack(caster, spell_name, targets, cost, **kwargs):
     """
     Spell that deals damage in combat. Similar to resolve_attack.
@@ -1123,14 +1172,14 @@ def spell_attack(caster, spell_name, targets, cost, **kwargs):
             attacked once.
     """
     spell_msg = "%s casts %s!" % (caster, spell_name)
-    
+
     atkname_single = "The spell"
     atkname_plural = "spells"
     min_damage = 10
     max_damage = 20
     accuracy = 0
     attack_count = 1
-    
+
     # Retrieve some variables from kwargs, if present
     if "attack_name" in kwargs:
         atkname_single = kwargs["attack_name"][0]
@@ -1142,7 +1191,7 @@ def spell_attack(caster, spell_name, targets, cost, **kwargs):
         accuracy = kwargs["accuracy"]
     if "attack_count" in kwargs:
         attack_count = kwargs["attack_count"]
-        
+
     to_attack = []
     # If there are more attacks than targets given, attack first target multiple times
     if len(targets) < attack_count:
@@ -1152,24 +1201,23 @@ def spell_attack(caster, spell_name, targets, cost, **kwargs):
             to_attack.insert(0, targets[0])
     else:
         to_attack = to_attack + targets
-            
-    
+
     # Set up dictionaries to track number of hits and total damage
     total_hits = {}
     total_damage = {}
     for fighter in targets:
-        total_hits.update({fighter:0})
-        total_damage.update({fighter:0})
-    
+        total_hits.update({fighter: 0})
+        total_damage.update({fighter: 0})
+
     # Resolve attack for each target
     for fighter in to_attack:
-        attack_value = randint(1, 100) + accuracy # Spell attack roll
+        attack_value = randint(1, 100) + accuracy  # Spell attack roll
         defense_value = get_defense(caster, fighter)
         if attack_value >= defense_value:
-            spell_dmg = randint(min_damage, max_damage) # Get spell damage
+            spell_dmg = randint(min_damage, max_damage)  # Get spell damage
             total_hits[fighter] += 1
             total_damage[fighter] += spell_dmg
-    
+
     for fighter in targets:
         # Construct combat message
         if total_hits[fighter] == 0:
@@ -1178,22 +1226,27 @@ def spell_attack(caster, spell_name, targets, cost, **kwargs):
             attack_count_str = atkname_single + " hits"
             if total_hits[fighter] > 1:
                 attack_count_str = "%i %s hit" % (total_hits[fighter], atkname_plural)
-            spell_msg += " %s %s for %i damage!" % (attack_count_str, fighter, total_damage[fighter])
-    
-    caster.db.mp -= cost # Deduct MP cost
-    
-    caster.location.msg_contents(spell_msg) # Message the room with spell results
-    
+            spell_msg += " %s %s for %i damage!" % (
+                attack_count_str,
+                fighter,
+                total_damage[fighter],
+            )
+
+    caster.db.mp -= cost  # Deduct MP cost
+
+    caster.location.msg_contents(spell_msg)  # Message the room with spell results
+
     for fighter in targets:
         # Apply damage
         apply_damage(fighter, total_damage[fighter])
         # If fighter HP is reduced to 0 or less, call at_defeat.
         if fighter.db.hp <= 0:
             at_defeat(fighter)
-    
-    if is_in_combat(caster): # Spend action if in combat
+
+    if is_in_combat(caster):  # Spend action if in combat
         spend_action(caster, 1, action_name="cast")
-        
+
+
 def spell_conjure(caster, spell_name, targets, cost, **kwargs):
     """
     Spell that creates an object.
@@ -1207,11 +1260,11 @@ def spell_conjure(caster, spell_name, targets, cost, **kwargs):
     you may want to modify it to use the spawner (in evennia.utils.spawner)
     instead of creating objects directly.
     """
-    
+
     obj_key = "a nondescript object"
     obj_desc = "A perfectly generic object."
     obj_typeclass = "evennia.objects.objects.DefaultObject"
-    
+
     # Retrieve some variables from kwargs, if present
     if "obj_key" in kwargs:
         obj_key = kwargs["obj_key"]
@@ -1219,14 +1272,19 @@ def spell_conjure(caster, spell_name, targets, cost, **kwargs):
         obj_desc = kwargs["obj_desc"]
     if "obj_typeclass" in kwargs:
         obj_typeclass = kwargs["obj_typeclass"]
-        
-    conjured_obj = create_object(obj_typeclass, key=obj_key, location=caster.location) # Create object
-    conjured_obj.db.desc = obj_desc # Add object desc
-    
-    caster.db.mp -= cost # Deduct MP cost
-    
+
+    conjured_obj = create_object(
+        obj_typeclass, key=obj_key, location=caster.location
+    )  # Create object
+    conjured_obj.db.desc = obj_desc  # Add object desc
+
+    caster.db.mp -= cost  # Deduct MP cost
+
     # Message the room to announce the creation of the object
-    caster.location.msg_contents("%s casts %s, and %s appears!" % (caster, spell_name, conjured_obj))
+    caster.location.msg_contents(
+        "%s casts %s, and %s appears!" % (caster, spell_name, conjured_obj)
+    )
+
 
 """
 ----------------------------------------------------------------------------
@@ -1272,19 +1330,44 @@ def spell_conjure(caster, spell_name, targets, cost, **kwargs):
 """
 
 SPELLS = {
-"magic missile":{"spellfunc":spell_attack, "target":"otherchar", "cost":3, "noncombat_spell":False, "max_targets":3,
-                 "attack_name":("A bolt", "bolts"), "damage_range":(4, 7), "accuracy":999, "attack_count":3},
-
-"flame shot":{"spellfunc":spell_attack, "target":"otherchar", "cost":3, "noncombat_spell":False,
-              "attack_name":("A jet of flame", "jets of flame"), "damage_range":(25, 35)},
-
-"cure wounds":{"spellfunc":spell_healing, "target":"anychar", "cost":5},
-
-"mass cure wounds":{"spellfunc":spell_healing, "target":"anychar", "cost":10, "max_targets": 5},
-
-"full heal":{"spellfunc":spell_healing, "target":"anychar", "cost":12, "healing_range":(100, 100)},
-
-"cactus conjuration":{"spellfunc":spell_conjure, "target":"none", "cost":2, "combat_spell":False,
-                      "obj_key":"a cactus", "obj_desc":"An ordinary green cactus with little spines."}
+    "magic missile": {
+        "spellfunc": spell_attack,
+        "target": "otherchar",
+        "cost": 3,
+        "noncombat_spell": False,
+        "max_targets": 3,
+        "attack_name": ("A bolt", "bolts"),
+        "damage_range": (4, 7),
+        "accuracy": 999,
+        "attack_count": 3,
+    },
+    "flame shot": {
+        "spellfunc": spell_attack,
+        "target": "otherchar",
+        "cost": 3,
+        "noncombat_spell": False,
+        "attack_name": ("A jet of flame", "jets of flame"),
+        "damage_range": (25, 35),
+    },
+    "cure wounds": {"spellfunc": spell_healing, "target": "anychar", "cost": 5},
+    "mass cure wounds": {
+        "spellfunc": spell_healing,
+        "target": "anychar",
+        "cost": 10,
+        "max_targets": 5,
+    },
+    "full heal": {
+        "spellfunc": spell_healing,
+        "target": "anychar",
+        "cost": 12,
+        "healing_range": (100, 100),
+    },
+    "cactus conjuration": {
+        "spellfunc": spell_conjure,
+        "target": "none",
+        "cost": 2,
+        "combat_spell": False,
+        "obj_key": "a cactus",
+        "obj_desc": "An ordinary green cactus with little spines.",
+    },
 }
-
diff --git a/evennia/contrib/turnbattle/tb_range.py b/evennia/contrib/turnbattle/tb_range.py
index 5596573a2db..1d0a297a10f 100644
--- a/evennia/contrib/turnbattle/tb_range.py
+++ b/evennia/contrib/turnbattle/tb_range.py
@@ -110,8 +110,8 @@ class Object(TBRangeObject):
 ----------------------------------------------------------------------------
 """
 
-TURN_TIMEOUT = 30 # Time before turns automatically end, in seconds
-ACTIONS_PER_TURN = 2 # Number of actions allowed per turn
+TURN_TIMEOUT = 30  # Time before turns automatically end, in seconds
+ACTIONS_PER_TURN = 2  # Number of actions allowed per turn
 
 """
 ----------------------------------------------------------------------------
@@ -119,6 +119,7 @@ class Object(TBRangeObject):
 ----------------------------------------------------------------------------
 """
 
+
 def roll_init(character):
     """
     Rolls a number between 1-1000 to determine initiative.
@@ -241,6 +242,7 @@ def apply_damage(defender, damage):
     if defender.db.hp <= 0:
         defender.db.hp = 0
 
+
 def at_defeat(defeated):
     """
     Announces the defeat of a fighter in combat.
@@ -256,6 +258,7 @@ def at_defeat(defeated):
     """
     defeated.location.msg_contents("%s has been defeated!" % defeated)
 
+
 def resolve_attack(attacker, defender, attack_type, attack_value=None, defense_value=None):
     """
     Resolves an attack and outputs the result.
@@ -278,16 +281,22 @@ def resolve_attack(attacker, defender, attack_type, attack_value=None, defense_v
         defense_value = get_defense(attacker, defender, attack_type)
     # If the attack value is lower than the defense value, miss. Otherwise, hit.
     if attack_value < defense_value:
-        attacker.location.msg_contents("%s's %s attack misses %s!" % (attacker, attack_type, defender))
+        attacker.location.msg_contents(
+            "%s's %s attack misses %s!" % (attacker, attack_type, defender)
+        )
     else:
         damage_value = get_damage(attacker, defender)  # Calculate damage value.
         # Announce damage dealt and apply damage.
-        attacker.location.msg_contents("%s hits %s with a %s attack for %i damage!" % (attacker, defender, attack_type, damage_value))
+        attacker.location.msg_contents(
+            "%s hits %s with a %s attack for %i damage!"
+            % (attacker, defender, attack_type, damage_value)
+        )
         apply_damage(defender, damage_value)
         # If defender HP is reduced to 0 or less, call at_defeat.
         if defender.db.hp <= 0:
             at_defeat(defender)
-            
+
+
 def get_range(obj1, obj2):
     """
     Gets the combat range between two objects.
@@ -310,7 +319,8 @@ def get_range(obj1, obj2):
         return None
     # Return the range between the two objects.
     return obj1.db.combat_range[obj2]
-    
+
+
 def distance_inc(mover, target):
     """
     Function that increases distance in range field between mover and target.
@@ -325,7 +335,8 @@ def distance_inc(mover, target):
     if get_range(mover, target) > 2:
         target.db.combat_range[mover] = 2
         mover.db.combat_range[target] = 2
-                
+
+
 def approach(mover, target):
     """
     Manages a character's whole approach, including changes in ranges to other characters.
@@ -339,6 +350,7 @@ def approach(mover, target):
         target than the mover is. The mover will also move away from anything they started
         out close to.
     """
+
     def distance_dec(mover, target):
         """
         Helper function that decreases distance in range field between mover and target.
@@ -360,7 +372,7 @@ def distance_dec(mover, target):
                     thing.db.combat_range[mover] = thing.db.combat_range[target]
 
     contents = mover.location.contents
-    
+
     for thing in contents:
         if thing != mover and thing != target:
             # Move closer to each object closer to the target than you.
@@ -372,6 +384,7 @@ def distance_dec(mover, target):
     # Lastly, move closer to your target.
     distance_dec(mover, target)
 
+
 def withdraw(mover, target):
     """
     Manages a character's whole withdrawal, including changes in ranges to other characters.
@@ -387,11 +400,13 @@ def withdraw(mover, target):
     """
 
     contents = mover.location.contents
-    
+
     for thing in contents:
         if thing != mover and thing != target:
             # Move away from each object closer to the target than you, if it's also closer to you than you are to the target.
-            if get_range(mover, thing) >= get_range(target, thing) and get_range(mover, thing) < get_range(mover, target):
+            if get_range(mover, thing) >= get_range(target, thing) and get_range(
+                mover, thing
+            ) < get_range(mover, target):
                 distance_inc(mover, thing)
             # Move away from anything your target is engaged with
             if get_range(target, thing) == 0:
@@ -402,6 +417,7 @@ def withdraw(mover, target):
     # Then, move away from your target.
     distance_inc(mover, target)
 
+
 def combat_cleanup(character):
     """
     Cleans up all the temporary combat-related attributes on a character.
@@ -460,7 +476,7 @@ def spend_action(character, actions, action_name=None):
     """
     if action_name:
         character.db.combat_lastaction = action_name
-    if actions == 'all':  # If spending all actions
+    if actions == "all":  # If spending all actions
         character.db.combat_actionsleft = 0  # Set actions to 0
     else:
         character.db.combat_actionsleft -= actions  # Use up actions.
@@ -468,6 +484,7 @@ def spend_action(character, actions, action_name=None):
             character.db.combat_actionsleft = 0  # Can't have fewer than 0 actions
     character.db.combat_turnhandler.turn_end_check(character)  # Signal potential end of turn.
 
+
 def combat_status_message(fighter):
     """
     Sends a message to a player with their current HP and
@@ -478,16 +495,16 @@ def combat_status_message(fighter):
         fighter.db.hp = 100
         fighter.db.max_hp = 100
 
-    status_msg = ("HP Remaining: %i / %i" % (fighter.db.hp, fighter.db.max_hp))
-    
+    status_msg = "HP Remaining: %i / %i" % (fighter.db.hp, fighter.db.max_hp)
+
     if not is_in_combat(fighter):
         fighter.msg(status_msg)
         return
-    
+
     engaged_obj = []
     reach_obj = []
     range_obj = []
-    
+
     for thing in fighter.db.combat_range:
         if thing != fighter:
             if fighter.db.combat_range[thing] == 0:
@@ -496,16 +513,17 @@ def combat_status_message(fighter):
                 reach_obj.append(thing)
             if fighter.db.combat_range[thing] > 1:
                 range_obj.append(thing)
-    
+
     if engaged_obj:
         status_msg += "|/Engaged targets: %s" % ", ".join(obj.key for obj in engaged_obj)
     if reach_obj:
         status_msg += "|/Reach targets: %s" % ", ".join(obj.key for obj in reach_obj)
     if range_obj:
         status_msg += "|/Ranged targets: %s" % ", ".join(obj.key for obj in range_obj)
-        
+
     fighter.msg(status_msg)
-        
+
+
 """
 ----------------------------------------------------------------------------
 SCRIPTS START HERE
@@ -545,7 +563,7 @@ def at_script_creation(self):
 
         # Add a reference to this script to the room
         self.obj.db.combat_turnhandler = self
-        
+
         # Initialize range field for all objects in the room
         for thing in self.obj.contents:
             self.init_range(thing)
@@ -557,7 +575,7 @@ def at_script_creation(self):
 
         # Announce the turn order.
         self.obj.msg_contents("Turn order is: %s " % ", ".join(obj.key for obj in self.db.fighters))
-        
+
         # Start first fighter's turn.
         self.start_turn(self.db.fighters[0])
 
@@ -577,19 +595,23 @@ def at_repeat(self):
         """
         Called once every self.interval seconds.
         """
-        currentchar = self.db.fighters[self.db.turn]  # Note the current character in the turn order.
+        currentchar = self.db.fighters[
+            self.db.turn
+        ]  # Note the current character in the turn order.
         self.db.timer -= self.interval  # Count down the timer.
 
         if self.db.timer <= 0:
             # Force current character to disengage if timer runs out.
             self.obj.msg_contents("%s's turn timed out!" % currentchar)
-            spend_action(currentchar, 'all', action_name="disengage")  # Spend all remaining actions.
+            spend_action(
+                currentchar, "all", action_name="disengage"
+            )  # Spend all remaining actions.
             return
         elif self.db.timer <= 10 and not self.db.timeout_warning_given:  # 10 seconds left
             # Warn the current character if they're about to time out.
             currentchar.msg("WARNING: About to time out!")
             self.db.timeout_warning_given = True
-            
+
     def init_range(self, to_init):
         """
         Initializes range values for an object at the start of a fight.
@@ -603,14 +625,14 @@ def init_range(self, to_init):
         for thing in objectlist:
             # Object always at distance 0 from itself
             if thing == to_init:
-                rangedict.update({thing:0})
+                rangedict.update({thing: 0})
             else:
                 if thing.destination or to_init.destination:
                     # Start exits at range 2 to put them at the 'edges'
-                    rangedict.update({thing:2})
+                    rangedict.update({thing: 2})
                 else:
                     # Start objects at range 1 from other objects
-                    rangedict.update({thing:1})
+                    rangedict.update({thing: 1})
         to_init.db.combat_range = rangedict
 
     def join_rangefield(self, to_init, anchor_obj=None, add_distance=0):
@@ -630,15 +652,15 @@ def join_rangefield(self, to_init, anchor_obj=None, add_distance=0):
         contents.remove(to_init)
         # If no anchor object given, pick one in the room at random.
         if not anchor_obj:
-            anchor_obj = contents[randint(0, (len(contents)-1))]
+            anchor_obj = contents[randint(0, (len(contents) - 1))]
         # Copy the range values from the anchor object.
         to_init.db.combat_range = anchor_obj.db.combat_range
         # Add the new object to everyone else's ranges.
         for thing in contents:
             new_objects_range = thing.db.combat_range[anchor_obj]
-            thing.db.combat_range.update({to_init:new_objects_range})
+            thing.db.combat_range.update({to_init: new_objects_range})
         # Set the new object's range to itself to 0.
-        to_init.db.combat_range.update({to_init:0})
+        to_init.db.combat_range.update({to_init: 0})
         # Add additional distance from anchor object, if any.
         for n in range(add_distance):
             withdraw(to_init, anchor_obj)
@@ -651,8 +673,12 @@ def initialize_for_combat(self, character):
             character (obj): Character to initialize for combat.
         """
         combat_cleanup(character)  # Clean up leftover combat attributes beforehand, just in case.
-        character.db.combat_actionsleft = 0  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
-        character.db.combat_turnhandler = self  # Add a reference to this turn handler script to the character
+        character.db.combat_actionsleft = (
+            0
+        )  # Actions remaining - start of turn adds to this, turn ends when it reaches 0
+        character.db.combat_turnhandler = (
+            self
+        )  # Add a reference to this turn handler script to the character
         character.db.combat_lastaction = "null"  # Track last action taken in combat
 
     def start_turn(self, character):
@@ -681,7 +707,9 @@ def next_turn(self):
         # Check to see if every character disengaged as their last action. If so, end combat.
         disengage_check = True
         for fighter in self.db.fighters:
-            if fighter.db.combat_lastaction != "disengage":  # If a character has done anything but disengage
+            if (
+                fighter.db.combat_lastaction != "disengage"
+            ):  # If a character has done anything but disengage
                 disengage_check = False
         if disengage_check:  # All characters have disengaged
             self.obj.msg_contents("All fighters have disengaged! Combat is over!")
@@ -693,7 +721,9 @@ def next_turn(self):
         for fighter in self.db.fighters:
             if fighter.db.HP == 0:
                 defeated_characters += 1  # Add 1 for every fighter with 0 HP left (defeated)
-        if defeated_characters == (len(self.db.fighters) - 1):  # If only one character isn't defeated
+        if defeated_characters == (
+            len(self.db.fighters) - 1
+        ):  # If only one character isn't defeated
             for fighter in self.db.fighters:
                 if fighter.db.HP != 0:
                     LastStanding = fighter  # Pick the one fighter left with HP remaining
@@ -794,6 +824,7 @@ def at_before_move(self, destination):
             return False
         return True
 
+
 class TBRangeObject(DefaultObject):
     """
     An object that is assigned range values in combat. Getting, giving, and dropping
@@ -801,6 +832,7 @@ class TBRangeObject(DefaultObject):
     must be next to your target to give them something, and can only interact with
     objects on your own turn.
     """
+
     def at_before_drop(self, dropper):
         """
         Called by the default `drop` command before this object has been
@@ -865,7 +897,7 @@ def at_before_get(self, getter):
         """
         # Restrictions for getting in combat
         if is_in_combat(getter):
-            if not is_turn(getter): # Not your turn
+            if not is_turn(getter):  # Not your turn
                 getter.msg("You can only get things on your turn!")
                 return False
             if get_range(self, getter) > 0:  # Too far away
@@ -921,11 +953,13 @@ def at_before_give(self, giver, getter):
         """
         # Restrictions for giving in combat
         if is_in_combat(giver):
-            if not is_turn(giver): # Not your turn
+            if not is_turn(giver):  # Not your turn
                 giver.msg("You can only give things on your turn!")
                 return False
             if get_range(giver, getter) > 0:  # Too far away from target
-                giver.msg("You aren't close enough to give things to %s! (see: help approach)" % getter)
+                giver.msg(
+                    "You aren't close enough to give things to %s! (see: help approach)" % getter
+                )
                 return False
         return True
 
@@ -949,6 +983,7 @@ def at_give(self, giver, getter):
         if is_in_combat(giver):
             spend_action(giver, 1, action_name="give")  # Use up one action.
 
+
 """
 ----------------------------------------------------------------------------
 COMMANDS START HERE
@@ -967,6 +1002,7 @@ class CmdFight(Command):
     fight is added to combat, and a turn order is randomly rolled.
     When it's your turn, you can attack other characters.
     """
+
     key = "fight"
     help_category = "combat"
 
@@ -1044,15 +1080,19 @@ def func(self):
         if attacker == defender:  # Target and attacker are the same
             self.caller.msg("You can't attack yourself!")
             return
-            
+
         if not get_range(attacker, defender) == 0:  # Target isn't in melee
-            self.caller.msg("%s is too far away to attack - you need to get closer! (see: help approach)" % defender)
+            self.caller.msg(
+                "%s is too far away to attack - you need to get closer! (see: help approach)"
+                % defender
+            )
             return
 
         "If everything checks out, call the attack resolving function."
         resolve_attack(attacker, defender, "melee")
         spend_action(self.caller, 1, action_name="attack")  # Use up one action.
-        
+
+
 class CmdShoot(Command):
     """
     Attacks another character from range.
@@ -1099,22 +1139,26 @@ def func(self):
         if attacker == defender:  # Target and attacker are the same
             self.caller.msg("You can't attack yourself!")
             return
-            
+
         # Test to see if there are any nearby enemy targets.
         in_melee = []
         for target in attacker.db.combat_range:
             # Object is engaged and has HP
             if get_range(attacker, defender) == 0 and target.db.hp and target != self.caller:
-                in_melee.append(target) # Add to list of targets in melee
-                
+                in_melee.append(target)  # Add to list of targets in melee
+
         if len(in_melee) > 0:
-            self.caller.msg("You can't shoot because there are fighters engaged with you (%s) - you need to retreat! (see: help withdraw)" % ", ".join(obj.key for obj in in_melee))
+            self.caller.msg(
+                "You can't shoot because there are fighters engaged with you (%s) - you need to retreat! (see: help withdraw)"
+                % ", ".join(obj.key for obj in in_melee)
+            )
             return
 
         "If everything checks out, call the attack resolving function."
         resolve_attack(attacker, defender, "ranged")
         spend_action(self.caller, 1, action_name="attack")  # Use up one action.
-        
+
+
 class CmdApproach(Command):
     """
     Approaches an object.
@@ -1157,8 +1201,8 @@ def func(self):
         if mover == target:  # Target and mover are the same
             self.caller.msg("You can't move toward yourself!")
             return
-            
-        if get_range(mover, target) <= 0: # Already engaged with target
+
+        if get_range(mover, target) <= 0:  # Already engaged with target
             self.caller.msg("You're already next to that target!")
             return
 
@@ -1166,7 +1210,8 @@ def func(self):
         approach(mover, target)
         mover.location.msg_contents("%s moves toward %s." % (mover, target))
         spend_action(self.caller, 1, action_name="move")  # Use up one action.
-        
+
+
 class CmdWithdraw(Command):
     """
     Moves away from an object.
@@ -1208,8 +1253,8 @@ def func(self):
         if mover == target:  # Target and mover are the same
             self.caller.msg("You can't move away from yourself!")
             return
-            
-        if mover.db.combat_range[target] >= 3: # Already at maximum distance
+
+        if mover.db.combat_range[target] >= 3:  # Already at maximum distance
             self.caller.msg("You're as far as you can get from that target!")
             return
 
@@ -1246,8 +1291,10 @@ def func(self):
             self.caller.msg("You can only do that on your turn.")
             return
 
-        self.caller.location.msg_contents("%s takes no further action, passing the turn." % self.caller)
-        spend_action(self.caller, 'all', action_name="pass")  # Spend all remaining actions.
+        self.caller.location.msg_contents(
+            "%s takes no further action, passing the turn." % self.caller
+        )
+        spend_action(self.caller, "all", action_name="pass")  # Spend all remaining actions.
 
 
 class CmdDisengage(Command):
@@ -1279,7 +1326,7 @@ def func(self):
             return
 
         self.caller.location.msg_contents("%s disengages, ready to stop fighting." % self.caller)
-        spend_action(self.caller, 'all', action_name="disengage")  # Spend all remaining actions.
+        spend_action(self.caller, "all", action_name="disengage")  # Spend all remaining actions.
         """
         The action_name kwarg sets the character's last action to "disengage", which is checked by
         the turn handler script to see if all fighters have disengaged.
@@ -1313,6 +1360,7 @@ def func(self):
         You'll probably want to replace this with your own system for recovering HP.
         """
 
+
 class CmdStatus(Command):
     """
     Gives combat information.
@@ -1330,7 +1378,7 @@ class CmdStatus(Command):
     def func(self):
         "This performs the actual command."
         combat_status_message(self.caller)
-        
+
 
 class CmdCombatHelp(CmdHelp):
     """
@@ -1344,19 +1392,22 @@ class CmdCombatHelp(CmdHelp):
     This will search for help on commands and other
     topics related to the game.
     """
+
     # Just like the default help command, but will give quick
     # tips on combat when used in a fight with no arguments.
 
     def func(self):
         if is_in_combat(self.caller) and not self.args:  # In combat and entered 'help' alone
-            self.caller.msg("Available combat commands:|/" +
-                            "|wAttack:|n Attack an engaged target, attempting to deal damage.|/" +
-                            "|wShoot:|n Attack from a distance, if not engaged with other fighters.|/" +
-                            "|wApproach:|n Move one step cloer to a target.|/" +
-                            "|wWithdraw:|n Move one step away from a target.|/" +
-                            "|wPass:|n Pass your turn without further action.|/" +
-                            "|wStatus:|n View current HP and ranges to other targets.|/" +
-                            "|wDisengage:|n End your turn and attempt to end combat.|/")
+            self.caller.msg(
+                "Available combat commands:|/"
+                + "|wAttack:|n Attack an engaged target, attempting to deal damage.|/"
+                + "|wShoot:|n Attack from a distance, if not engaged with other fighters.|/"
+                + "|wApproach:|n Move one step cloer to a target.|/"
+                + "|wWithdraw:|n Move one step away from a target.|/"
+                + "|wPass:|n Pass your turn without further action.|/"
+                + "|wStatus:|n View current HP and ranges to other targets.|/"
+                + "|wDisengage:|n End your turn and attempt to end combat.|/"
+            )
         else:
             super(CmdCombatHelp, self).func()  # Call the default help command
 
@@ -1365,6 +1416,7 @@ class BattleCmdSet(default_cmds.CharacterCmdSet):
     """
     This command set includes all the commmands used in the battle system.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
@@ -1380,4 +1432,4 @@ def at_cmdset_creation(self):
         self.add(CmdApproach())
         self.add(CmdWithdraw())
         self.add(CmdStatus())
-        self.add(CmdCombatHelp())
\ No newline at end of file
+        self.add(CmdCombatHelp())
diff --git a/evennia/contrib/tutorial_examples/bodyfunctions.py b/evennia/contrib/tutorial_examples/bodyfunctions.py
index 2bf59427c21..0cb0dd6b4a9 100644
--- a/evennia/contrib/tutorial_examples/bodyfunctions.py
+++ b/evennia/contrib/tutorial_examples/bodyfunctions.py
@@ -24,7 +24,7 @@ def at_script_creation(self):
         self.interval = 20  # seconds
         # self.repeats = 5  # repeat only a certain number of times
         self.start_delay = True  # wait self.interval until first call
-        #self.persistent = True
+        # self.persistent = True
 
     def at_repeat(self):
         """
@@ -44,7 +44,9 @@ def send_random_message(self):
         elif rand < 0.2:
             string = "You have an itch. Hard to reach too."
         elif rand < 0.3:
-            string = "You think you hear someone behind you. ... but when you look there's noone there."
+            string = (
+                "You think you hear someone behind you. ... but when you look there's noone there."
+            )
         elif rand < 0.4:
             string = "You inspect your fingernails. Nothing to report."
         elif rand < 0.5:
diff --git a/evennia/contrib/tutorial_examples/cmdset_red_button.py b/evennia/contrib/tutorial_examples/cmdset_red_button.py
index 47c0df3eedf..ee14f26c41a 100644
--- a/evennia/contrib/tutorial_examples/cmdset_red_button.py
+++ b/evennia/contrib/tutorial_examples/cmdset_red_button.py
@@ -12,9 +12,9 @@
 
 # Some simple commands for the red button
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # Commands defined on the red button
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class CmdNudge(Command):
@@ -54,6 +54,7 @@ class CmdPush(Command):
       push button
 
     """
+
     key = "push button"
     aliases = ["push", "press button", "press"]
     locks = "cmd:all()"
@@ -75,8 +76,11 @@ def func(self):
             string += "\n\nA BOOM! A bright light blinds you!"
             string += "\nThe world goes dark ..."
             self.caller.msg(string)
-            self.caller.location.msg_contents("%s presses the button. BOOM! %s is blinded by a flash!" %
-                                              (self.caller.name, self.caller.name), exclude=self.caller)
+            self.caller.location.msg_contents(
+                "%s presses the button. BOOM! %s is blinded by a flash!"
+                % (self.caller.name, self.caller.name),
+                exclude=self.caller,
+            )
             # the button's method will handle all setup of scripts etc.
             self.obj.press_button(self.caller)
         else:
@@ -118,8 +122,9 @@ def func(self):
             string += " Unfortunately all you get is a pain in your hand. Maybe"
             string += " you should just try to open the lid instead?"
         self.caller.msg(string)
-        self.caller.location.msg_contents("%s tries to smash the glass of the button." %
-                                          (self.caller.name), exclude=self.caller)
+        self.caller.location.msg_contents(
+            "%s tries to smash the glass of the button." % (self.caller.name), exclude=self.caller
+        )
 
 
 class CmdOpenLid(Command):
@@ -132,7 +137,7 @@ class CmdOpenLid(Command):
     """
 
     key = "open lid"
-    aliases = ["open button", 'open']
+    aliases = ["open button", "open"]
     locks = "cmd:all()"
 
     def func(self):
@@ -145,8 +150,9 @@ def func(self):
         string = "\nA ticking sound is heard, like a winding mechanism. Seems "
         string += "the lid will soon close again."
         self.caller.msg(string)
-        self.caller.location.msg_contents("%s opens the lid of the button." %
-                                          (self.caller.name), exclude=self.caller)
+        self.caller.location.msg_contents(
+            "%s opens the lid of the button." % (self.caller.name), exclude=self.caller
+        )
         # add the relevant cmdsets to button
         self.obj.cmdset.add(LidClosedCmdSet)
         # call object method
@@ -174,8 +180,9 @@ def func(self):
 
         # this will clean out scripts dependent on lid being open.
         self.caller.msg("You close the button's lid. It clicks back into place.")
-        self.caller.location.msg_contents("%s closes the button's lid." %
-                                          (self.caller.name), exclude=self.caller)
+        self.caller.location.msg_contents(
+            "%s closes the button's lid." % (self.caller.name), exclude=self.caller
+        )
 
 
 class CmdBlindLook(Command):
@@ -212,8 +219,9 @@ def func(self):
             string = "You are temporarily blinded by the flash. "
             string += "Until it wears off, all you can do is feel around blindly."
         self.caller.msg(string)
-        self.caller.location.msg_contents("%s stumbles around, blinded." %
-                                          (self.caller.name), exclude=self.caller)
+        self.caller.location.msg_contents(
+            "%s stumbles around, blinded." % (self.caller.name), exclude=self.caller
+        )
 
 
 class CmdBlindHelp(Command):
@@ -224,6 +232,7 @@ class CmdBlindHelp(Command):
       help
 
     """
+
     key = "help"
     aliases = "h"
     locks = "cmd:all()"
@@ -233,14 +242,15 @@ def func(self):
         self.caller.msg("You are beyond help ... until you can see again.")
 
 
-#---------------------------------------------------------------
+# ---------------------------------------------------------------
 # Command sets for the red button
-#---------------------------------------------------------------
+# ---------------------------------------------------------------
 
 # We next tuck these commands into their respective command sets.
 # (note that we are overdoing the cdmset separation a bit here
 # to show how it works).
 
+
 class DefaultCmdSet(CmdSet):
     """
     The default cmdset always sits
@@ -250,6 +260,7 @@ class DefaultCmdSet(CmdSet):
     bring it back. It's added to the object
     using obj.cmdset.add_default().
     """
+
     key = "RedButtonDefault"
     mergetype = "Union"  # this is default, we don't really need to put it here.
 
@@ -267,6 +278,7 @@ class LidClosedCmdSet(CmdSet):
     item (i.e. you don't have to manually add any
     scripts etc to it when creating it).
     """
+
     key = "LidClosedCmdSet"
     # default Union is used *except* if we are adding to a
     # cmdset named LidOpenCmdSet - this one we replace
@@ -284,6 +296,7 @@ class LidOpenCmdSet(CmdSet):
     """
     This is the opposite of the Closed cmdset.
     """
+
     key = "LidOpenCmdSet"
     # default Union is used *except* if we are adding to a
     # cmdset named LidClosedCmdSet - this one we replace
@@ -300,6 +313,7 @@ class BlindCmdSet(CmdSet):
     This is the cmdset added to the *account* when
     the button is pushed.
     """
+
     key = "BlindCmdSet"
     # we want it to completely replace all normal commands
     # until the timed script removes it again.
@@ -314,6 +328,7 @@ def at_cmdset_creation(self):
         "Setup the blind cmdset"
         from evennia.commands.default.general import CmdSay
         from evennia.commands.default.general import CmdPose
+
         self.add(CmdSay())
         self.add(CmdPose())
         self.add(CmdBlindLook())
diff --git a/evennia/contrib/tutorial_examples/example_batch_code.py b/evennia/contrib/tutorial_examples/example_batch_code.py
index bd7bab46b8e..edb2483468e 100644
--- a/evennia/contrib/tutorial_examples/example_batch_code.py
+++ b/evennia/contrib/tutorial_examples/example_batch_code.py
@@ -48,7 +48,7 @@
 from evennia.contrib.tutorial_examples import red_button
 from evennia import DefaultObject
 
-limbo = search_object('Limbo')[0]
+limbo = search_object("Limbo")[0]
 
 
 # CODE
@@ -60,8 +60,9 @@
 # won't be able to be deleted in debug mode.
 
 # create a red button in limbo
-red_button = create_object(red_button.RedButton, key="Red button",
-                           location=limbo, aliases=["button"])
+red_button = create_object(
+    red_button.RedButton, key="Red button", location=limbo, aliases=["button"]
+)
 
 # we take a look at what we created
 caller.msg("A %s was created." % red_button.key)
diff --git a/evennia/contrib/tutorial_examples/red_button_scripts.py b/evennia/contrib/tutorial_examples/red_button_scripts.py
index 6ed70ab495c..f989e454631 100644
--- a/evennia/contrib/tutorial_examples/red_button_scripts.py
+++ b/evennia/contrib/tutorial_examples/red_button_scripts.py
@@ -141,9 +141,9 @@ def at_stop(self):
         when we are done!
         """
         self.obj.msg("You blink feverishly as your eyesight slowly returns.")
-        self.obj.location.msg_contents("%s seems to be recovering their eyesight."
-                                       % self.obj.name,
-                                       exclude=self.obj)
+        self.obj.location.msg_contents(
+            "%s seems to be recovering their eyesight." % self.obj.name, exclude=self.obj
+        )
         self.obj.cmdset.delete()  # this will clear the latest added cmdset,
         # (which is the blinded one).
 
@@ -157,6 +157,7 @@ def at_stop(self):
 # that makes the lid covering the button slide back after a while.
 #
 
+
 class CloseLidEvent(DefaultScript):
     """
     This event closes the glass lid over the button
diff --git a/evennia/contrib/tutorial_examples/tests.py b/evennia/contrib/tutorial_examples/tests.py
index 3ea3cfafce5..b747e0a55ef 100644
--- a/evennia/contrib/tutorial_examples/tests.py
+++ b/evennia/contrib/tutorial_examples/tests.py
@@ -4,6 +4,7 @@
 
 from .bodyfunctions import BodyFunctions
 
+
 @patch("evennia.contrib.tutorial_examples.bodyfunctions.random")
 class TestBodyFunctions(EvenniaTest):
     script_typeclass = BodyFunctions
@@ -43,8 +44,9 @@ def test_send_random_message(self, mock_random):
         self.char1.msg.assert_called_with("You have an itch. Hard to reach too.")
         mock_random.random = Mock(return_value=0.25)
         self.script.send_random_message()
-        self.char1.msg.assert_called_with("You think you hear someone behind you. ... "
-                                          "but when you look there's noone there.")
+        self.char1.msg.assert_called_with(
+            "You think you hear someone behind you. ... " "but when you look there's noone there."
+        )
         mock_random.random = Mock(return_value=0.35)
         self.script.send_random_message()
         self.char1.msg.assert_called_with("You inspect your fingernails. Nothing to report.")
diff --git a/evennia/contrib/tutorial_world/build.ev b/evennia/contrib/tutorial_world/build.ev
index df454ad9375..8780400e6c8 100644
--- a/evennia/contrib/tutorial_world/build.ev
+++ b/evennia/contrib/tutorial_world/build.ev
@@ -265,7 +265,7 @@ start
  you get a customized error message when trying to pick it up (that
  is checked and echoed by the 'get' command).
 #
-@create/drop Wooden sign;sign : tutorial_world.objects.Readable
+@create/drop Wooden sign;sign : tutorial_world.objects.TutorialReadable
 #
 @desc sign =
  The wooden sign sits at the end of a small eastward path. Beyond it
@@ -287,14 +287,14 @@ start
 #
 @set sign/tutorial_info =
  This is a readable object, of the Typeclass
- evennia.contrib.tutorial_world.objects.Readable. The sign has a cmdset
+ evennia.contrib.tutorial_world.objects.TutorialReadable. The sign has a cmdset
  defined on itself, containing only one command, namely 'read'. This
  command is what allows you to 'read sign'. Doing so returns the
  contents of the Attribute 'readable_sign', containing the information
  on the sign.
 # Set a climbable object for discovering a hidden exit
 #
-@create/drop gnarled old trees;tree;trees;gnarled : tutorial_world.objects.Climbable
+@create/drop gnarled old trees;tree;trees;gnarled : tutorial_world.objects.TutorialClimbable
 #
 @desc trees = Only the sturdiest of trees survive at the edge of the
  moor. A small group of huddling black things has dug in near the
@@ -310,7 +310,7 @@ start
 @set trees/tutorial_info =
  These are climbable objects; they make for a small puzzle for
  accessing a hidden exit. Climbing the trees allows the
- Climbable typeclass to assign an Attribute on the character
+ TutorialClimbable typeclass to assign an Attribute on the character
  that an exit is then looking for.
 #
 # The text to echo to player if trying 'climb tree'. What
diff --git a/evennia/contrib/tutorial_world/mob.py b/evennia/contrib/tutorial_world/mob.py
index b87640189f6..a6bc6e23870 100644
--- a/evennia/contrib/tutorial_world/mob.py
+++ b/evennia/contrib/tutorial_world/mob.py
@@ -27,6 +27,7 @@ class CmdMobOnOff(Command):
     building to  activate the mob once it's
     prepared.
     """
+
     key = "mobon"
     aliases = "moboff"
     locks = "cmd:superuser()"
@@ -151,7 +152,9 @@ def at_object_creation(self):
         # text to echo to the defeated foe.
         self.db.defeat_msg = "You fall to the ground."
         self.db.defeat_msg_room = "%s falls to the ground."
-        self.db.weapon_ineffective_msg = "Your weapon just passes through your enemy, causing almost no effect!"
+        self.db.weapon_ineffective_msg = (
+            "Your weapon just passes through your enemy, causing almost no effect!"
+        )
 
         self.db.death_msg = "After the last hit %s evaporates." % self.key
         self.db.hit_msg = "%s wails, shudders and writhes." % self.key
@@ -187,15 +190,17 @@ def _set_ticker(self, interval, hook_key, stop=False):
         last_interval = self.db.last_ticker_interval
         last_hook_key = self.db.last_hook_key
         if last_interval and last_hook_key:
-             # we have a previous subscription, kill this first.
-            TICKER_HANDLER.remove(interval=last_interval,
-                                  callback=getattr(self, last_hook_key), idstring=idstring)
+            # we have a previous subscription, kill this first.
+            TICKER_HANDLER.remove(
+                interval=last_interval, callback=getattr(self, last_hook_key), idstring=idstring
+            )
         self.db.last_ticker_interval = interval
         self.db.last_hook_key = hook_key
         if not stop:
             # set the new ticker
-            TICKER_HANDLER.add(interval=interval,
-                               callback=getattr(self, hook_key), idstring=idstring)
+            TICKER_HANDLER.add(
+                interval=interval, callback=getattr(self, hook_key), idstring=idstring
+            )
 
     def _find_target(self, location):
         """
@@ -209,8 +214,11 @@ def _find_target(self, location):
             The first suitable target found.
 
         """
-        targets = [obj for obj in location.contents_get(exclude=self)
-                   if obj.has_account and not obj.is_superuser]
+        targets = [
+            obj
+            for obj in location.contents_get(exclude=self)
+            if obj.has_account and not obj.is_superuser
+        ]
         return targets[0] if targets else None
 
     def set_alive(self, *args, **kwargs):
@@ -307,8 +315,7 @@ def do_patrol(self, *args, **kwargs):
                 self.start_attacking()
                 return
         # no target found, look for an exit.
-        exits = [exi for exi in self.location.exits
-                 if exi.access(self, "traverse")]
+        exits = [exi for exi in self.location.exits if exi.access(self, "traverse")]
         if exits:
             # randomly pick an exit
             exit = random.choice(exits)
@@ -333,8 +340,7 @@ def do_hunting(self, *args, **kwargs):
                 self.start_attacking()
                 return
         # no targets found, scan surrounding rooms
-        exits = [exi for exi in self.location.exits
-                 if exi.access(self, "traverse")]
+        exits = [exi for exi in self.location.exits if exi.access(self, "traverse")]
         if exits:
             # scan the exits destination for targets
             for exit in exits:
@@ -381,7 +387,9 @@ def do_attack(self, *args, **kwargs):
             if send_defeated_to:
                 target.move_to(send_defeated_to[0], quiet=True)
             else:
-                logger.log_err("Mob: mob.db.send_defeated_to not found: %s" % self.db.send_defeated_to)
+                logger.log_err(
+                    "Mob: mob.db.send_defeated_to not found: %s" % self.db.send_defeated_to
+                )
 
     # response methods - called by other objects
 
diff --git a/evennia/contrib/tutorial_world/objects.py b/evennia/contrib/tutorial_world/objects.py
index 85eceb9e14d..512eca91c24 100644
--- a/evennia/contrib/tutorial_world/objects.py
+++ b/evennia/contrib/tutorial_world/objects.py
@@ -9,8 +9,8 @@
 
 TutorialObject
 
-Readable
-Climbable
+TutorialReadable
+TutorialClimbable
 Obelisk
 LightSource
 CrumblingWall
@@ -18,7 +18,6 @@
 WeaponRack
 
 """
-from future.utils import listvalues
 
 import random
 
@@ -68,6 +67,7 @@ def reset(self):
 # Read command
 #
 
+
 class CmdRead(Command):
     """
     Usage:
@@ -113,7 +113,7 @@ def at_cmdset_creation(self):
         self.add(CmdRead())
 
 
-class Readable(TutorialObject):
+class TutorialReadable(TutorialObject):
     """
     This simple object defines some attributes and
     """
@@ -124,7 +124,9 @@ def at_object_creation(self):
         Attribute and add the readable cmdset.
         """
         super().at_object_creation()
-        self.db.tutorial_info = "This is an object with a 'read' command defined in a command set on itself."
+        self.db.tutorial_info = (
+            "This is an object with a 'read' command defined in a command set on itself."
+        )
         self.db.readable_text = "There is no text written on %s." % self.key
         # define a command on the object.
         self.cmdset.add_default(CmdSetReadable, permanent=True)
@@ -142,6 +144,7 @@ def at_object_creation(self):
 #
 # -------------------------------------------------------------
 
+
 class CmdClimb(Command):
     """
     Climb an object
@@ -151,6 +154,7 @@ class CmdClimb(Command):
 
     This allows you to climb.
     """
+
     key = "climb"
     locks = "cmd:all()"
     help_category = "TutorialWorld"
@@ -183,7 +187,7 @@ def at_cmdset_creation(self):
         self.add(CmdClimb())
 
 
-class Climbable(TutorialObject):
+class TutorialClimbable(TutorialObject):
     """
     A climbable object. All that is special about it is that it has
     the "climb" command available on it.
@@ -206,6 +210,7 @@ def at_object_creation(self):
 #
 # -------------------------------------------------------------
 
+
 class Obelisk(TutorialObject):
     """
     This object changes its description randomly, and which is shown
@@ -222,7 +227,9 @@ class Obelisk(TutorialObject):
     def at_object_creation(self):
         """Called when object is created."""
         super().at_object_creation()
-        self.db.tutorial_info = "This object changes its desc randomly, and makes sure to remember which one you saw."
+        self.db.tutorial_info = (
+            "This object changes its desc randomly, and makes sure to remember which one you saw."
+        )
         self.db.puzzle_descs = ["You see a normal stone slab"]
         # make sure this can never be picked up
         self.locks.add("get:false()")
@@ -236,8 +243,10 @@ def return_appearance(self, caller):
         descs = self.db.puzzle_descs
         clueindex = random.randint(0, len(descs) - 1)
         # set this description, with the random extra
-        string = "The surface of the obelisk seem to waver, shift and writhe under your gaze, with " \
-                 "different scenes and structures appearing whenever you look at it. "
+        string = (
+            "The surface of the obelisk seem to waver, shift and writhe under your gaze, with "
+            "different scenes and structures appearing whenever you look at it. "
+        )
         self.db.desc = string + descs[clueindex]
         # remember that this was the clue we got. The Puzzle room will
         # look for this later to determine if you should be teleported
@@ -265,10 +274,12 @@ def return_appearance(self, caller):
 #
 # -------------------------------------------------------------
 
+
 class CmdLight(Command):
     """
     Creates light where there was none. Something to burn.
     """
+
     key = "on"
     aliases = ["light", "burn"]
     # only allow this command if command.obj is carried by caller.
@@ -283,13 +294,16 @@ def func(self):
 
         if self.obj.light():
             self.caller.msg("You light %s." % self.obj.key)
-            self.caller.location.msg_contents("%s lights %s!" % (self.caller, self.obj.key), exclude=[self.caller])
+            self.caller.location.msg_contents(
+                "%s lights %s!" % (self.caller, self.obj.key), exclude=[self.caller]
+            )
         else:
             self.caller.msg("%s is already burning." % self.obj.key)
 
 
 class CmdSetLight(CmdSet):
     """CmdSet for the lightsource commands"""
+
     key = "lightsource_cmdset"
     # this is higher than the dark cmdset - important!
     priority = 3
@@ -320,7 +334,9 @@ def at_init(self):
     def at_object_creation(self):
         """Called when object is first created."""
         super().at_object_creation()
-        self.db.tutorial_info = "This object can be lit to create light. It has a timeout for how long it burns."
+        self.db.tutorial_info = (
+            "This object can be lit to create light. It has a timeout for how long it burns."
+        )
         self.db.is_giving_light = False
         self.db.burntime = 60 * 3  # 3 minutes
         # this is the default desc, it can of course be customized
@@ -337,8 +353,9 @@ def _burnout(self):
         # delete ourselves from the database
         self.db.is_giving_light = False
         try:
-            self.location.location.msg_contents("%s's %s flickers and dies." %
-                                                (self.location, self.key), exclude=self.location)
+            self.location.location.msg_contents(
+                "%s's %s flickers and dies." % (self.location, self.key), exclude=self.location
+            )
             self.location.msg("Your %s flickers and dies." % self.key)
             self.location.location.check_light_state()
         except AttributeError:
@@ -404,6 +421,7 @@ def light(self):
 # Attribute root_pos (a dictionary) to describe the current
 # position of the roots.
 
+
 class CmdShiftRoot(Command):
     """
     Shifts roots around.
@@ -415,6 +433,7 @@ class CmdShiftRoot(Command):
       shift green root up/down
 
     """
+
     key = "shift"
     aliases = ["shiftroot", "push", "pull", "move"]
     # we only allow to use this command while the
@@ -447,7 +466,9 @@ def func(self):
         # we accept arguments on the form <color> <direction>
 
         if not len(self.arglist) > 1:
-            self.caller.msg("You must define which colour of root you want to move, and in which direction.")
+            self.caller.msg(
+                "You must define which colour of root you want to move, and in which direction."
+            )
             return
 
         color = self.arglist[0].lower()
@@ -467,30 +488,42 @@ def func(self):
                 self.caller.msg("You shift the reddish root to the left.")
                 if root_pos[color] != 0 and root_pos[color] == root_pos["blue"]:
                     root_pos["blue"] += 1
-                    self.caller.msg("The root with blue flowers gets in the way and is pushed to the right.")
+                    self.caller.msg(
+                        "The root with blue flowers gets in the way and is pushed to the right."
+                    )
             elif direction == "right":
                 root_pos[color] = min(1, root_pos[color] + 1)
                 self.caller.msg("You shove the reddish root to the right.")
                 if root_pos[color] != 0 and root_pos[color] == root_pos["blue"]:
                     root_pos["blue"] -= 1
-                    self.caller.msg("The root with blue flowers gets in the way and is pushed to the left.")
+                    self.caller.msg(
+                        "The root with blue flowers gets in the way and is pushed to the left."
+                    )
             else:
-                self.caller.msg("The root hangs straight down - you can only move it left or right.")
+                self.caller.msg(
+                    "The root hangs straight down - you can only move it left or right."
+                )
         elif color == "blue":
             if direction == "left":
                 root_pos[color] = max(-1, root_pos[color] - 1)
                 self.caller.msg("You shift the root with small blue flowers to the left.")
                 if root_pos[color] != 0 and root_pos[color] == root_pos["red"]:
                     root_pos["red"] += 1
-                    self.caller.msg("The reddish root is too big to fit as well, so that one falls away to the left.")
+                    self.caller.msg(
+                        "The reddish root is too big to fit as well, so that one falls away to the left."
+                    )
             elif direction == "right":
                 root_pos[color] = min(1, root_pos[color] + 1)
                 self.caller.msg("You shove the root adorned with small blue flowers to the right.")
                 if root_pos[color] != 0 and root_pos[color] == root_pos["red"]:
                     root_pos["red"] -= 1
-                    self.caller.msg("The thick reddish root gets in the way and is pushed back to the left.")
+                    self.caller.msg(
+                        "The thick reddish root gets in the way and is pushed back to the left."
+                    )
             else:
-                self.caller.msg("The root hangs straight down - you can only move it left or right.")
+                self.caller.msg(
+                    "The root hangs straight down - you can only move it left or right."
+                )
 
         # now the horizontal roots (yellow/green). They can be moved up/down
         elif color == "yellow":
@@ -520,7 +553,9 @@ def func(self):
                 self.caller.msg("You shove the weedy green root downwards.")
                 if root_pos[color] != 0 and root_pos[color] == root_pos["yellow"]:
                     root_pos["yellow"] -= 1
-                    self.caller.msg("The root with yellow flowers gets in the way and is pushed upwards.")
+                    self.caller.msg(
+                        "The root with yellow flowers gets in the way and is pushed upwards."
+                    )
             else:
                 self.caller.msg("The root hangs across the wall - you can only move it up or down.")
 
@@ -528,7 +563,7 @@ def func(self):
         self.obj.db.root_pos = root_pos
 
         # Check victory condition
-        if listvalues(root_pos).count(0) == 0:  # no roots in middle position
+        if list(root_pos.values()).count(0) == 0:  # no roots in middle position
             # This will affect the cmd: lock of CmdPressButton
             self.obj.db.button_exposed = True
             self.caller.msg("Holding aside the root you think you notice something behind it ...")
@@ -538,6 +573,7 @@ class CmdPressButton(Command):
     """
     Presses a button.
     """
+
     key = "press"
     aliases = ["press button", "button", "push button"]
     # only accessible if the button was found and there is light. This checks
@@ -552,17 +588,23 @@ def func(self):
 
         if self.caller.db.crumbling_wall_found_exit:
             # we already pushed the button
-            self.caller.msg("The button folded away when the secret passage opened. You cannot push it again.")
+            self.caller.msg(
+                "The button folded away when the secret passage opened. You cannot push it again."
+            )
             return
 
         # pushing the button
-        string = "You move your fingers over the suspicious depression, then gives it a " \
-                 "decisive push. First nothing happens, then there is a rumble and a hidden " \
-                 "|wpassage|n opens, dust and pebbles rumbling as part of the wall moves aside."
+        string = (
+            "You move your fingers over the suspicious depression, then gives it a "
+            "decisive push. First nothing happens, then there is a rumble and a hidden "
+            "|wpassage|n opens, dust and pebbles rumbling as part of the wall moves aside."
+        )
         self.caller.msg(string)
-        string = "%s moves their fingers over the suspicious depression, then gives it a " \
-                 "decisive push. First nothing happens, then there is a rumble and a hidden " \
-                 "|wpassage|n opens, dust and pebbles rumbling as part of the wall moves aside."
+        string = (
+            "%s moves their fingers over the suspicious depression, then gives it a "
+            "decisive push. First nothing happens, then there is a rumble and a hidden "
+            "|wpassage|n opens, dust and pebbles rumbling as part of the wall moves aside."
+        )
         self.caller.location.msg_contents(string % self.caller.key, exclude=self.caller)
         if not self.obj.open_wall():
             self.caller.msg("The exit leads nowhere, there's just more stone behind it ...")
@@ -570,6 +612,7 @@ def func(self):
 
 class CmdSetCrumblingWall(CmdSet):
     """Group the commands for crumblingWall"""
+
     key = "crumblingwall_cmdset"
     priority = 2
 
@@ -604,8 +647,7 @@ def at_object_creation(self):
         """called when the object is first created."""
         super().at_object_creation()
 
-        self.aliases.add(["secret passage", "passage",
-                          "crack", "opening", "secret door"])
+        self.aliases.add(["secret passage", "passage", "crack", "opening", "secret door"])
 
         # starting root positions. H1/H2 are the horizontally hanging roots,
         # V1/V2 the vertically hanging ones. Each can have three positions:
@@ -649,16 +691,22 @@ def open_wall(self):
 
     def _translate_position(self, root, ipos):
         """Translates the position into words"""
-        rootnames = {"red": "The |rreddish|n vertical-hanging root ",
-                     "blue": "The thick vertical root with |bblue|n flowers ",
-                     "yellow": "The thin horizontal-hanging root with |yyellow|n flowers ",
-                     "green": "The weedy |ggreen|n horizontal root "}
-        vpos = {-1: "hangs far to the |wleft|n on the wall.",
-                0: "hangs straight down the |wmiddle|n of the wall.",
-                1: "hangs far to the |wright|n of the wall."}
-        hpos = {-1: "covers the |wupper|n part of the wall.",
-                0: "passes right over the |wmiddle|n of the wall.",
-                1: "nearly touches the floor, near the |wbottom|n of the wall."}
+        rootnames = {
+            "red": "The |rreddish|n vertical-hanging root ",
+            "blue": "The thick vertical root with |bblue|n flowers ",
+            "yellow": "The thin horizontal-hanging root with |yyellow|n flowers ",
+            "green": "The weedy |ggreen|n horizontal root ",
+        }
+        vpos = {
+            -1: "hangs far to the |wleft|n on the wall.",
+            0: "hangs straight down the |wmiddle|n of the wall.",
+            1: "hangs far to the |wright|n of the wall.",
+        }
+        hpos = {
+            -1: "covers the |wupper|n part of the wall.",
+            0: "passes right over the |wmiddle|n of the wall.",
+            1: "nearly touches the floor, near the |wbottom|n of the wall.",
+        }
 
         if root in ("yellow", "green"):
             string = rootnames[root] + hpos[ipos]
@@ -673,21 +721,27 @@ def return_appearance(self, caller):
         """
         if self.db.button_exposed:
             # we found the button by moving the roots
-            result = ["Having moved all the roots aside, you find that the center of the wall, "
-                      "previously hidden by the vegetation, hid a curious square depression. It was maybe once "
-                      "concealed and made to look a part of the wall, but with the crumbling of stone around it, "
-                      "it's now easily identifiable as some sort of button."]
+            result = [
+                "Having moved all the roots aside, you find that the center of the wall, "
+                "previously hidden by the vegetation, hid a curious square depression. It was maybe once "
+                "concealed and made to look a part of the wall, but with the crumbling of stone around it, "
+                "it's now easily identifiable as some sort of button."
+            ]
         elif self.db.exit_open:
             # we pressed the button; the exit is open
-            result = ["With the button pressed, a crack has opened in the root-covered wall, just wide enough "
-                      "to squeeze through. A cold draft is coming from the hole and you get the feeling the "
-                      "opening may close again soon."]
+            result = [
+                "With the button pressed, a crack has opened in the root-covered wall, just wide enough "
+                "to squeeze through. A cold draft is coming from the hole and you get the feeling the "
+                "opening may close again soon."
+            ]
         else:
             # puzzle not solved yet.
-            result = ["The wall is old and covered with roots that here and there have permeated the stone. "
-                      "The roots (or whatever they are - some of them are covered in small nondescript flowers) "
-                      "crisscross the wall, making it hard to clearly see its stony surface. Maybe you could "
-                      "try to |wshift|n or |wmove|n them.\n"]
+            result = [
+                "The wall is old and covered with roots that here and there have permeated the stone. "
+                "The roots (or whatever they are - some of them are covered in small nondescript flowers) "
+                "crisscross the wall, making it hard to clearly see its stony surface. Maybe you could "
+                "try to |wshift|n or |wmove|n them.\n"
+            ]
             # display the root positions to help with the puzzle
             for key, pos in self.db.root_pos.items():
                 result.append("\n" + self._translate_position(key, pos))
@@ -714,7 +768,9 @@ def reset(self):
         Called by tutorial world runner, or whenever someone successfully
         traversed the Exit.
         """
-        self.location.msg_contents("The secret door closes abruptly, roots falling back into place.")
+        self.location.msg_contents(
+            "The secret door closes abruptly, roots falling back into place."
+        )
 
         # reset the flags and remove the exit destination
         self.db.button_exposed = False
@@ -722,11 +778,13 @@ def reset(self):
         self.destination = None
 
         # Reset the roots with some random starting positions for the roots:
-        start_pos = [{"yellow": 1, "green": 0, "red": 0, "blue": 0},
-                     {"yellow": 0, "green": 0, "red": 0, "blue": 0},
-                     {"yellow": 0, "green": 1, "red": -1, "blue": 0},
-                     {"yellow": 1, "green": 0, "red": 0, "blue": 0},
-                     {"yellow": 0, "green": 0, "red": 0, "blue": 1}]
+        start_pos = [
+            {"yellow": 1, "green": 0, "red": 0, "blue": 0},
+            {"yellow": 0, "green": 0, "red": 0, "blue": 0},
+            {"yellow": 0, "green": 1, "red": -1, "blue": 0},
+            {"yellow": 1, "green": 0, "red": 0, "blue": 0},
+            {"yellow": 0, "green": 0, "red": 0, "blue": 1},
+        ]
         self.db.root_pos = random.choice(start_pos)
 
 
@@ -746,6 +804,7 @@ def reset(self):
 #
 # -------------------------------------------------------------
 
+
 class CmdAttack(Command):
     """
     Attack the enemy. Commands:
@@ -765,7 +824,18 @@ class CmdAttack(Command):
     # command class, using the given command alias to separate between them.
 
     key = "attack"
-    aliases = ["hit", "kill", "fight", "thrust", "pierce", "stab", "slash", "chop", "parry", "defend"]
+    aliases = [
+        "hit",
+        "kill",
+        "fight",
+        "thrust",
+        "pierce",
+        "stab",
+        "slash",
+        "chop",
+        "parry",
+        "defend",
+    ]
     locks = "cmd:all()"
     help_category = "TutorialWorld"
 
@@ -781,10 +851,14 @@ def func(self):
 
         # parry mode
         if cmdstring in ("parry", "defend"):
-            string = "You raise your weapon in a defensive pose, ready to block the next enemy attack."
+            string = (
+                "You raise your weapon in a defensive pose, ready to block the next enemy attack."
+            )
             self.caller.msg(string)
             self.caller.db.combat_parry_mode = True
-            self.caller.location.msg_contents("%s takes a defensive stance" % self.caller, exclude=[self.caller])
+            self.caller.location.msg_contents(
+                "%s takes a defensive stance" % self.caller, exclude=[self.caller]
+            )
             return
 
         if not self.args:
@@ -802,15 +876,19 @@ def func(self):
             ostring = "%s stabs at %s with %s. " % (self.caller.key, target.key, self.obj.key)
             self.caller.db.combat_parry_mode = False
         elif cmdstring in ("slash", "chop"):
-            hit = float(self.obj.db.hit)   # un modified due to slash
+            hit = float(self.obj.db.hit)  # un modified due to slash
             damage = self.obj.db.damage  # un modified due to slash
             string = "You slash with %s. " % self.obj.key
             tstring = "%s slash at you with %s. " % (self.caller.key, self.obj.key)
             ostring = "%s slash at %s with %s. " % (self.caller.key, target.key, self.obj.key)
             self.caller.db.combat_parry_mode = False
         else:
-            self.caller.msg("You fumble with your weapon, unsure of whether to stab, slash or parry ...")
-            self.caller.location.msg_contents("%s fumbles with their weapon." % self.caller, exclude=self.caller)
+            self.caller.msg(
+                "You fumble with your weapon, unsure of whether to stab, slash or parry ..."
+            )
+            self.caller.location.msg_contents(
+                "%s fumbles with their weapon." % self.caller, exclude=self.caller
+            )
             self.caller.db.combat_parry_mode = False
             return
 
@@ -822,7 +900,9 @@ def func(self):
         if random.random() <= hit:
             self.caller.msg(string + "|gIt's a hit!|n")
             target.msg(tstring + "|rIt's a hit!|n")
-            self.caller.location.msg_contents(ostring + "It's a hit!", exclude=[target, self.caller])
+            self.caller.location.msg_contents(
+                ostring + "It's a hit!", exclude=[target, self.caller]
+            )
 
             # call enemy hook
             if hasattr(target, "at_hit"):
@@ -864,7 +944,7 @@ class Weapon(TutorialObject):
     def at_object_creation(self):
         """Called at first creation of the object"""
         super().at_object_creation()
-        self.db.hit = 0.4    # hit chance
+        self.db.hit = 0.4  # hit chance
         self.db.parry = 0.8  # parry chance
         self.db.damage = 1.0
         self.db.magic = False
@@ -876,8 +956,10 @@ def reset(self):
         to return to.
         """
         if self.location.has_account and self.home == self.location:
-            self.location.msg_contents("%s suddenly and magically fades into nothingness, as if it was never there ..."
-                                       % self.key)
+            self.location.msg_contents(
+                "%s suddenly and magically fades into nothingness, as if it was never there ..."
+                % self.key
+            )
             self.delete()
         else:
             self.location = self.home
@@ -904,19 +986,22 @@ def reset(self):
         "parry": 0.2,
         "damage": 1.0,
         "magic": False,
-        "desc": "A generic blade."},
+        "desc": "A generic blade.",
+    },
     "knife": {
         "prototype_parent": "weapon",
         "aliases": "sword",
         "key": "Kitchen knife",
         "desc": "A rusty kitchen knife. Better than nothing.",
-        "damage": 3},
+        "damage": 3,
+    },
     "dagger": {
         "prototype_parent": "knife",
         "key": "Rusty dagger",
         "aliases": ["knife", "dagger"],
         "desc": "A double-edged dagger with a nicked edge and a wooden handle.",
-        "hit": 0.25},
+        "hit": 0.25,
+    },
     "sword": {
         "prototype_parent": "weapon",
         "key": "Rusty sword",
@@ -924,28 +1009,32 @@ def reset(self):
         "desc": "A rusty shortsword. It has a leather-wrapped handle covered i food grease.",
         "hit": 0.3,
         "damage": 5,
-        "parry": 0.5},
+        "parry": 0.5,
+    },
     "club": {
         "prototype_parent": "weapon",
         "key": "Club",
         "desc": "A heavy wooden club, little more than a heavy branch.",
         "hit": 0.4,
         "damage": 6,
-        "parry": 0.2},
+        "parry": 0.2,
+    },
     "axe": {
         "prototype_parent": "weapon",
         "key": "Axe",
         "desc": "A woodcutter's axe with a keen edge.",
         "hit": 0.4,
         "damage": 6,
-        "parry": 0.2},
+        "parry": 0.2,
+    },
     "ornate longsword": {
         "prototype_parent": "sword",
         "key": "Ornate longsword",
         "desc": "A fine longsword with some swirling patterns on the handle.",
         "hit": 0.5,
         "magic": True,
-        "damage": 5},
+        "damage": 5,
+    },
     "warhammer": {
         "prototype_parent": "club",
         "key": "Silver Warhammer",
@@ -953,47 +1042,53 @@ def reset(self):
         "desc": "A heavy war hammer with silver ornaments. This huge weapon causes massive damage - if you can hit.",
         "hit": 0.4,
         "magic": True,
-        "damage": 8},
+        "damage": 8,
+    },
     "rune axe": {
         "prototype_parent": "axe",
         "key": "Runeaxe",
         "aliases": ["axe"],
         "hit": 0.4,
         "magic": True,
-        "damage": 6},
+        "damage": 6,
+    },
     "thruning": {
         "prototype_parent": "ornate longsword",
         "key": "Broadsword named Thruning",
         "desc": "This heavy bladed weapon is marked with the name 'Thruning'. It is very powerful in skilled hands.",
         "hit": 0.6,
         "parry": 0.6,
-        "damage": 7},
+        "damage": 7,
+    },
     "slayer waraxe": {
         "prototype_parent": "rune axe",
         "key": "Slayer waraxe",
         "aliases": ["waraxe", "war", "slayer"],
         "desc": "A huge double-bladed axe marked with the runes for 'Slayer'."
-                " It has more runic inscriptions on its head, which you cannot decipher.",
+        " It has more runic inscriptions on its head, which you cannot decipher.",
         "hit": 0.7,
-        "damage": 8},
+        "damage": 8,
+    },
     "ghostblade": {
         "prototype_parent": "ornate longsword",
         "key": "The Ghostblade",
         "aliases": ["blade", "ghost"],
         "desc": "This massive sword is large as you are tall, yet seems to weigh almost nothing."
-                " It's almost like it's not really there.",
+        " It's almost like it's not really there.",
         "hit": 0.9,
         "parry": 0.8,
-        "damage": 10},
+        "damage": 10,
+    },
     "hawkblade": {
         "prototype_parent": "ghostblade",
         "key": "The Hawkblade",
         "aliases": ["hawk", "blade"],
         "desc": "The weapon of a long-dead heroine and a more civilized age,"
-                " the hawk-shaped hilt of this blade almost has a life of its own.",
+        " the hawk-shaped hilt of this blade almost has a life of its own.",
         "hit": 0.85,
         "parry": 0.7,
-        "damage": 11}
+        "damage": 11,
+    },
 }
 
 
@@ -1004,6 +1099,7 @@ class CmdGetWeapon(Command):
 
     This will try to obtain a weapon from the container.
     """
+
     key = "get weapon"
     aliases = "get weapon"
     locks = "cmd:all()"
@@ -1021,6 +1117,7 @@ class CmdSetWeaponRack(CmdSet):
     """
     The cmdset for the rack.
     """
+
     key = "weaponrack_cmdset"
 
     def at_cmdset_creation(self):
@@ -1055,8 +1152,7 @@ def at_object_creation(self):
         # dictionary above.
         self.db.get_weapon_msg = "You find |c%s|n."
         self.db.no_more_weapons_msg = "you find nothing else of use."
-        self.db.available_weapons = ["knife", "dagger",
-                                     "sword", "club"]
+        self.db.available_weapons = ["knife", "dagger", "sword", "club"]
 
     def produce_weapon(self, caller):
         """
diff --git a/evennia/contrib/tutorial_world/rooms.py b/evennia/contrib/tutorial_world/rooms.py
index b0bbb20c88a..013ce26d9f0 100644
--- a/evennia/contrib/tutorial_world/rooms.py
+++ b/evennia/contrib/tutorial_world/rooms.py
@@ -21,6 +21,7 @@
 # given setting here using utils.object_from_module. This way we can use
 # it regardless of if we change settings later.
 from django.conf import settings
+
 _SEARCH_AT_RESULT = utils.object_from_module(settings.SEARCH_AT_RESULT)
 
 # -------------------------------------------------------------
@@ -48,6 +49,7 @@ class CmdTutorial(Command):
     about an object or the current location.
 
     """
+
     key = "tutorial"
     aliases = ["tut"]
     locks = "cmd:all()"
@@ -97,6 +99,7 @@ class CmdTutorialSetDetail(default_cmds.MuxCommand):
     We custom parse the key for the ;-separator in order to create
     multiple aliases to the detail all at once.
     """
+
     key = "@detail"
     locks = "cmd:perm(Builder)"
     help_category = "TutorialWorld"
@@ -137,6 +140,7 @@ class CmdTutorialLook(default_cmds.CmdLook):
     actually having to be actual database objects. It uses the
     return_detail() hook on TutorialRooms for this.
     """
+
     # we don't need to specify key/locks etc, this is already
     # set by the parent.
     help_category = "TutorialWorld"
@@ -154,10 +158,13 @@ def func(self):
             # ourself. This also means the search function will always
             # return a list (with 0, 1 or more elements) rather than
             # result/None.
-            looking_at_obj = caller.search(args,
-                                           # note: excludes room/room aliases
-                                           candidates=caller.location.contents + caller.contents,
-                                           use_nicks=True, quiet=True)
+            looking_at_obj = caller.search(
+                args,
+                # note: excludes room/room aliases
+                candidates=caller.location.contents + caller.contents,
+                use_nicks=True,
+                quiet=True,
+            )
             if len(looking_at_obj) != 1:
                 # no target found or more than one target found (multimatch)
                 # look for a detail that may match
@@ -181,7 +188,7 @@ def func(self):
                 caller.msg("You have no location to look at!")
                 return
 
-        if not hasattr(looking_at_obj, 'return_appearance'):
+        if not hasattr(looking_at_obj, "return_appearance"):
             # this is likely due to us having an account instead
             looking_at_obj = looking_at_obj.character
         if not looking_at_obj.access(caller, "view"):
@@ -200,6 +207,7 @@ class TutorialRoomCmdSet(CmdSet):
     command in the default CharacterCmdSet since it has a higher
     priority (ChracterCmdSet has prio 0)
     """
+
     key = "tutorial_cmdset"
     priority = 1
 
@@ -218,7 +226,9 @@ class TutorialRoom(DefaultRoom):
 
     def at_object_creation(self):
         """Called when room is first created"""
-        self.db.tutorial_info = "This is a tutorial room. It allows you to use the 'tutorial' command."
+        self.db.tutorial_info = (
+            "This is a tutorial room. It allows you to use the 'tutorial' command."
+        )
         self.cmdset.add_default(TutorialRoomCmdSet)
 
     def at_object_receive(self, new_arrival, source_location):
@@ -289,7 +299,8 @@ def set_detail(self, detailkey, description):
     "It rains so hard you can hardly see your hand in front of you. You'll soon be drenched to the bone.",
     "Lightning strikes in several thundering bolts, striking the trees in the forest to your west.",
     "You hear the distant howl of what sounds like some sort of dog or wolf.",
-    "Large clouds rush across the sky, throwing their load of rain over the world.")
+    "Large clouds rush across the sky, throwing their load of rain over the world.",
+)
 
 
 class WeatherRoom(TutorialRoom):
@@ -316,10 +327,11 @@ def at_object_creation(self):
         # "update_weather" on this object. The interval is randomized
         # so as to not have all weather rooms update at the same time.
         self.db.interval = random.randint(50, 70)
-        TICKER_HANDLER.add(interval=self.db.interval, callback=self.update_weather, idstring="tutorial")
+        TICKER_HANDLER.add(
+            interval=self.db.interval, callback=self.update_weather, idstring="tutorial"
+        )
         # this is parsed by the 'tutorial' command on TutorialRooms.
-        self.db.tutorial_info = \
-            "This room has a Script running that has it echo a weather-related message at irregular intervals."
+        self.db.tutorial_info = "This room has a Script running that has it echo a weather-related message at irregular intervals."
 
     def update_weather(self, *args, **kwargs):
         """
@@ -334,11 +346,12 @@ def update_weather(self, *args, **kwargs):
             self.msg_contents("|w%s|n" % random.choice(WEATHER_STRINGS))
 
 
-SUPERUSER_WARNING = "\nWARNING: You are playing as a superuser ({name}). Use the {quell} command to\n" \
-                    "play without superuser privileges (many functions and puzzles ignore the \n" \
-                    "presence of a superuser, making this mode useful for exploring things behind \n" \
-                    "the scenes later).\n" \
-
+SUPERUSER_WARNING = (
+    "\nWARNING: You are playing as a superuser ({name}). Use the {quell} command to\n"
+    "play without superuser privileges (many functions and puzzles ignore the \n"
+    "presence of a superuser, making this mode useful for exploring things behind \n"
+    "the scenes later).\n"
+)
 
 # ------------------------------------------------------------
 #
@@ -363,9 +376,11 @@ def at_object_creation(self):
         Called when the room is first created.
         """
         super().at_object_creation()
-        self.db.tutorial_info = "The first room of the tutorial. " \
-                                "This assigns the health Attribute to "\
-                                "the account."
+        self.db.tutorial_info = (
+            "The first room of the tutorial. "
+            "This assigns the health Attribute to "
+            "the account."
+        )
 
     def at_object_receive(self, character, source_location):
         """
@@ -417,6 +432,7 @@ class CmdEast(Command):
              on the bridge, 0 - 4.
 
     """
+
     key = "east"
     aliases = ["e"]
     locks = "cmd:all()"
@@ -440,7 +456,9 @@ def func(self):
         caller.db.tutorial_bridge_position = bridge_step
         # since we are really in one room, we have to notify others
         # in the room when we move.
-        caller.location.msg_contents("%s steps eastwards across the bridge." % caller.name, exclude=caller)
+        caller.location.msg_contents(
+            "%s steps eastwards across the bridge." % caller.name, exclude=caller
+        )
         caller.execute_cmd("look")
 
 
@@ -461,6 +479,7 @@ class CmdWest(Command):
              on the bridge, 0 - 4.
 
     """
+
     key = "west"
     aliases = ["w"]
     locks = "cmd:all()"
@@ -484,35 +503,44 @@ def func(self):
         caller.db.tutorial_bridge_position = bridge_step
         # since we are really in one room, we have to notify others
         # in the room when we move.
-        caller.location.msg_contents("%s steps westwards across the bridge." % caller.name, exclude=caller)
+        caller.location.msg_contents(
+            "%s steps westwards across the bridge." % caller.name, exclude=caller
+        )
         caller.execute_cmd("look")
 
 
-BRIDGE_POS_MESSAGES = ("You are standing |wvery close to the the bridge's western foundation|n."
-                       " If you go west you will be back on solid ground ...",
-                       "The bridge slopes precariously where it extends eastwards"
-                       " towards the lowest point - the center point of the hang bridge.",
-                       "You are |whalfways|n out on the unstable bridge.",
-                       "The bridge slopes precariously where it extends westwards"
-                       " towards the lowest point - the center point of the hang bridge.",
-                       "You are standing |wvery close to the bridge's eastern foundation|n."
-                       " If you go east you will be back on solid ground ...")
-BRIDGE_MOODS = ("The bridge sways in the wind.", "The hanging bridge creaks dangerously.",
-                "You clasp the ropes firmly as the bridge sways and creaks under you.",
-                "From the castle you hear a distant howling sound, like that of a large dog or other beast.",
-                "The bridge creaks under your feet. Those planks does not seem very sturdy.",
-                "Far below you the ocean roars and throws its waves against the cliff,"
-                " as if trying its best to reach you.",
-                "Parts of the bridge come loose behind you, falling into the chasm far below!",
-                "A gust of wind causes the bridge to sway precariously.",
-                "Under your feet a plank comes loose, tumbling down. For a moment you dangle over the abyss ...",
-                "The section of rope you hold onto crumble in your hands,"
-                " parts of it breaking apart. You sway trying to regain balance.")
-
-FALL_MESSAGE = "Suddenly the plank you stand on gives way under your feet! You fall!" \
-               "\nYou try to grab hold of an adjoining plank, but all you manage to do is to " \
-               "divert your fall westwards, towards the cliff face. This is going to hurt ... " \
-               "\n ... The world goes dark ...\n\n"
+BRIDGE_POS_MESSAGES = (
+    "You are standing |wvery close to the the bridge's western foundation|n."
+    " If you go west you will be back on solid ground ...",
+    "The bridge slopes precariously where it extends eastwards"
+    " towards the lowest point - the center point of the hang bridge.",
+    "You are |whalfways|n out on the unstable bridge.",
+    "The bridge slopes precariously where it extends westwards"
+    " towards the lowest point - the center point of the hang bridge.",
+    "You are standing |wvery close to the bridge's eastern foundation|n."
+    " If you go east you will be back on solid ground ...",
+)
+BRIDGE_MOODS = (
+    "The bridge sways in the wind.",
+    "The hanging bridge creaks dangerously.",
+    "You clasp the ropes firmly as the bridge sways and creaks under you.",
+    "From the castle you hear a distant howling sound, like that of a large dog or other beast.",
+    "The bridge creaks under your feet. Those planks does not seem very sturdy.",
+    "Far below you the ocean roars and throws its waves against the cliff,"
+    " as if trying its best to reach you.",
+    "Parts of the bridge come loose behind you, falling into the chasm far below!",
+    "A gust of wind causes the bridge to sway precariously.",
+    "Under your feet a plank comes loose, tumbling down. For a moment you dangle over the abyss ...",
+    "The section of rope you hold onto crumble in your hands,"
+    " parts of it breaking apart. You sway trying to regain balance.",
+)
+
+FALL_MESSAGE = (
+    "Suddenly the plank you stand on gives way under your feet! You fall!"
+    "\nYou try to grab hold of an adjoining plank, but all you manage to do is to "
+    "divert your fall westwards, towards the cliff face. This is going to hurt ... "
+    "\n ... The world goes dark ...\n\n"
+)
 
 
 class CmdLookBridge(Command):
@@ -524,7 +552,8 @@ class CmdLookBridge(Command):
         "fall_exit", a unique name or dbref to the place they end upp
         if they fall off the bridge.
     """
-    key = 'look'
+
+    key = "look"
     aliases = ["l"]
     locks = "cmd:all()"
     help_category = "TutorialWorld"
@@ -536,9 +565,11 @@ def func(self):
         # this command is defined on the room, so we get it through self.obj
         location = self.obj
         # randomize the look-echo
-        message = "|c%s|n\n%s\n%s" % (location.key,
-                                      BRIDGE_POS_MESSAGES[bridge_position],
-                                      random.choice(BRIDGE_MOODS))
+        message = "|c%s|n\n%s\n%s" % (
+            location.key,
+            BRIDGE_POS_MESSAGES[bridge_position],
+            random.choice(BRIDGE_MOODS),
+        )
 
         chars = [obj for obj in self.obj.contents_get(exclude=caller) if obj.has_account]
         if chars:
@@ -555,8 +586,10 @@ def func(self):
                 self.caller.msg("|r%s|n" % FALL_MESSAGE)
                 self.caller.move_to(fall_exit[0], quiet=True)
                 # inform others on the bridge
-                self.obj.msg_contents("A plank gives way under %s's feet and "
-                                      "they fall from the bridge!" % self.caller.key)
+                self.obj.msg_contents(
+                    "A plank gives way under %s's feet and "
+                    "they fall from the bridge!" % self.caller.key
+                )
 
 
 # custom help command
@@ -564,6 +597,7 @@ class CmdBridgeHelp(Command):
     """
     Overwritten help command while on the bridge.
     """
+
     key = "help"
     aliases = ["h", "?"]
     locks = "cmd:all()"
@@ -571,14 +605,17 @@ class CmdBridgeHelp(Command):
 
     def func(self):
         """Implements the command."""
-        string = "You are trying hard not to fall off the bridge ..." \
-                 "\n\nWhat you can do is trying to cross the bridge |weast|n" \
-                 " or try to get back to the mainland |wwest|n)."
+        string = (
+            "You are trying hard not to fall off the bridge ..."
+            "\n\nWhat you can do is trying to cross the bridge |weast|n"
+            " or try to get back to the mainland |wwest|n)."
+        )
         self.caller.msg(string)
 
 
 class BridgeCmdSet(CmdSet):
     """This groups the bridge commands. We will store it on the room."""
+
     key = "Bridge commands"
     priority = 1  # this gives it precedence over the normal look/help commands.
 
@@ -601,7 +638,8 @@ def at_cmdset_creation(self):
     "Some sort of large bird sweeps by overhead, giving off an eery screech. Soon it has disappeared in the gloom.",
     "The bridge sways from side to side in the wind.",
     "Below you a particularly large wave crashes into the rocks.",
-    "From the ruin you hear a distant, otherwordly howl. Or maybe it was just the wind.")
+    "From the ruin you hear a distant, otherwordly howl. Or maybe it was just the wind.",
+)
 
 
 class BridgeRoom(WeatherRoom):
@@ -670,8 +708,10 @@ def at_object_receive(self, character, source_location):
             eexit = search_object(self.db.east_exit)
             fexit = search_object(self.db.fall_exit)
             if not (wexit and eexit and fexit):
-                character.msg("The bridge's exits are not properly configured. "
-                              "Contact an admin. Forcing west-end placement.")
+                character.msg(
+                    "The bridge's exits are not properly configured. "
+                    "Contact an admin. Forcing west-end placement."
+                )
                 character.db.tutorial_bridge_position = 0
                 return
             if source_location == eexit[0]:
@@ -702,25 +742,31 @@ def at_object_leave(self, character, target_location):
 # -------------------------------------------------------------------------------
 
 
-DARK_MESSAGES = ("It is pitch black. You are likely to be eaten by a grue.",
-                 "It's pitch black. You fumble around but cannot find anything.",
-                 "You don't see a thing. You feel around, managing to bump your fingers hard against something. Ouch!",
-                 "You don't see a thing! Blindly grasping the air around you, you find nothing.",
-                 "It's totally dark here. You almost stumble over some un-evenness in the ground.",
-                 "You are completely blind. For a moment you think you hear someone breathing nearby ... "
-                 "\n ... surely you must be mistaken.",
-                 "Blind, you think you find some sort of object on the ground, but it turns out to be just a stone.",
-                 "Blind, you bump into a wall. The wall seems to be covered with some sort of vegetation,"
-                 " but its too damp to burn.",
-                 "You can't see anything, but the air is damp. It feels like you are far underground.")
-
-ALREADY_LIGHTSOURCE = "You don't want to stumble around in blindness anymore. You already " \
-                      "found what you need. Let's get light already!"
-
-FOUND_LIGHTSOURCE = "Your fingers bump against a splinter of wood in a corner." \
-                    " It smells of resin and seems dry enough to burn! " \
-                    "You pick it up, holding it firmly. Now you just need to" \
-                    " |wlight|n it using the flint and steel you carry with you."
+DARK_MESSAGES = (
+    "It is pitch black. You are likely to be eaten by a grue.",
+    "It's pitch black. You fumble around but cannot find anything.",
+    "You don't see a thing. You feel around, managing to bump your fingers hard against something. Ouch!",
+    "You don't see a thing! Blindly grasping the air around you, you find nothing.",
+    "It's totally dark here. You almost stumble over some un-evenness in the ground.",
+    "You are completely blind. For a moment you think you hear someone breathing nearby ... "
+    "\n ... surely you must be mistaken.",
+    "Blind, you think you find some sort of object on the ground, but it turns out to be just a stone.",
+    "Blind, you bump into a wall. The wall seems to be covered with some sort of vegetation,"
+    " but its too damp to burn.",
+    "You can't see anything, but the air is damp. It feels like you are far underground.",
+)
+
+ALREADY_LIGHTSOURCE = (
+    "You don't want to stumble around in blindness anymore. You already "
+    "found what you need. Let's get light already!"
+)
+
+FOUND_LIGHTSOURCE = (
+    "Your fingers bump against a splinter of wood in a corner."
+    " It smells of resin and seems dry enough to burn! "
+    "You pick it up, holding it firmly. Now you just need to"
+    " |wlight|n it using the flint and steel you carry with you."
+)
 
 
 class CmdLookDark(Command):
@@ -733,8 +779,9 @@ class CmdLookDark(Command):
     Look around in the darkness, trying
     to find something.
     """
+
     key = "look"
-    aliases = ["l", 'feel', 'search', 'feel around', 'fiddle']
+    aliases = ["l", "feel", "search", "feel around", "fiddle"]
     locks = "cmd:all()"
     help_category = "TutorialWorld"
 
@@ -772,6 +819,7 @@ class CmdDarkHelp(Command):
     """
     Help command for the dark state.
     """
+
     key = "help"
     locks = "cmd:all()"
     help_category = "TutorialWorld"
@@ -780,8 +828,10 @@ def func(self):
         """
         Replace the the help command with a not-so-useful help
         """
-        string = "Can't help you until you find some light! Try looking/feeling around for something to burn. " \
-                 "You shouldn't give up even if you don't find anything right away."
+        string = (
+            "Can't help you until you find some light! Try looking/feeling around for something to burn. "
+            "You shouldn't give up even if you don't find anything right away."
+        )
         self.caller.msg(string)
 
 
@@ -793,13 +843,16 @@ class CmdDarkNoMatch(Command):
     replaces Evennia's default behavior or offering command
     suggestions)
     """
+
     key = syscmdkeys.CMD_NOMATCH
     locks = "cmd:all()"
 
     def func(self):
         """Implements the command."""
-        self.caller.msg("Until you find some light, there's not much you can do. "
-                        "Try feeling around, maybe you'll find something helpful!")
+        self.caller.msg(
+            "Until you find some light, there's not much you can do. "
+            "Try feeling around, maybe you'll find something helpful!"
+        )
 
 
 class DarkCmdSet(CmdSet):
@@ -812,6 +865,7 @@ class DarkCmdSet(CmdSet):
     completely replaces whichever command set it is merged onto
     (usually the default cmdset)
     """
+
     key = "darkroom_cmdset"
     mergetype = "Replace"
     priority = 2
@@ -868,7 +922,11 @@ def _carries_light(self, obj):
         if there is a light-giving object in the room overall (like if
         a splinter was dropped in the room)
         """
-        return obj.is_superuser or obj.db.is_giving_light or any(o for o in obj.contents if o.db.is_giving_light)
+        return (
+            obj.is_superuser
+            or obj.db.is_giving_light
+            or any(o for o in obj.contents if o.db.is_giving_light)
+        )
 
     def _heal(self, character):
         """
@@ -1013,6 +1071,7 @@ def at_object_receive(self, character, source_location):
 #
 # -------------------------------------------------------------
 
+
 class OutroRoom(TutorialRoom):
     """
     Outro room.
@@ -1027,10 +1086,12 @@ def at_object_creation(self):
         Called when the room is first created.
         """
         super().at_object_creation()
-        self.db.tutorial_info = "The last room of the tutorial. " \
-                                "This cleans up all temporary Attributes " \
-                                "the tutorial may have assigned to the "\
-                                "character."
+        self.db.tutorial_info = (
+            "The last room of the tutorial. "
+            "This cleans up all temporary Attributes "
+            "the tutorial may have assigned to the "
+            "character."
+        )
 
     def at_object_receive(self, character, source_location):
         """
diff --git a/evennia/contrib/unixcommand.py b/evennia/contrib/unixcommand.py
index 0b63c288ca7..46d38c1589b 100644
--- a/evennia/contrib/unixcommand.py
+++ b/evennia/contrib/unixcommand.py
@@ -111,8 +111,8 @@ def __init__(self, prog, description="", epilog="", command=None, **kwargs):
         """
         prog = prog or command.key
         super().__init__(
-            prog=prog, description=description,
-            conflict_handler='resolve', add_help=False, **kwargs)
+            prog=prog, description=description, conflict_handler="resolve", add_help=False, **kwargs
+        )
         self.command = command
         self.post_help = epilog
 
@@ -122,8 +122,9 @@ def n_exit(code=None, msg=None):
         self.exit = n_exit
 
         # Replace the -h/--help
-        self.add_argument("-h", "--hel", nargs=0, action=HelpAction,
-                          help="display the command help")
+        self.add_argument(
+            "-h", "--hel", nargs=0, action=HelpAction, help="display the command help"
+        )
 
     def format_usage(self):
         """Return the usage line.
diff --git a/evennia/contrib/wilderness.py b/evennia/contrib/wilderness.py
index 83981c57005..da10bbdee11 100644
--- a/evennia/contrib/wilderness.py
+++ b/evennia/contrib/wilderness.py
@@ -335,8 +335,7 @@ def move_obj(self, obj, new_coordinates):
             self._destroy_room(old_room)
         except KeyError:
             # There is no room yet at new_location
-            if (old_room and not inherits_from(old_room, WildernessRoom)) or \
-               (not old_room):
+            if (old_room and not inherits_from(old_room, WildernessRoom)) or (not old_room):
                 # Obj doesn't originally come from a wilderness room.
                 # We'll create a new one then.
                 room = self._create_room(new_coordinates, obj)
@@ -390,26 +389,30 @@ def _create_room(self, coordinates, report_to):
             # No more unused rooms...time to make a new one.
 
             # First, create the room
-            room = create_object(typeclass=self.mapprovider.room_typeclass,
-                                 key="Wilderness",
-                                 report_to=report_to)
+            room = create_object(
+                typeclass=self.mapprovider.room_typeclass, key="Wilderness", report_to=report_to
+            )
 
             # Then the exits
-            exits = [("north", "n"),
-                     ("northeast", "ne"),
-                     ("east", "e"),
-                     ("southeast", "se"),
-                     ("south", "s"),
-                     ("southwest", "sw"),
-                     ("west", "w"),
-                     ("northwest", "nw")]
+            exits = [
+                ("north", "n"),
+                ("northeast", "ne"),
+                ("east", "e"),
+                ("southeast", "se"),
+                ("south", "s"),
+                ("southwest", "sw"),
+                ("west", "w"),
+                ("northwest", "nw"),
+            ]
             for key, alias in exits:
-                create_object(typeclass=self.mapprovider.exit_typeclass,
-                              key=key,
-                              aliases=[alias],
-                              location=room,
-                              destination=room,
-                              report_to=report_to)
+                create_object(
+                    typeclass=self.mapprovider.exit_typeclass,
+                    key=key,
+                    aliases=[alias],
+                    location=room,
+                    destination=room,
+                    report_to=report_to,
+                )
 
         room.ndb.active_coordinates = coordinates
         room.ndb.wildernessscript = self
@@ -490,8 +493,7 @@ def location_name(self):
         Returns:
             name (str)
         """
-        return self.wilderness.mapprovider.get_location_name(
-            self.coordinates)
+        return self.wilderness.mapprovider.get_location_name(self.coordinates)
 
     @property
     def coordinates(self):
@@ -651,8 +653,7 @@ def mapprovider(self):
         """
         return self.wilderness.mapprovider
 
-    def at_traverse_coordinates(self, traversing_object, current_coordinates,
-                                new_coordinates):
+    def at_traverse_coordinates(self, traversing_object, current_coordinates, new_coordinates):
         """
         Called when an object wants to travel from one place inside the
         wilderness to another place inside the wilderness.
@@ -692,22 +693,24 @@ def at_traverse(self, traversing_object, target_location):
         current_coordinates = itemcoordinates[traversing_object]
         new_coordinates = get_new_coordinates(current_coordinates, self.key)
 
-        if not self.at_traverse_coordinates(traversing_object,
-                                            current_coordinates,
-                                            new_coordinates):
+        if not self.at_traverse_coordinates(
+            traversing_object, current_coordinates, new_coordinates
+        ):
             return False
 
         if not traversing_object.at_before_move(None):
             return False
-        traversing_object.location.msg_contents("{} leaves to {}".format(
-            traversing_object.key, new_coordinates),
-            exclude=[traversing_object])
+        traversing_object.location.msg_contents(
+            "{} leaves to {}".format(traversing_object.key, new_coordinates),
+            exclude=[traversing_object],
+        )
 
         self.location.wilderness.move_obj(traversing_object, new_coordinates)
 
-        traversing_object.location.msg_contents("{} arrives from {}".format(
-            traversing_object.key, current_coordinates),
-            exclude=[traversing_object])
+        traversing_object.location.msg_contents(
+            "{} arrives from {}".format(traversing_object.key, current_coordinates),
+            exclude=[traversing_object],
+        )
 
         traversing_object.at_after_move(None)
         return True
@@ -719,6 +722,7 @@ class WildernessMapProvider(object):
 
     This is a simple provider that just creates an infinite large grid area.
     """
+
     room_typeclass = WildernessRoom
     exit_typeclass = WildernessExit
 
diff --git a/evennia/game_template/commands/command.py b/evennia/game_template/commands/command.py
index 3e0f4dc9d0a..3c7c0e2ef3c 100644
--- a/evennia/game_template/commands/command.py
+++ b/evennia/game_template/commands/command.py
@@ -6,6 +6,7 @@
 """
 
 from evennia import Command as BaseCommand
+
 # from evennia import default_cmds
 
 
@@ -29,8 +30,10 @@ class Command(BaseCommand):
             every command, like prompts.
 
     """
+
     pass
 
+
 # -------------------------------------------------------------
 #
 # The default commands inherit from
diff --git a/evennia/game_template/commands/default_cmdsets.py b/evennia/game_template/commands/default_cmdsets.py
index 7633f14c4a0..fee80c7e624 100644
--- a/evennia/game_template/commands/default_cmdsets.py
+++ b/evennia/game_template/commands/default_cmdsets.py
@@ -23,6 +23,7 @@ class CharacterCmdSet(default_cmds.CharacterCmdSet):
     `get`, etc available on in-game Character objects. It is merged with
     the `AccountCmdSet` when an Account puppets a Character.
     """
+
     key = "DefaultCharacter"
 
     def at_cmdset_creation(self):
@@ -42,6 +43,7 @@ class AccountCmdSet(default_cmds.AccountCmdSet):
     Character. It holds game-account-specific commands, channel
     commands, etc.
     """
+
     key = "DefaultAccount"
 
     def at_cmdset_creation(self):
@@ -59,6 +61,7 @@ class UnloggedinCmdSet(default_cmds.UnloggedinCmdSet):
     Command set available to the Session before being logged in.  This
     holds commands like creating a new account, logging in, etc.
     """
+
     key = "DefaultUnloggedin"
 
     def at_cmdset_creation(self):
@@ -76,6 +79,7 @@ class SessionCmdSet(default_cmds.SessionCmdSet):
     This cmdset is made available on Session level once logged in. It
     is empty by default.
     """
+
     key = "DefaultSession"
 
     def at_cmdset_creation(self):
diff --git a/evennia/game_template/server/conf/connection_screens.py b/evennia/game_template/server/conf/connection_screens.py
index 713cf318b85..adfcd730227 100644
--- a/evennia/game_template/server/conf/connection_screens.py
+++ b/evennia/game_template/server/conf/connection_screens.py
@@ -34,5 +34,6 @@
 
  If you have spaces in your username, enclose it in quotes.
  Enter |whelp|n for more info. |wlook|n will re-show this screen.
-|b==============================================================|n""" \
-    .format(settings.SERVERNAME, utils.get_evennia_version("short"))
+|b==============================================================|n""".format(
+    settings.SERVERNAME, utils.get_evennia_version("short")
+)
diff --git a/evennia/game_template/server/conf/mssp.py b/evennia/game_template/server/conf/mssp.py
index b0b8e6a6bb1..711447b81f3 100644
--- a/evennia/game_template/server/conf/mssp.py
+++ b/evennia/game_template/server/conf/mssp.py
@@ -2,103 +2,91 @@
 
 MSSP (Mud Server Status Protocol) meta information
 
-MUD website listings (that you have registered with) can use this
-information to keep up-to-date with your game stats as you change
-them. Also number of currently active players and uptime will
-automatically be reported. You don't have to fill in everything
-(and most are not used by all crawlers); leave the default
-if so needed. You need to @reload the game before updated
-information is made available to crawlers (reloading does not
-affect uptime).
+Modify this file to specify what MUD listing sites will report about your game.
+All fields are static. The number of currently active players and your game's
+current uptime will be added automatically by Evennia.
 
-"""
+You don't have to fill in everything (and most fields are not shown/used by all
+crawlers anyway); leave the default if so needed. You need to reload the server
+before the updated information is made available to crawlers (reloading does
+not affect uptime).
 
-MSSPTable = {
+After changing the values in this file, you must register your game with the
+MUD website list you want to track you. The listing crawler will then regularly
+connect to your server to get the latest info. No further configuration is
+needed on the Evennia side.
 
-    # Required fieldss
+"""
 
+MSSPTable = {
+    # Required fields
     "NAME": "Evennia",
-
     # Generic
-
-    "CRAWL DELAY": "-1",     # limit how often crawler updates the listing. -1 for no limit
-
-    "HOSTNAME": "",       # current or new hostname
-    "PORT": ["4000"],  # most important port should be last in list
+    "CRAWL DELAY": "-1",  # limit how often crawler updates the listing. -1 for no limit
+    "HOSTNAME": "",  # current or new hostname
+    "PORT": ["4000"],  # most important port should be *last* in list!
     "CODEBASE": "Evennia",
-    "CONTACT": "",       # email for contacting the mud
-    "CREATED": "",       # year MUD was created
-    "ICON": "",       # url to icon 32x32 or larger; <32kb.
-    "IP": "",       # current or new IP address
-    "LANGUAGE": "",       # name of language used, e.g. English
-    "LOCATION": "",       # full English name of server country
-    "MINIMUM AGE": "0",      # set to 0 if not applicable
+    "CONTACT": "",  # email for contacting the mud
+    "CREATED": "",  # year MUD was created
+    "ICON": "",  # url to icon 32x32 or larger; <32kb.
+    "IP": "",  # current or new IP address
+    "LANGUAGE": "",  # name of language used, e.g. English
+    "LOCATION": "",  # full English name of server country
+    "MINIMUM AGE": "0",  # set to 0 if not applicable
     "WEBSITE": "www.evennia.com",
-
     # Categorisation
-
     "FAMILY": "Custom",  # evennia goes under 'Custom'
-    "GENRE": "None",   # Adult, Fantasy, Historical, Horror, Modern, None, or Science Fiction
-    "GAMEPLAY": "",       # Adventure, Educational, Hack and Slash, None,
+    "GENRE": "None",  # Adult, Fantasy, Historical, Horror, Modern, None, or Science Fiction
+    # Gameplay: Adventure, Educational, Hack and Slash, None,
     # Player versus Player, Player versus Environment,
     # Roleplaying, Simulation, Social or Strategy
+    "GAMEPLAY": "",
     "STATUS": "Open Beta",  # Alpha, Closed Beta, Open Beta, Live
     "GAMESYSTEM": "Custom",  # D&D, d20 System, World of Darkness, etc. Use Custom if homebrew
-    "SUBGENRE": "None",   # LASG, Medieval Fantasy, World War II, Frankenstein,
+    # Subgenre: LASG, Medieval Fantasy, World War II, Frankenstein,
     # Cyberpunk, Dragonlance, etc. Or None if not available.
-
+    "SUBGENRE": "None",
     # World
-
     "AREAS": "0",
     "HELPFILES": "0",
     "MOBILES": "0",
     "OBJECTS": "0",
-    "ROOMS": "0",      # use 0 if room-less
-    "CLASSES": "0",      # use 0 if class-less
-    "LEVELS": "0",      # use 0 if level-less
-    "RACES": "0",      # use 0 if race-less
-    "SKILLS": "0",      # use 0 if skill-less
-
+    "ROOMS": "0",  # use 0 if room-less
+    "CLASSES": "0",  # use 0 if class-less
+    "LEVELS": "0",  # use 0 if level-less
+    "RACES": "0",  # use 0 if race-less
+    "SKILLS": "0",  # use 0 if skill-less
     # Protocols set to 1 or 0)
-
     "ANSI": "1",
     "GMCP": "1",
+    "MSDP": "1",
+    "MXP": "1",
+    "SSL": "1",
+    "UTF-8": "1",
+    "MCCP": "1",
+    "XTERM 256 COLORS": "1",
+    "XTERM TRUE COLORS": "0",
     "ATCP": "0",
-    "MCCP": "0",
     "MCP": "0",
-    "MSDP": "0",
     "MSP": "0",
-    "MXP": "0",
-    "PUEBLO": "0",
-    "SSL": "1",
-    "UTF-8": "1",
     "VT100": "0",
+    "PUEBLO": "0",
     "ZMP": "0",
-    "XTERM 256 COLORS": "0",
-
     # Commercial set to 1 or 0)
-
     "PAY TO PLAY": "0",
     "PAY FOR PERKS": "0",
-
     # Hiring  set to 1 or 0)
-
     "HIRING BUILDERS": "0",
     "HIRING CODERS": "0",
-
     # Extended variables
-
     # World
-
     "DBSIZE": "0",
     "EXITS": "0",
     "EXTRA DESCRIPTIONS": "0",
     "MUDPROGS": "0",
     "MUDTRIGS": "0",
     "RESETS": "0",
-
     # Game  (set to 1 or 0, or one of the given alternatives)
-
     "ADULT MATERIAL": "0",
     "MULTICLASSING": "0",
     "NEWBIE FRIENDLY": "0",
@@ -112,6 +100,6 @@
     "QUEST SYSTEM": "None",  # "None", "Immortal Run", "Automated", "Integrated"
     "ROLEPLAYING": "None",  # "None", "Accepted", "Encouraged", "Enforced"
     "TRAINING SYSTEM": "None",  # "None", "Level", "Skill", "Both"
-    "WORLD ORIGINALITY": "None",  # "All Stock", "Mostly Stock", "Mostly Original", "All Original"
-
+    # World originality: "All Stock", "Mostly Stock", "Mostly Original", "All Original"
+    "WORLD ORIGINALITY": "All Original",
 }
diff --git a/evennia/game_template/server/conf/serversession.py b/evennia/game_template/server/conf/serversession.py
index a04f6db4361..13fbf1e36f0 100644
--- a/evennia/game_template/server/conf/serversession.py
+++ b/evennia/game_template/server/conf/serversession.py
@@ -33,4 +33,5 @@ class ServerSession(BaseServerSession):
     to the game server. All communication between game and account goes
     through their session(s).
     """
+
     pass
diff --git a/evennia/game_template/typeclasses/accounts.py b/evennia/game_template/typeclasses/accounts.py
index 99d861bf0b4..ba293c61582 100644
--- a/evennia/game_template/typeclasses/accounts.py
+++ b/evennia/game_template/typeclasses/accounts.py
@@ -91,6 +91,7 @@ class Account(DefaultAccount):
      at_server_shutdown()
 
     """
+
     pass
 
 
@@ -99,4 +100,5 @@ class Guest(DefaultGuest):
     This class is used for guest logins. Unlike Accounts, Guests and their
     characters are deleted after disconnection.
     """
+
     pass
diff --git a/evennia/game_template/typeclasses/channels.py b/evennia/game_template/typeclasses/channels.py
index a1af6d763b7..0b943d009b9 100644
--- a/evennia/game_template/typeclasses/channels.py
+++ b/evennia/game_template/typeclasses/channels.py
@@ -58,4 +58,5 @@ class Channel(DefaultChannel):
         post_send_message(msg) - called just after message was sent to channel
 
     """
+
     pass
diff --git a/evennia/game_template/typeclasses/characters.py b/evennia/game_template/typeclasses/characters.py
index a6942609b13..1e454577cd3 100644
--- a/evennia/game_template/typeclasses/characters.py
+++ b/evennia/game_template/typeclasses/characters.py
@@ -30,4 +30,5 @@ class Character(DefaultCharacter):
     at_post_puppet - Echoes "AccountName has entered the game" to the room.
 
     """
+
     pass
diff --git a/evennia/game_template/typeclasses/exits.py b/evennia/game_template/typeclasses/exits.py
index 6494641c1ee..55e091f837c 100644
--- a/evennia/game_template/typeclasses/exits.py
+++ b/evennia/game_template/typeclasses/exits.py
@@ -34,4 +34,5 @@ class Exit(DefaultExit):
                                         not be called if the attribute `err_traverse` is
                                         defined, in which case that will simply be echoed.
     """
+
     pass
diff --git a/evennia/game_template/typeclasses/objects.py b/evennia/game_template/typeclasses/objects.py
index 12468bbd50a..21443e876cc 100644
--- a/evennia/game_template/typeclasses/objects.py
+++ b/evennia/game_template/typeclasses/objects.py
@@ -34,12 +34,8 @@ class Object(DefaultObject):
 
      key (string) - name of object
      name (string)- same as key
-     aliases (list of strings) - aliases to the object. Will be saved to
-                           database as AliasDB entries but returned as strings.
      dbref (int, read-only) - unique #id-number. Also "id" can be used.
-                                  back to this class
      date_created (string) - time stamp of object creation
-     permissions (list of strings) - list of permission strings
 
      account (Account) - controlling account (if any, only set together with
                        sessid below)
@@ -48,8 +44,6 @@ class Object(DefaultObject):
                        Sessions directly.
      location (Object) - current location. Is None if this is a room
      home (Object) - safety start-location
-     sessions (list of Sessions, read-only) - returns all sessions connected
-                       to this object
      has_account (bool, read-only)- will only return *connected* accounts
      contents (list of Objects, read-only) - returns all objects inside this
                        object (including exits)
@@ -60,16 +54,20 @@ class Object(DefaultObject):
 
     * Handlers available
 
+     aliases - alias-handler: use aliases.add/remove/get() to use.
+     permissions - permission-handler: use permissions.add/remove() to
+                   add/remove new perms.
      locks - lock-handler: use locks.add() to add new lock strings
-     db - attribute-handler: store/retrieve database attributes on this
-                             self.db.myattr=val, val=self.db.myattr
-     ndb - non-persistent attribute handler: same as db but does not create
-                             a database entry when storing data
      scripts - script-handler. Add new scripts to object with scripts.add()
      cmdset - cmdset-handler. Use cmdset.add() to add new cmdsets to object
      nicks - nick-handler. New nicks with nicks.add().
      sessions - sessions-handler. Get Sessions connected to this
                 object with sessions.get()
+     attributes - attribute-handler. Use attributes.add/remove/get.
+     db - attribute-handler: Shortcut for attribute-handler. Store/retrieve
+            database attributes using self.db.myattr=val, val=self.db.myattr
+     ndb - non-persistent attribute handler: same as db but does not create
+            a database entry when storing data
 
     * Helper methods (see src.objects.objects.py for full headers)
 
@@ -160,4 +158,5 @@ class Object(DefaultObject):
                                  object speaks
 
      """
+
     pass
diff --git a/evennia/game_template/typeclasses/rooms.py b/evennia/game_template/typeclasses/rooms.py
index e71de91f1b4..a60b1738b21 100644
--- a/evennia/game_template/typeclasses/rooms.py
+++ b/evennia/game_template/typeclasses/rooms.py
@@ -18,4 +18,5 @@ class Room(DefaultRoom):
     See examples/object.py for a list of
     properties and methods available on all Objects.
     """
+
     pass
diff --git a/evennia/game_template/typeclasses/scripts.py b/evennia/game_template/typeclasses/scripts.py
index 5814f4795aa..b36db5c2e47 100644
--- a/evennia/game_template/typeclasses/scripts.py
+++ b/evennia/game_template/typeclasses/scripts.py
@@ -88,4 +88,5 @@ class is first created.
       at_server_shutdown() - called at a full server shutdown.
 
     """
+
     pass
diff --git a/evennia/game_template/world/prototypes.py b/evennia/game_template/world/prototypes.py
index 78a3523c26b..b64dd1b1352 100644
--- a/evennia/game_template/world/prototypes.py
+++ b/evennia/game_template/world/prototypes.py
@@ -36,7 +36,7 @@
 
 """
 
-#from random import randint
+# from random import randint
 #
 # GOBLIN = {
 # "key": "goblin grunt",
@@ -56,7 +56,7 @@
 # "prototype_parent": "GOBLIN",
 # "key": "goblin archer",
 # "attacks": ["short bow"]
-#}
+# }
 #
 # This is an example of a prototype without a prototype
 # (nor key) of its own, so it should normally only be
@@ -65,9 +65,9 @@
 # ARCHWIZARD_MIXIN = {
 # "attacks": ["archwizard staff"],
 # "spells": ["greater fire ball", "greater lighting"]
-#}
+# }
 #
 # GOBLIN_ARCHWIZARD = {
 # "key": "goblin archwizard",
 # "prototype_parent" : ("GOBLIN_WIZARD", "ARCHWIZARD_MIXIN")
-#}
+# }
diff --git a/evennia/help/admin.py b/evennia/help/admin.py
index 9e31fc3656c..709dfae2a66 100644
--- a/evennia/help/admin.py
+++ b/evennia/help/admin.py
@@ -1,8 +1,6 @@
 """
 This defines how to edit help entries in Admin.
 """
-from builtins import object
-
 from django import forms
 from django.contrib import admin
 from evennia.help.models import HelpEntry
@@ -16,32 +14,43 @@ class HelpTagInline(TagInline):
 
 class HelpEntryForm(forms.ModelForm):
     "Defines how to display the help entry"
+
     class Meta(object):
         model = HelpEntry
-        fields = '__all__'
+        fields = "__all__"
 
-    db_help_category = forms.CharField(label="Help category", initial='General',
-                                       help_text="organizes help entries in lists")
-    db_lock_storage = forms.CharField(label="Locks", initial='view:all()', required=False,
-                                      widget=forms.TextInput(attrs={'size': '40'}),)
+    db_help_category = forms.CharField(
+        label="Help category", initial="General", help_text="organizes help entries in lists"
+    )
+    db_lock_storage = forms.CharField(
+        label="Locks",
+        initial="view:all()",
+        required=False,
+        widget=forms.TextInput(attrs={"size": "40"}),
+    )
 
 
 class HelpEntryAdmin(admin.ModelAdmin):
     "Sets up the admin manaager for help entries"
     inlines = [HelpTagInline]
-    list_display = ('id', 'db_key', 'db_help_category', 'db_lock_storage')
-    list_display_links = ('id', 'db_key')
-    search_fields = ['^db_key', 'db_entrytext']
-    ordering = ['db_help_category', 'db_key']
+    list_display = ("id", "db_key", "db_help_category", "db_lock_storage")
+    list_display_links = ("id", "db_key")
+    search_fields = ["^db_key", "db_entrytext"]
+    ordering = ["db_help_category", "db_key"]
     save_as = True
     save_on_top = True
     list_select_related = True
 
     form = HelpEntryForm
     fieldsets = (
-        (None, {'fields': (('db_key', 'db_help_category'),
-                           'db_entrytext', 'db_lock_storage'),
-                'description': "Sets a Help entry. Set lock to <i>view:all()</I> unless you want to restrict it."}),)
+        (
+            None,
+            {
+                "fields": (("db_key", "db_help_category"), "db_entrytext", "db_lock_storage"),
+                "description": "Sets a Help entry. Set lock to <i>view:all()</I> unless you want to restrict it.",
+            },
+        ),
+    )
 
 
 admin.site.register(HelpEntry, HelpEntryAdmin)
diff --git a/evennia/help/manager.py b/evennia/help/manager.py
index 1acb01be0f2..3459efe951b 100644
--- a/evennia/help/manager.py
+++ b/evennia/help/manager.py
@@ -4,6 +4,7 @@
 from django.db import models
 from evennia.utils import logger, utils
 from evennia.typeclasses.managers import TypedObjectManager
+
 __all__ = ("HelpEntryManager",)
 
 
@@ -144,7 +145,6 @@ def search_help(self, ostring, help_category=None):
         """
         ostring = ostring.strip().lower()
         if help_category:
-            return self.filter(db_key__iexact=ostring,
-                               db_help_category__iexact=help_category)
+            return self.filter(db_key__iexact=ostring, db_help_category__iexact=help_category)
         else:
             return self.filter(db_key__iexact=ostring)
diff --git a/evennia/help/migrations/0001_initial.py b/evennia/help/migrations/0001_initial.py
index ba4811a6a7f..44637ac5d6d 100644
--- a/evennia/help/migrations/0001_initial.py
+++ b/evennia/help/migrations/0001_initial.py
@@ -6,26 +6,61 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0001_initial'),
-    ]
+    dependencies = [("typeclasses", "0001_initial")]
 
     operations = [
         migrations.CreateModel(
-            name='HelpEntry',
+            name="HelpEntry",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(help_text='key to search for', unique=True, max_length=255, verbose_name='help key')),
-                ('db_help_category', models.CharField(default='General', help_text='organizes help entries in lists', max_length=255, verbose_name='help category')),
-                ('db_entrytext', models.TextField(help_text='the main body of help text', verbose_name='help entry', blank=True)),
-                ('db_lock_storage', models.TextField(help_text='normally view:all().', verbose_name='locks', blank=True)),
-                ('db_staff_only', models.BooleanField(default=False)),
-                ('db_tags', models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    "db_key",
+                    models.CharField(
+                        help_text="key to search for",
+                        unique=True,
+                        max_length=255,
+                        verbose_name="help key",
+                    ),
+                ),
+                (
+                    "db_help_category",
+                    models.CharField(
+                        default="General",
+                        help_text="organizes help entries in lists",
+                        max_length=255,
+                        verbose_name="help category",
+                    ),
+                ),
+                (
+                    "db_entrytext",
+                    models.TextField(
+                        help_text="the main body of help text",
+                        verbose_name="help entry",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="normally view:all().", verbose_name="locks", blank=True
+                    ),
+                ),
+                ("db_staff_only", models.BooleanField(default=False)),
+                (
+                    "db_tags",
+                    models.ManyToManyField(
+                        help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                        to="typeclasses.Tag",
+                        null=True,
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Help Entry',
-                'verbose_name_plural': 'Help Entries',
-            },
+            options={"verbose_name": "Help Entry", "verbose_name_plural": "Help Entries"},
             bases=(models.Model,),
-        ),
+        )
     ]
diff --git a/evennia/help/migrations/0002_auto_20170606_1731.py b/evennia/help/migrations/0002_auto_20170606_1731.py
index 82cdc7788ac..9c4366dba1d 100644
--- a/evennia/help/migrations/0002_auto_20170606_1731.py
+++ b/evennia/help/migrations/0002_auto_20170606_1731.py
@@ -7,14 +7,16 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('help', '0001_initial'),
-    ]
+    dependencies = [("help", "0001_initial")]
 
     operations = [
         migrations.AlterField(
-            model_name='helpentry',
-            name='db_tags',
-            field=models.ManyToManyField(blank=True, help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
-        ),
+            model_name="helpentry",
+            name="db_tags",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
+        )
     ]
diff --git a/evennia/help/migrations/0003_auto_20190128_1820.py b/evennia/help/migrations/0003_auto_20190128_1820.py
index 659ec951cb4..e533e138371 100644
--- a/evennia/help/migrations/0003_auto_20190128_1820.py
+++ b/evennia/help/migrations/0003_auto_20190128_1820.py
@@ -1,40 +1,51 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 18:20
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('help', '0002_auto_20170606_1731'),
-    ]
+    dependencies = [("help", "0002_auto_20170606_1731")]
 
     operations = [
         migrations.AlterField(
-            model_name='helpentry',
-            name='db_entrytext',
-            field=models.TextField(blank=True, help_text='the main body of help text', verbose_name='help entry'),
+            model_name="helpentry",
+            name="db_entrytext",
+            field=models.TextField(
+                blank=True, help_text="the main body of help text", verbose_name="help entry"
+            ),
         ),
         migrations.AlterField(
-            model_name='helpentry',
-            name='db_help_category',
-            field=models.CharField(default='General', help_text='organizes help entries in lists', max_length=255, verbose_name='help category'),
+            model_name="helpentry",
+            name="db_help_category",
+            field=models.CharField(
+                default="General",
+                help_text="organizes help entries in lists",
+                max_length=255,
+                verbose_name="help category",
+            ),
         ),
         migrations.AlterField(
-            model_name='helpentry',
-            name='db_key',
-            field=models.CharField(help_text='key to search for', max_length=255, unique=True, verbose_name='help key'),
+            model_name="helpentry",
+            name="db_key",
+            field=models.CharField(
+                help_text="key to search for", max_length=255, unique=True, verbose_name="help key"
+            ),
         ),
         migrations.AlterField(
-            model_name='helpentry',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text='normally view:all().', verbose_name='locks'),
+            model_name="helpentry",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True, help_text="normally view:all().", verbose_name="locks"
+            ),
         ),
         migrations.AlterField(
-            model_name='helpentry',
-            name='db_tags',
-            field=models.ManyToManyField(blank=True, help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="helpentry",
+            name="db_tags",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
     ]
diff --git a/evennia/help/models.py b/evennia/help/models.py
index 2d11c02bb34..f151ce2b6ae 100644
--- a/evennia/help/models.py
+++ b/evennia/help/models.py
@@ -9,8 +9,6 @@
 game world, policy info, rules and similar.
 
 """
-from builtins import object
-
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.urls import reverse
@@ -21,14 +19,16 @@
 from evennia.typeclasses.models import Tag, TagHandler, AliasHandler
 from evennia.locks.lockhandler import LockHandler
 from evennia.utils.utils import lazy_property
+
 __all__ = ("HelpEntry",)
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # HelpEntry
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class HelpEntry(SharedMemoryModel):
     """
@@ -53,17 +53,28 @@ class HelpEntry(SharedMemoryModel):
     # named same as the field, but withtout the db_* prefix.
 
     # title of the help entry
-    db_key = models.CharField('help key', max_length=255, unique=True, help_text='key to search for')
+    db_key = models.CharField(
+        "help key", max_length=255, unique=True, help_text="key to search for"
+    )
     # help category
-    db_help_category = models.CharField("help category", max_length=255, default="General",
-                                        help_text='organizes help entries in lists')
+    db_help_category = models.CharField(
+        "help category",
+        max_length=255,
+        default="General",
+        help_text="organizes help entries in lists",
+    )
     # the actual help entry text, in any formatting.
-    db_entrytext = models.TextField('help entry', blank=True, help_text='the main body of help text')
+    db_entrytext = models.TextField(
+        "help entry", blank=True, help_text="the main body of help text"
+    )
     # lock string storage
-    db_lock_storage = models.TextField('locks', blank=True, help_text='normally view:all().')
+    db_lock_storage = models.TextField("locks", blank=True, help_text="normally view:all().")
     # tags are primarily used for permissions
-    db_tags = models.ManyToManyField(Tag, blank=True,
-                                     help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.')
+    db_tags = models.ManyToManyField(
+        Tag,
+        blank=True,
+        help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+    )
     # (deprecated, only here to allow MUX helpfile load (don't use otherwise)).
     # TODO: remove this when not needed anymore.
     db_staff_only = models.BooleanField(default=False)
@@ -101,9 +112,9 @@ def __str__(self):
         return self.key
 
     def __repr__(self):
-        return '%s' % self.key
+        return "%s" % self.key
 
-    def access(self, accessing_obj, access_type='read', default=False):
+    def access(self, accessing_obj, access_type="read", default=False):
         """
         Determines if another object has permission to access.
         accessing_obj - object trying to access this one
@@ -127,8 +138,9 @@ def web_get_admin_url(self):
 
         """
         content_type = ContentType.objects.get_for_model(self.__class__)
-        return reverse("admin:%s_%s_change" % (content_type.app_label,
-                                               content_type.model), args=(self.id,))
+        return reverse(
+            "admin:%s_%s_change" % (content_type.app_label, content_type.model), args=(self.id,)
+        )
 
     @classmethod
     def web_get_create_url(cls):
@@ -157,9 +169,9 @@ def web_get_create_url(cls):
 
         """
         try:
-            return reverse('%s-create' % slugify(cls._meta.verbose_name))
+            return reverse("%s-create" % slugify(cls._meta.verbose_name))
         except:
-            return '#'
+            return "#"
 
     def web_get_detail_url(self):
         """
@@ -188,14 +200,13 @@ def web_get_detail_url(self):
 
         """
         try:
-            return reverse('%s-detail' % slugify(self._meta.verbose_name),
-               kwargs={
-                   'category': slugify(self.db_help_category),
-                   'topic': slugify(self.db_key)})
+            return reverse(
+                "%s-detail" % slugify(self._meta.verbose_name),
+                kwargs={"category": slugify(self.db_help_category), "topic": slugify(self.db_key)},
+            )
         except Exception as e:
             print(e)
-            return '#'
-
+            return "#"
 
     def web_get_update_url(self):
         """
@@ -224,12 +235,12 @@ def web_get_update_url(self):
 
         """
         try:
-            return reverse('%s-update' % slugify(self._meta.verbose_name),
-               kwargs={
-                   'category': slugify(self.db_help_category),
-                   'topic': slugify(self.db_key)})
+            return reverse(
+                "%s-update" % slugify(self._meta.verbose_name),
+                kwargs={"category": slugify(self.db_help_category), "topic": slugify(self.db_key)},
+            )
         except:
-            return '#'
+            return "#"
 
     def web_get_delete_url(self):
         """
@@ -257,12 +268,12 @@ def web_get_delete_url(self):
 
         """
         try:
-            return reverse('%s-delete' % slugify(self._meta.verbose_name),
-               kwargs={
-                   'category': slugify(self.db_help_category),
-                   'topic': slugify(self.db_key)})
+            return reverse(
+                "%s-delete" % slugify(self._meta.verbose_name),
+                kwargs={"category": slugify(self.db_help_category), "topic": slugify(self.db_key)},
+            )
         except:
-            return '#'
+            return "#"
 
     # Used by Django Sites/Admin
     get_absolute_url = web_get_detail_url
diff --git a/evennia/locale/es/LC_MESSAGES/django.mo b/evennia/locale/es/LC_MESSAGES/django.mo
new file mode 100644
index 00000000000..c63d414c7f7
Binary files /dev/null and b/evennia/locale/es/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/es/LC_MESSAGES/django.po b/evennia/locale/es/LC_MESSAGES/django.po
new file mode 100644
index 00000000000..e78cb416a9b
--- /dev/null
+++ b/evennia/locale/es/LC_MESSAGES/django.po
@@ -0,0 +1,348 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-08-16 15:54-0300\n"
+"PO-Revision-Date: 2019-08-16 16:14-0300\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"X-Generator: Poedit 2.2.1\n"
+
+#: evennia/accounts/accounts.py:784
+msgid "Account being deleted."
+msgstr "Cuenta siendo eliminada."
+
+#: evennia/commands/cmdhandler.py:680
+msgid "There were multiple matches."
+msgstr "Hubo varias coincidencias."
+
+#: evennia/commands/cmdhandler.py:703
+#, python-format
+msgid "Command '%s' is not available."
+msgstr "El comando '%s' no está disponible."
+
+#: evennia/commands/cmdhandler.py:708
+#, python-format
+msgid " Maybe you meant %s?"
+msgstr " ¿Quizás quisiste decir %s?"
+
+#: evennia/commands/cmdhandler.py:708
+msgid "or"
+msgstr "o"
+
+#: evennia/commands/cmdhandler.py:710
+msgid " Type \"help\" for help."
+msgstr " Escribe \"ayuda\" para obtener ayuda."
+
+#: evennia/commands/cmdsethandler.py:89
+#, python-brace-format
+msgid ""
+"{traceback}\n"
+"Error loading cmdset '{path}'\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"{traceback}\n"
+"Error cargando cmdset '{path}'\n"
+"(Traceback fue guardado en {timestamp})"
+
+#: evennia/commands/cmdsethandler.py:94
+#, python-brace-format
+msgid ""
+"Error loading cmdset: No cmdset class '{classname}' in '{path}'.\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"Error cargando cmdset: No existe cmdset con la clase '{classname}' en "
+"'{path}'.\n"
+"(Traceback guardado en {timestamp})"
+
+#: evennia/commands/cmdsethandler.py:98
+#, python-brace-format
+msgid ""
+"{traceback}\n"
+"SyntaxError encountered when loading cmdset '{path}'.\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"{traceback}\n"
+"SyntaxError encontrado al cargar cmdset '{path}'.\n"
+"(Traceback guardado en {timestamp})"
+
+#: evennia/commands/cmdsethandler.py:103
+#, python-brace-format
+msgid ""
+"{traceback}\n"
+"Compile/Run error when loading cmdset '{path}'.\",\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"{traceback}\n"
+"Error al compilar/ejecutar cmdset '{path}'.\",\n"
+"(Traceback guardado en {timestamp})"
+
+#: evennia/commands/cmdsethandler.py:108
+#, python-brace-format
+msgid ""
+"\n"
+"Error encountered for cmdset at path '{path}'.\n"
+"Replacing with fallback '{fallback_path}'.\n"
+msgstr ""
+"\n"
+"Error encontrado para el cmdset en la dirección  '{path}'.\n"
+"Reemplazando con '{fallback_path}'.\n"
+
+#: evennia/commands/cmdsethandler.py:114
+#, python-brace-format
+msgid "Fallback path '{fallback_path}' failed to generate a cmdset."
+msgstr "El fallback '{fallback_path}' falló al generar un cmdset."
+
+#: evennia/commands/cmdsethandler.py:182 evennia/commands/cmdsethandler.py:192
+#, python-format
+msgid ""
+"\n"
+"(Unsuccessfully tried '%s')."
+msgstr ""
+"\n"
+"(Intentado sin sucesso '%s')."
+
+#: evennia/commands/cmdsethandler.py:311
+#, python-brace-format
+msgid "custom {mergetype} on cmdset '{cmdset}'"
+msgstr "{mergetype} personalizado en cmdset '{cmdset}'"
+
+#: evennia/commands/cmdsethandler.py:314
+#, python-brace-format
+msgid " <Merged {mergelist} {mergetype}, prio {prio}>: {current}"
+msgstr " <Uniendo {mergelist} {mergetype}, prio {prio}>: {current}"
+
+#: evennia/commands/cmdsethandler.py:322
+#, python-brace-format
+msgid ""
+" <{key} ({mergetype}, prio {prio}, {permstring})>:\n"
+" {keylist}"
+msgstr ""
+" <{key} ({mergetype}, prio {prio}, {permstring})>:\n"
+" {keylist}"
+
+#: evennia/commands/cmdsethandler.py:426
+msgid "Only CmdSets can be added to the cmdsethandler!"
+msgstr "¡Sólo CmdSets pueden ser añadidos a cmdsethandler!"
+
+#: evennia/comms/channelhandler.py:100
+msgid "Say what?"
+msgstr "¿Qué dijiste?"
+
+#: evennia/comms/channelhandler.py:105
+#, python-format
+msgid "Channel '%s' not found."
+msgstr "Canal '%s' no encontrado."
+
+#: evennia/comms/channelhandler.py:108
+#, python-format
+msgid "You are not connected to channel '%s'."
+msgstr "No estás conectado al canal '%s'."
+
+#: evennia/comms/channelhandler.py:112
+#, python-format
+msgid "You are not permitted to send to channel '%s'."
+msgstr "No tienes permitido enviar al canal '%s'."
+
+#: evennia/comms/channelhandler.py:155
+msgid " (channel)"
+msgstr " (canal)"
+
+#: evennia/locks/lockhandler.py:236
+#, python-format
+msgid "Lock: lock-function '%s' is not available."
+msgstr "Bloqueo: función de bloqueo '%s' no está disponible."
+
+#: evennia/locks/lockhandler.py:249
+#, python-format
+msgid "Lock: definition '%s' has syntax errors."
+msgstr "Bloqueo: la definición '%s' tiene errores de sintaxis."
+
+#: evennia/locks/lockhandler.py:253
+#, python-format
+msgid ""
+"LockHandler on %(obj)s: access type '%(access_type)s' changed from "
+"'%(source)s' to '%(goal)s' "
+msgstr ""
+"LockHandler en %(obj)s: tipo de acceso '%(access_type)s' cambiado "
+"de'%(source)s' to '%(goal)s' "
+
+#: evennia/locks/lockhandler.py:320
+#, python-brace-format
+msgid "Lock: '{lockdef}' contains no colon (:)."
+msgstr "Bloqueo: '{lockdef}' no tiene dos puntos (:)."
+
+#: evennia/locks/lockhandler.py:328
+#, python-brace-format
+msgid "Lock: '{lockdef}' has no access_type (left-side of colon is empty)."
+msgstr ""
+"Bloqueo: '{lockdef}' no tiene access_type (el lado de la izquierda de los "
+"dos puntos está vacío)."
+
+#: evennia/locks/lockhandler.py:336
+#, python-brace-format
+msgid "Lock: '{lockdef}' has mismatched parentheses."
+msgstr "Bloqueo: '{lockdef}' tiene paréntesis que no se relacionan."
+
+#: evennia/locks/lockhandler.py:343
+#, python-brace-format
+msgid "Lock: '{lockdef}' has no valid lock functions."
+msgstr "Bloqueo: '{lockdef}' no tiene funciones de bloqueo válidas."
+
+#: evennia/objects/objects.py:744
+#, python-format
+msgid "Couldn't perform move ('%s'). Contact an admin."
+msgstr "No se puede realizar el movimiento ('%s'). Contacta a un admin."
+
+#: evennia/objects/objects.py:754
+msgid "The destination doesn't exist."
+msgstr "El destino no existe."
+
+#: evennia/objects/objects.py:845
+#, python-format
+msgid "Could not find default home '(#%d)'."
+msgstr "No se puede encontrar el hogar por defecto '(#%d)'."
+
+#: evennia/objects/objects.py:861
+msgid "Something went wrong! You are dumped into nowhere. Contact an admin."
+msgstr "¡Algo salió mal! Estás en la nada. Contacta a un admin."
+
+#: evennia/objects/objects.py:1003
+#, python-format
+msgid "Your character %s has been destroyed."
+msgstr "Tu personaje %s ha sido destruído."
+
+#: evennia/scripts/scripthandler.py:53
+#, python-format
+msgid ""
+"\n"
+" '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repeats): %(desc)s"
+msgstr ""
+"\n"
+" '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repite): %(desc)s"
+
+#: evennia/scripts/scripts.py:198
+#, python-format
+msgid ""
+"Script %(key)s(#%(dbid)s) of type '%(cname)s': at_repeat() error '%(err)s'."
+msgstr ""
+"El script %(key)s(#%(dbid)s) del tipo '%(cname)s': at_repeat() dio error "
+"'%(err)s'."
+
+#: evennia/server/initial_setup.py:28
+msgid ""
+"\n"
+"Welcome to your new |wEvennia|n-based game! Visit http://www.evennia.com if "
+"you need\n"
+"help, want to contribute, report issues or just join the community.\n"
+"As Account #1 you can create a demo/tutorial area with |w@batchcommand "
+"tutorial_world.build|n.\n"
+"    "
+msgstr ""
+"\n"
+"Bienvenid@ a tu nuevo |wJuego basado en Evennia! Visita http://www.evennia."
+"com si necesitas\n"
+"ayuda, quieres contribuir, reportar un error o simplemente unirte a la "
+"comunidad.\n"
+"Como cuenta #1 puedes crear un área de demostración/tutorial con |"
+"w@batchcommand tutorial_world.build|n.\n"
+"    "
+
+#: evennia/server/initial_setup.py:92
+msgid "This is User #1."
+msgstr "Este es el Usuario #1."
+
+#: evennia/server/initial_setup.py:105
+msgid "Limbo"
+msgstr "Limbo"
+
+#: evennia/server/server.py:141
+msgid "idle timeout exceeded"
+msgstr "tiempo sin actividad excedido"
+
+#: evennia/server/sessionhandler.py:392
+msgid " ... Server restarted."
+msgstr " ... El servidor se reinició."
+
+#: evennia/server/sessionhandler.py:620
+msgid "Logged in from elsewhere. Disconnecting."
+msgstr "Sesión iniciada desde otro lugar. Desconectando."
+
+#: evennia/server/sessionhandler.py:648
+msgid "Idle timeout exceeded, disconnecting."
+msgstr "Tiempo sin actividad excedido, desconectando."
+
+#: evennia/server/validators.py:29
+msgid "Sorry, that username is reserved."
+msgstr "Perdón, ese nombre de usuario ya está reservado."
+
+#: evennia/server/validators.py:37
+msgid "Sorry, that username is already taken."
+msgstr "Perdón, ese nombre de usuario ya está siendo usado."
+
+#: evennia/server/validators.py:89
+#, python-format
+msgid ""
+"%s From a terminal client, you can also use a phrase of multiple words if "
+"you enclose the password in double quotes."
+msgstr ""
+"%s Desde un cliente de terminal, puedes usar una frase con múltiples "
+"palabras si encierras la contraseña en comillas dobles."
+
+#: evennia/utils/evmenu.py:192
+#, python-brace-format
+msgid ""
+"Menu node '{nodename}' is either not implemented or caused an error. Make "
+"another choice."
+msgstr ""
+"Nodo del menú '{nodename}' no está implementado o causó un error. "
+"Selecciona otra opción."
+
+#: evennia/utils/evmenu.py:194
+#, python-brace-format
+msgid "Error in menu node '{nodename}'."
+msgstr "Error en el nodo del menú '{nodename}'."
+
+#: evennia/utils/evmenu.py:195
+msgid "No description."
+msgstr "Sin descripción."
+
+#: evennia/utils/evmenu.py:196
+msgid "Commands: <menu option>, help, quit"
+msgstr "Comandos: <menu option>, help, quit"
+
+#: evennia/utils/evmenu.py:197
+msgid "Commands: <menu option>, help"
+msgstr "Comandos: <menu option>, help"
+
+#: evennia/utils/evmenu.py:198
+msgid "Commands: help, quit"
+msgstr "Comandos: help, quit"
+
+#: evennia/utils/evmenu.py:199
+msgid "Commands: help"
+msgstr "Comandos: help"
+
+#: evennia/utils/evmenu.py:200
+msgid "Choose an option or try 'help'."
+msgstr "Elige una opción o intenta 'help'."
+
+#: evennia/utils/utils.py:1877
+#, python-format
+msgid "Could not find '%s'."
+msgstr "No se pudo encontrar '%s'."
+
+#: evennia/utils/utils.py:1884
+#, python-format
+msgid "More than one match for '%s' (please narrow target):\n"
+msgstr "Más de una coincidencia para '%s' (por favor sé más específico):\n"
diff --git a/evennia/locale/fr/LC_MESSAGES/django.mo b/evennia/locale/fr/LC_MESSAGES/django.mo
index b16ad24fa01..6ed877e2c7f 100644
Binary files a/evennia/locale/fr/LC_MESSAGES/django.mo and b/evennia/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/it/LC_MESSAGES/django.mo b/evennia/locale/it/LC_MESSAGES/django.mo
index 0a23b91f99a..4d111b20c8b 100644
Binary files a/evennia/locale/it/LC_MESSAGES/django.mo and b/evennia/locale/it/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/ko/LC_MESSAGES/django.mo b/evennia/locale/ko/LC_MESSAGES/django.mo
new file mode 100644
index 00000000000..eabd6108050
Binary files /dev/null and b/evennia/locale/ko/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/ko/LC_MESSAGES/django.po b/evennia/locale/ko/LC_MESSAGES/django.po
new file mode 100644
index 00000000000..dbef340a041
--- /dev/null
+++ b/evennia/locale/ko/LC_MESSAGES/django.po
@@ -0,0 +1,333 @@
+##The Simplified Korean translation for the Evennia server.
+##Copyright (C) 2019 Ethan Kwon
+##This file is distributed under the same license as the Evennia package.
+##FIRST AUTHOR: Ethan Kwon , 2019-
+##
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-09-21 05:00+0900\n"
+"PO-Revision-Date: 2019-09-21 05:00+0900\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: korean\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: .\accounts\accounts.py:784
+msgid "Account being deleted."
+msgstr "계정이 삭제되었습니다."
+
+#: .\commands\cmdhandler.py:680
+msgid "There were multiple matches."
+msgstr "여러 개의 일치 항목을 찾았습니다."
+
+#: .\commands\cmdhandler.py:703
+#, python-format
+msgid "Command '%s' is not available."
+msgstr "'%s' 명령은 사용할 수 없습니다."
+
+#: .\commands\cmdhandler.py:708
+#, python-format
+msgid " Maybe you meant %s?"
+msgstr "'%s'이 맞습니까?"
+
+#: .\commands\cmdhandler.py:708
+msgid "or"
+msgstr "또는"
+
+#: .\commands\cmdhandler.py:710
+msgid " Type \"help\" for help."
+msgstr " 도음말은 \"help\"를 입력하세요."
+
+#: .\commands\cmdsethandler.py:89
+#, python-brace-format
+msgid ""
+"{traceback}\n"
+"Error loading cmdset '{path}'\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"{traceback}\n"
+"Error loading cmdset '{path}'\n"
+"Traceback was logged {timestamp})"
+
+#: .\commands\cmdsethandler.py:94
+#, python-brace-format
+msgid ""
+"Error loading cmdset: No cmdset class '{classname}' in '{path}'.\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"Error loading cmdset: No cmdset class '{classname}' in '{path}'.\n"
+"(Traceback was logged {timestamp})"
+
+#: .\commands\cmdsethandler.py:98
+#, python-brace-format
+msgid ""
+"{traceback}\n"
+"SyntaxError encountered when loading cmdset '{path}'.\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"{traceback}\n"
+"SyntaxError encountered when loading cmdset '{path}'.\n"
+"(Traceback was logged {timestamp})"
+
+#: .\commands\cmdsethandler.py:103
+#, python-brace-format
+msgid ""
+"{traceback}\n"
+"Compile/Run error when loading cmdset '{path}'.\",\n"
+"(Traceback was logged {timestamp})"
+msgstr ""
+"{traceback}\n"
+"Compile/Run error when loading cmdset '{path}'.\",\n"
+"(Traceback was logged {timestamp})"
+
+#: .\commands\cmdsethandler.py:108
+#, python-brace-format
+msgid ""
+"\n"
+"Error encountered for cmdset at path '{path}'.\n"
+"Replacing with fallback '{fallback_path}'.\n"
+msgstr ""
+"\n"
+"Error encountered for cmdset at path '{path}'.\n"
+"Replacing with fallback '{fallback_path}'.\n"
+
+#: .\commands\cmdsethandler.py:114
+#, python-brace-format
+msgid "Fallback path '{fallback_path}' failed to generate a cmdset."
+msgstr "Fallback path '{fallback_path}' failed to generate a cmdset."
+
+#: .\commands\cmdsethandler.py:182 .\commands\cmdsethandler.py:192
+#, python-format
+msgid ""
+"\n"
+"(Unsuccessfully tried '%s')."
+msgstr ""
+"\n"
+"(Unsuccessfully tried '%s')."
+
+#: .\commands\cmdsethandler.py:311
+#, python-brace-format
+msgid "custom {mergetype} on cmdset '{cmdset}'"
+msgstr "custom {mergetype} on cmdset '{cmdset}'"
+
+#: .\commands\cmdsethandler.py:314
+#, python-brace-format
+msgid " <Merged {mergelist} {mergetype}, prio {prio}>: {current}"
+msgstr " <Merged {mergelist} {mergetype}, prio {prio}>: {current}"
+
+#: .\commands\cmdsethandler.py:322
+#, python-brace-format
+msgid ""
+" <{key} ({mergetype}, prio {prio}, {permstring})>:\n"
+" {keylist}"
+msgstr ""
+" <{key} ({mergetype}, prio {prio}, {permstring})>:\n"
+" {keylist}"
+
+#: .\commands\cmdsethandler.py:426
+msgid "Only CmdSets can be added to the cmdsethandler!"
+msgstr "Only CmdSets can be added to the cmdsethandler!"
+
+#: .\comms\channelhandler.py:100
+msgid "Say what?"
+msgstr "뭐라구요？"
+
+#: .\comms\channelhandler.py:105
+#, python-format
+msgid "Channel '%s' not found."
+msgstr "'%s' 채널을 찾을 수 없습니다."
+
+#: .\comms\channelhandler.py:108
+#, python-format
+msgid "You are not connected to channel '%s'."
+msgstr "'%s' 채널에 접속하고 있지 않습니다."
+
+#: .\comms\channelhandler.py:112
+#, python-format
+msgid "You are not permitted to send to channel '%s'."
+msgstr "'%s' 채널에 보낼 수 없습니다."
+
+#: .\comms\channelhandler.py:155
+msgid " (channel)"
+msgstr " (채널)"
+
+#: .\locks\lockhandler.py:236
+#, python-format
+msgid "Lock: lock-function '%s' is not available."
+msgstr "Lock: lock-function '%s' is not available."
+
+#: .\locks\lockhandler.py:249
+#, python-format
+msgid "Lock: definition '%s' has syntax errors."
+msgstr "Lock: definition '%s' has syntax errors."
+
+#: .\locks\lockhandler.py:253
+#, python-format
+msgid ""
+"LockHandler on %(obj)s: access type '%(access_type)s' changed from "
+"'%(source)s' to '%(goal)s' "
+msgstr ""
+"LockHandler on %(obj)s: access type '%(access_type)s' changed from "
+"'%(source)s' to '%(goal)s' "
+
+#: .\locks\lockhandler.py:320
+#, python-brace-format
+msgid "Lock: '{lockdef}' contains no colon (:)."
+msgstr "Lock: '{lockdef}' contains no colon (:)."
+
+#: .\locks\lockhandler.py:328
+#, python-brace-format
+msgid "Lock: '{lockdef}' has no access_type (left-side of colon is empty)."
+msgstr "Lock: '{lockdef}' has no access_type (left-side of colon is empty)."
+
+#: .\locks\lockhandler.py:336
+#, python-brace-format
+msgid "Lock: '{lockdef}' has mismatched parentheses."
+msgstr "Lock: '{lockdef}' has mismatched parentheses."
+
+#: .\locks\lockhandler.py:343
+#, python-brace-format
+msgid "Lock: '{lockdef}' has no valid lock functions."
+msgstr "Lock: '{lockdef}' has no valid lock functions."
+
+#: .\objects\objects.py:745
+#, python-format
+msgid "Couldn't perform move ('%s'). Contact an admin."
+msgstr "Couldn't perform move ('%s'). 운영자에게 문의하세요."
+
+#: .\objects\objects.py:755
+msgid "The destination doesn't exist."
+msgstr "The destination doesn't exist."
+
+#: .\objects\objects.py:846
+#, python-format
+msgid "Could not find default home '(#%d)'."
+msgstr "Could not find default home '(#%d)'."
+
+#: .\objects\objects.py:862
+msgid "Something went wrong! You are dumped into nowhere. Contact an admin."
+msgstr "Something went wrong! You are dumped into nowhere. 운영자에게 문의하세요."
+
+#: .\objects\objects.py:1004
+#, python-format
+msgid "Your character %s has been destroyed."
+msgstr "%s 캐릭터가 삭제되었습니다."
+
+#: .\scripts\scripthandler.py:53
+#, python-format
+msgid ""
+"\n"
+" '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repeats): %(desc)s"
+msgstr ""
+"\n"
+" '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repeats): %(desc)s"
+
+#: .\scripts\scripts.py:199
+#, python-format
+msgid ""
+"Script %(key)s(#%(dbid)s) of type '%(cname)s': at_repeat() error '%(err)s'."
+msgstr ""
+"Script %(key)s(#%(dbid)s) of type '%(cname)s': at_repeat() error '%(err)s'."
+
+#: .\server\initial_setup.py:28
+msgid ""
+"\n"
+"Welcome to your new |wEvennia|n-based game! Visit http://www.evennia.com if "
+"you need\n"
+"help, want to contribute, report issues or just join the community.\n"
+"As Account #1 you can create a demo/tutorial area with |w@batchcommand "
+"tutorial_world.build|n.\n"
+"    "
+msgstr ""
+"\n"
+"Welcome to your new |wEvennia|n-based game! Visit http://www.evennia.com if "
+"you need\n"
+"help, want to contribute, report issues or just join the community.\n"
+"#1 유저(운영자)는 |w@batchcommand tutorial_world.build|n.명령을 사용하여\n"
+"데모겸 튜터리얼 월드를 생성할 수 있습니다.\n"
+"    "
+
+#: .\server\initial_setup.py:92
+msgid "This is User #1."
+msgstr "This is User #1."
+
+#: .\server\initial_setup.py:105
+msgid "Limbo"
+msgstr "림보"
+
+#: .\server\server.py:139
+msgid "idle timeout exceeded"
+msgstr "연결 시간 초과"
+
+#: .\server\sessionhandler.py:392
+msgid " ... Server restarted."
+msgstr " ... 서버가 재가동되었습니다."
+
+#: .\server\sessionhandler.py:620
+msgid "Logged in from elsewhere. Disconnecting."
+msgstr "어디에선가 로그인했습니다. 접속이 끊어집니다."
+
+#: .\server\sessionhandler.py:648
+msgid "Idle timeout exceeded, disconnecting."
+msgstr "연결 시간이 초과되었습니다. 접속이 끊어집니다."
+
+#: .\server\validators.py:50
+#, python-format
+msgid ""
+"%s From a terminal client, you can also use a phrase of multiple words if "
+"you enclose the password in double quotes."
+msgstr ""
+"%s 터미널 클라이언트에서 암호를 큰 따옴표로 묶으면 여러 단어로 된 암호를 사용할 수 있습니다."
+""
+
+#: .\utils\evmenu.py:192
+#, python-brace-format
+msgid ""
+"Menu node '{nodename}' is either not implemented or caused an error. Make "
+"another choice."
+msgstr ""
+"Menu node '{nodename}'가 구현되지 않았거나 오류가 발생했습니다."
+"다른 선택을 해보세요."
+
+#: .\utils\evmenu.py:194
+#, python-brace-format
+msgid "Error in menu node '{nodename}'."
+msgstr "Menu node '{nodename}'에서 오류가 발생했습니다."
+
+#: .\utils\evmenu.py:195
+msgid "No description."
+msgstr "설명이 없습니다."
+
+#: .\utils\evmenu.py:196
+msgid "Commands: <menu option>, help, quit"
+msgstr "명령: <menu option>, help, quit"
+
+#: .\utils\evmenu.py:197
+msgid "Commands: <menu option>, help"
+msgstr "명령： <menu option>, help"
+
+#: .\utils\evmenu.py:198
+msgid "Commands: help, quit"
+msgstr "명령： help, quit"
+
+#: .\utils\evmenu.py:199
+msgid "Commands: help"
+msgstr "명령： help"
+
+#: .\utils\evmenu.py:200
+msgid "Choose an option or try 'help'."
+msgstr "다른 옵션을 선택하거나 'help'를 확인해보세요."
+
+#: .\utils\utils.py:1882
+#, python-format
+msgid "Could not find '%s'."
+msgstr "'%s'를 찾을 수 없습니다."
+
+#: .\utils\utils.py:1889
+#, python-format
+msgid "More than one match for '%s' (please narrow target):\n"
+msgstr "'%s'와 일치하는 항목을 여러 개 찾았습니다.：\n"
diff --git a/evennia/locale/pl/LC_MESSAGES/django.mo b/evennia/locale/pl/LC_MESSAGES/django.mo
index 021e81ea31f..f6e31091d57 100644
Binary files a/evennia/locale/pl/LC_MESSAGES/django.mo and b/evennia/locale/pl/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/pt/LC_MESSAGES/django.mo b/evennia/locale/pt/LC_MESSAGES/django.mo
index 9477bd2ee35..7dd70380e39 100644
Binary files a/evennia/locale/pt/LC_MESSAGES/django.mo and b/evennia/locale/pt/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/sv/LC_MESSAGES/django.mo b/evennia/locale/sv/LC_MESSAGES/django.mo
index bf139e04213..11f35e564a1 100644
Binary files a/evennia/locale/sv/LC_MESSAGES/django.mo and b/evennia/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/evennia/locale/zh/LC_MESSAGES/django.mo b/evennia/locale/zh/LC_MESSAGES/django.mo
index a0ec7c2c007..d07dd7a5171 100644
Binary files a/evennia/locale/zh/LC_MESSAGES/django.mo and b/evennia/locale/zh/LC_MESSAGES/django.mo differ
diff --git a/evennia/locks/lockfuncs.py b/evennia/locks/lockfuncs.py
index 338a56e52b0..a1f161696bf 100644
--- a/evennia/locks/lockfuncs.py
+++ b/evennia/locks/lockfuncs.py
@@ -95,8 +95,9 @@
 
 _PERMISSION_HIERARCHY = [pe.lower() for pe in settings.PERMISSION_HIERARCHY]
 # also accept different plural forms
-_PERMISSION_HIERARCHY_PLURAL = [pe + 's' if not pe.endswith('s') else pe
-                                for pe in _PERMISSION_HIERARCHY]
+_PERMISSION_HIERARCHY_PLURAL = [
+    pe + "s" if not pe.endswith("s") else pe for pe in _PERMISSION_HIERARCHY
+]
 
 
 def _to_account(accessing_obj):
@@ -109,6 +110,7 @@ def _to_account(accessing_obj):
 
 # lock functions
 
+
 def true(*args, **kwargs):
     "Always returns True."
     return True
@@ -171,8 +173,10 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs):
     gtmode = kwargs.pop("_greater_than", False)
     is_quell = False
 
-    account = (utils.inherits_from(accessing_obj, "evennia.objects.objects.DefaultObject") and
-               accessing_obj.account)
+    account = (
+        utils.inherits_from(accessing_obj, "evennia.objects.objects.DefaultObject")
+        and accessing_obj.account
+    )
     # check object perms (note that accessing_obj could be an Account too)
     perms_account = []
     if account:
@@ -183,7 +187,7 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs):
     hpos_target = None
     if permission in _PERMISSION_HIERARCHY:
         hpos_target = _PERMISSION_HIERARCHY.index(permission)
-    if permission.endswith('s') and permission[:-1] in _PERMISSION_HIERARCHY:
+    if permission.endswith("s") and permission[:-1] in _PERMISSION_HIERARCHY:
         hpos_target = _PERMISSION_HIERARCHY.index(permission[:-1])
     if hpos_target is not None:
         # hieratchy match
@@ -192,16 +196,22 @@ def perm(accessing_obj, accessed_obj, *args, **kwargs):
 
         if account:
             # we have an account puppeting this object. We must check what perms it has
-            perms_account_single = [p[:-1] if p.endswith('s') else p for p in perms_account]
-            hpos_account = [hpos for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
-                            if hperm in perms_account_single]
+            perms_account_single = [p[:-1] if p.endswith("s") else p for p in perms_account]
+            hpos_account = [
+                hpos
+                for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
+                if hperm in perms_account_single
+            ]
             hpos_account = hpos_account and hpos_account[-1] or -1
 
         if not account or is_quell:
             # only get the object-level perms if there is no account or quelling
-            perms_object_single = [p[:-1] if p.endswith('s') else p for p in perms_object]
-            hpos_object = [hpos for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
-                           if hperm in perms_object_single]
+            perms_object_single = [p[:-1] if p.endswith("s") else p for p in perms_object]
+            hpos_object = [
+                hpos
+                for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
+                if hperm in perms_object_single
+            ]
             hpos_object = hpos_object and hpos_object[-1] or -1
 
         if account and is_quell:
@@ -261,6 +271,7 @@ def pperm(accessing_obj, accessed_obj, *args, **kwargs):
     """
     return perm(_to_account(accessing_obj), accessed_obj, *args, **kwargs)
 
+
 def pperm_above(accessing_obj, accessed_obj, *args, **kwargs):
     """
     Only allow Account objects with a permission *higher* in the permission
@@ -284,10 +295,10 @@ def dbref(accessing_obj, accessed_obj, *args, **kwargs):
     if not args:
         return False
     try:
-        dbr = int(args[0].strip().strip('#'))
+        dbr = int(args[0].strip().strip("#"))
     except ValueError:
         return False
-    if hasattr(accessing_obj, 'dbid'):
+    if hasattr(accessing_obj, "dbid"):
         return dbr == accessing_obj.dbid
     return False
 
@@ -310,13 +321,15 @@ def pid(accessing_obj, accessed_obj, *args, **kwargs):
 
 
 # this is more efficient than multiple if ... elif statments
-CF_MAPPING = {'eq': lambda val1, val2: val1 == val2 or str(val1) == str(val2) or float(val1) == float(val2),
-              'gt': lambda val1, val2: float(val1) > float(val2),
-              'lt': lambda val1, val2: float(val1) < float(val2),
-              'ge': lambda val1, val2: float(val1) >= float(val2),
-              'le': lambda val1, val2: float(val1) <= float(val2),
-              'ne': lambda val1, val2: float(val1) != float(val2),
-              'default': lambda val1, val2: False}
+CF_MAPPING = {
+    "eq": lambda val1, val2: val1 == val2 or str(val1) == str(val2) or float(val1) == float(val2),
+    "gt": lambda val1, val2: float(val1) > float(val2),
+    "lt": lambda val1, val2: float(val1) < float(val2),
+    "ge": lambda val1, val2: float(val1) >= float(val2),
+    "le": lambda val1, val2: float(val1) <= float(val2),
+    "ne": lambda val1, val2: float(val1) != float(val2),
+    "default": lambda val1, val2: False,
+}
 
 
 def attr(accessing_obj, accessed_obj, *args, **kwargs):
@@ -348,14 +361,14 @@ def attr(accessing_obj, accessed_obj, *args, **kwargs):
     value = None
     if len(args) > 1:
         value = args[1].strip()
-    compare = 'eq'
+    compare = "eq"
     if kwargs:
-        compare = kwargs.get('compare', 'eq')
+        compare = kwargs.get("compare", "eq")
 
-    def valcompare(val1, val2, typ='eq'):
+    def valcompare(val1, val2, typ="eq"):
         "compare based on type"
         try:
-            return CF_MAPPING.get(typ, CF_MAPPING['default'])(val1, val2)
+            return CF_MAPPING.get(typ, CF_MAPPING["default"])(val1, val2)
         except Exception:
             # this might happen if we try to compare two things that
             # cannot be compared
@@ -375,10 +388,11 @@ def valcompare(val1, val2, typ='eq'):
         # will return Fail on False value etc
         return bool(getattr(accessing_obj, attrname))
     # check attributes, if they exist
-    if (hasattr(accessing_obj, 'attributes') and accessing_obj.attributes.has(attrname)):
+    if hasattr(accessing_obj, "attributes") and accessing_obj.attributes.has(attrname):
         if value:
-            return (hasattr(accessing_obj, 'attributes') and
-                    valcompare(accessing_obj.attributes.get(attrname), value, compare))
+            return hasattr(accessing_obj, "attributes") and valcompare(
+                accessing_obj.attributes.get(attrname), value, compare
+            )
         # fails on False/None values
         return bool(accessing_obj.attributes.get(attrname))
     return False
@@ -455,7 +469,7 @@ def attr_gt(accessing_obj, accessed_obj, *args, **kwargs):
 
     Only true if access_obj's attribute > the value given.
     """
-    return attr(accessing_obj, accessed_obj, *args, **{'compare': 'gt'})
+    return attr(accessing_obj, accessed_obj, *args, **{"compare": "gt"})
 
 
 def attr_ge(accessing_obj, accessed_obj, *args, **kwargs):
@@ -465,7 +479,7 @@ def attr_ge(accessing_obj, accessed_obj, *args, **kwargs):
 
     Only true if access_obj's attribute >= the value given.
     """
-    return attr(accessing_obj, accessed_obj, *args, **{'compare': 'ge'})
+    return attr(accessing_obj, accessed_obj, *args, **{"compare": "ge"})
 
 
 def attr_lt(accessing_obj, accessed_obj, *args, **kwargs):
@@ -475,7 +489,7 @@ def attr_lt(accessing_obj, accessed_obj, *args, **kwargs):
 
     Only true if access_obj's attribute < the value given.
     """
-    return attr(accessing_obj, accessed_obj, *args, **{'compare': 'lt'})
+    return attr(accessing_obj, accessed_obj, *args, **{"compare": "lt"})
 
 
 def attr_le(accessing_obj, accessed_obj, *args, **kwargs):
@@ -485,7 +499,7 @@ def attr_le(accessing_obj, accessed_obj, *args, **kwargs):
 
     Only true if access_obj's attribute <= the value given.
     """
-    return attr(accessing_obj, accessed_obj, *args, **{'compare': 'le'})
+    return attr(accessing_obj, accessed_obj, *args, **{"compare": "le"})
 
 
 def attr_ne(accessing_obj, accessed_obj, *args, **kwargs):
@@ -495,7 +509,7 @@ def attr_ne(accessing_obj, accessed_obj, *args, **kwargs):
 
     Only true if access_obj's attribute != the value given.
     """
-    return attr(accessing_obj, accessed_obj, *args, **{'compare': 'ne'})
+    return attr(accessing_obj, accessed_obj, *args, **{"compare": "ne"})
 
 
 def tag(accessing_obj, accessed_obj, *args, **kwargs):
@@ -570,8 +584,14 @@ def check_holds(objid):
         if dbref and any((True for obj in contents if obj.dbid == dbref)):
             return True
         objid = objid.lower()
-        return any((True for obj in contents
-                    if obj.key.lower() == objid or objid in [al.lower() for al in obj.aliases.all()]))
+        return any(
+            (
+                True
+                for obj in contents
+                if obj.key.lower() == objid or objid in [al.lower() for al in obj.aliases.all()]
+            )
+        )
+
     if not args:
         # holds() - check if accessed_obj or accessed_obj.obj is held by accessing_obj
         try:
diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py
index 1a0cdd8d0fe..22f5844e319 100644
--- a/evennia/locks/lockhandler.py
+++ b/evennia/locks/lockhandler.py
@@ -104,8 +104,6 @@
 
 """
 
-from builtins import object
-
 import re
 from django.conf import settings
 from evennia.utils import logger, utils
@@ -117,7 +115,6 @@
 _LOCK_HANDLER = None
 
 
-
 #
 # Exception class. This will be raised
 # by errors in lock definitions.
@@ -128,6 +125,7 @@ class LockException(Exception):
     """
     Raised during an error in a lock.
     """
+
     pass
 
 
@@ -147,6 +145,7 @@ def _cache_lockfuncs():
     for modulepath in settings.LOCK_FUNC_MODULES:
         _LOCKFUNCS.update(utils.callables_from_module(modulepath))
 
+
 #
 # pre-compiled regular expressions
 #
@@ -163,6 +162,7 @@ def _cache_lockfuncs():
 #
 #
 
+
 class LockHandler(object):
     """
     This handler should be attached to all objects implementing
@@ -213,12 +213,12 @@ def _parse_lockstring(self, storage_lockstring):
         duplicates = 0
         elist = []  # errors
         wlist = []  # warnings
-        for raw_lockstring in storage_lockstring.split(';'):
+        for raw_lockstring in storage_lockstring.split(";"):
             if not raw_lockstring:
                 continue
             lock_funcs = []
             try:
-                access_type, rhs = (part.strip() for part in raw_lockstring.split(':', 1))
+                access_type, rhs = (part.strip() for part in raw_lockstring.split(":", 1))
             except ValueError:
                 logger.log_trace()
                 return locks
@@ -226,19 +226,19 @@ def _parse_lockstring(self, storage_lockstring):
             # parse the lock functions and separators
             funclist = _RE_FUNCS.findall(rhs)
             evalstring = rhs
-            for pattern in ('AND', 'OR', 'NOT'):
+            for pattern in ("AND", "OR", "NOT"):
                 evalstring = re.sub(r"\b%s\b" % pattern, pattern.lower(), evalstring)
             nfuncs = len(funclist)
             for funcstring in funclist:
-                funcname, rest = (part.strip().strip(')') for part in funcstring.split('(', 1))
+                funcname, rest = (part.strip().strip(")") for part in funcstring.split("(", 1))
                 func = _LOCKFUNCS.get(funcname, None)
                 if not callable(func):
                     elist.append(_("Lock: lock-function '%s' is not available.") % funcstring)
                     continue
-                args = list(arg.strip() for arg in rest.split(',') if arg and '=' not in arg)
-                kwargs = dict([arg.split('=', 1) for arg in rest.split(',') if arg and '=' in arg])
+                args = list(arg.strip() for arg in rest.split(",") if arg and "=" not in arg)
+                kwargs = dict([arg.split("=", 1) for arg in rest.split(",") if arg and "=" in arg])
                 lock_funcs.append((func, args, kwargs))
-                evalstring = evalstring.replace(funcstring, '%s')
+                evalstring = evalstring.replace(funcstring, "%s")
             if len(lock_funcs) < nfuncs:
                 continue
             try:
@@ -250,8 +250,17 @@ def _parse_lockstring(self, storage_lockstring):
                 continue
             if access_type in locks:
                 duplicates += 1
-                wlist.append(_("LockHandler on %(obj)s: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' " %
-                               {"obj": self.obj, "access_type": access_type, "source": locks[access_type][2], "goal": raw_lockstring}))
+                wlist.append(
+                    _(
+                        "LockHandler on %(obj)s: access type '%(access_type)s' changed from '%(source)s' to '%(goal)s' "
+                        % {
+                            "obj": self.obj,
+                            "access_type": access_type,
+                            "source": locks[access_type][2],
+                            "goal": raw_lockstring,
+                        }
+                    )
+                )
             locks[access_type] = (evalstring, tuple(lock_funcs), raw_lockstring)
         if wlist and WARNING_LOG:
             # a warning text was set, it's not an error, so only report
@@ -316,23 +325,24 @@ def add(self, lockstring, validate_only=False):
         err = ""
         # sanity checks
         for lockdef in lockdefs:
-            if ':' not in lockdef:
+            if ":" not in lockdef:
                 err = _("Lock: '{lockdef}' contains no colon (:).").format(lockdef=lockdef)
                 if validate_only:
                     return False, err
                 else:
                     self._log_error(err)
                     return False
-            access_type, rhs = [part.strip() for part in lockdef.split(':', 1)]
+            access_type, rhs = [part.strip() for part in lockdef.split(":", 1)]
             if not access_type:
-                err = _("Lock: '{lockdef}' has no access_type "
-                        "(left-side of colon is empty).").format(lockdef=lockdef)
+                err = _(
+                    "Lock: '{lockdef}' has no access_type " "(left-side of colon is empty)."
+                ).format(lockdef=lockdef)
                 if validate_only:
                     return False, err
                 else:
                     self._log_error(err)
                     return False
-            if rhs.count('(') != rhs.count(')'):
+            if rhs.count("(") != rhs.count(")"):
                 err = _("Lock: '{lockdef}' has mismatched parentheses.").format(lockdef=lockdef)
                 if validate_only:
                     return False, err
@@ -419,7 +429,7 @@ def all(self):
             lockstrings (list): All separate lockstrings
 
         """
-        return str(self).split(';')
+        return str(self).split(";")
 
     def remove(self, access_type):
         """
@@ -438,6 +448,7 @@ def remove(self, access_type):
             self._save_locks()
             return True
         return False
+
     delete = remove  # alias for historical reasons
 
     def clear(self):
@@ -458,7 +469,7 @@ def reset(self):
         self._cache_locks(self.obj.lock_storage)
         self.cache_lock_bypass(self.obj)
 
-    def append(self, access_type, lockstring, op='or'):
+    def append(self, access_type, lockstring, op="or"):
         """
         Append a lock definition to access_type if it doesn't already exist.
 
@@ -477,7 +488,8 @@ def append(self, access_type, lockstring, op='or'):
         old_lockstring = self.get(access_type)
         if not lockstring.strip().lower() in old_lockstring.lower():
             lockstring = "{old} {op} {new}".format(
-                old=old_lockstring, op=op, new=lockstring.strip())
+                old=old_lockstring, op=op, new=lockstring.strip()
+            )
             self.add(lockstring)
 
     def check(self, accessing_obj, access_type, default=False, no_superuser_bypass=False):
@@ -519,12 +531,19 @@ def check(self, accessing_obj, access_type, default=False, no_superuser_bypass=F
         except AttributeError:
             # happens before session is initiated.
             if not no_superuser_bypass and (
-                (hasattr(accessing_obj, 'is_superuser') and accessing_obj.is_superuser) or
-                (hasattr(accessing_obj, 'account') and
-                    hasattr(accessing_obj.account, 'is_superuser') and
-                    accessing_obj.account.is_superuser) or
-                (hasattr(accessing_obj, 'get_account') and
-                    (not accessing_obj.get_account() or accessing_obj.get_account().is_superuser))):
+                (hasattr(accessing_obj, "is_superuser") and accessing_obj.is_superuser)
+                or (
+                    hasattr(accessing_obj, "account")
+                    and hasattr(accessing_obj.account, "is_superuser")
+                    and accessing_obj.account.is_superuser
+                )
+                or (
+                    hasattr(accessing_obj, "get_account")
+                    and (
+                        not accessing_obj.get_account() or accessing_obj.get_account().is_superuser
+                    )
+                )
+            ):
                 return True
 
         # no superuser or bypass -> normal lock operation
@@ -532,8 +551,9 @@ def check(self, accessing_obj, access_type, default=False, no_superuser_bypass=F
             # we have a lock, test it.
             evalstring, func_tup, raw_string = self.locks[access_type]
             # execute all lock funcs in the correct order, producing a tuple of True/False results.
-            true_false = tuple(bool(
-                tup[0](accessing_obj, self.obj, *tup[1], **tup[2])) for tup in func_tup)
+            true_false = tuple(
+                bool(tup[0](accessing_obj, self.obj, *tup[1], **tup[2])) for tup in func_tup
+            )
             # the True/False tuple goes into evalstring, which combines them
             # with AND/OR/NOT in order to get the final result.
             return eval(evalstring % true_false)
@@ -551,12 +571,12 @@ def _eval_access_type(self, accessing_obj, locks, access_type):
 
         """
         evalstring, func_tup, raw_string = locks[access_type]
-        true_false = tuple(tup[0](accessing_obj, self.obj, *tup[1], **tup[2])
-                           for tup in func_tup)
+        true_false = tuple(tup[0](accessing_obj, self.obj, *tup[1], **tup[2]) for tup in func_tup)
         return eval(evalstring % true_false)
 
-    def check_lockstring(self, accessing_obj, lockstring, no_superuser_bypass=False,
-                         default=False, access_type=None):
+    def check_lockstring(
+        self, accessing_obj, lockstring, no_superuser_bypass=False, default=False, access_type=None
+    ):
         """
         Do a direct check against a lockstring ('atype:func()..'),
         without any intermediary storage on the accessed object.
@@ -585,12 +605,19 @@ def check_lockstring(self, accessing_obj, lockstring, no_superuser_bypass=False,
                 return True
         except AttributeError:
             if no_superuser_bypass and (
-                (hasattr(accessing_obj, 'is_superuser') and accessing_obj.is_superuser) or
-                (hasattr(accessing_obj, 'account') and
-                    hasattr(accessing_obj.account, 'is_superuser') and
-                    accessing_obj.account.is_superuser) or
-                (hasattr(accessing_obj, 'get_account') and
-                    (not accessing_obj.get_account() or accessing_obj.get_account().is_superuser))):
+                (hasattr(accessing_obj, "is_superuser") and accessing_obj.is_superuser)
+                or (
+                    hasattr(accessing_obj, "account")
+                    and hasattr(accessing_obj.account, "is_superuser")
+                    and accessing_obj.account.is_superuser
+                )
+                or (
+                    hasattr(accessing_obj, "get_account")
+                    and (
+                        not accessing_obj.get_account() or accessing_obj.get_account().is_superuser
+                    )
+                )
+            ):
                 return True
         if ":" not in lockstring:
             lockstring = "%s:%s" % ("_dummy", lockstring)
@@ -601,25 +628,27 @@ def check_lockstring(self, accessing_obj, lockstring, no_superuser_bypass=False,
             if access_type not in locks:
                 return default
             else:
-                return self._eval_access_type(
-                    accessing_obj, locks, access_type)
+                return self._eval_access_type(accessing_obj, locks, access_type)
         else:
             # if no access types was given and multiple locks were
             # embedded in the lockstring we assume all must be true
-            return all(self._eval_access_type(
-                accessing_obj, locks, access_type) for access_type in locks)
+            return all(
+                self._eval_access_type(accessing_obj, locks, access_type) for access_type in locks
+            )
 
 
 # convenience access function
 
 # dummy to be able to call check_lockstring from the outside
 
+
 class _ObjDummy:
-    lock_storage = ''
+    lock_storage = ""
 
 
-def check_lockstring(accessing_obj, lockstring, no_superuser_bypass=False,
-                     default=False, access_type=None):
+def check_lockstring(
+    accessing_obj, lockstring, no_superuser_bypass=False, default=False, access_type=None
+):
     """
     Do a direct check against a lockstring ('atype:func()..'),
     without any intermediary storage on the accessed object.
@@ -647,8 +676,12 @@ def check_lockstring(accessing_obj, lockstring, no_superuser_bypass=False,
     if not _LOCK_HANDLER:
         _LOCK_HANDLER = LockHandler(_ObjDummy())
     return _LOCK_HANDLER.check_lockstring(
-        accessing_obj, lockstring, no_superuser_bypass=no_superuser_bypass,
-        default=default, access_type=access_type)
+        accessing_obj,
+        lockstring,
+        no_superuser_bypass=no_superuser_bypass,
+        default=default,
+        access_type=access_type,
+    )
 
 
 def validate_lockstring(lockstring):
@@ -690,11 +723,12 @@ class TestObj(object):
         pass
 
     import pdb
+
     obj1 = TestObj()
     obj2 = TestObj()
 
     # obj1.lock_storage = "owner:dbref(#4);edit:dbref(#5) or perm(Admin);examine:perm(Builder);delete:perm(Admin);get:all()"
-    #obj1.lock_storage = "cmd:all();admin:id(1);listen:all();send:all()"
+    # obj1.lock_storage = "cmd:all();admin:id(1);listen:all();send:all()"
     obj1.lock_storage = "listen:perm(Developer)"
 
     pdb.set_trace()
@@ -705,9 +739,9 @@ class TestObj(object):
     # obj1.locks.add("edit:attr(test)")
 
     print("comparing obj2.permissions (%s) vs obj1.locks (%s)" % (obj2.permissions, obj1.locks))
-    print(obj1.locks.check(obj2, 'owner'))
-    print(obj1.locks.check(obj2, 'edit'))
-    print(obj1.locks.check(obj2, 'examine'))
-    print(obj1.locks.check(obj2, 'delete'))
-    print(obj1.locks.check(obj2, 'get'))
-    print(obj1.locks.check(obj2, 'listen'))
+    print(obj1.locks.check(obj2, "owner"))
+    print(obj1.locks.check(obj2, "edit"))
+    print(obj1.locks.check(obj2, "examine"))
+    print(obj1.locks.check(obj2, "delete"))
+    print(obj1.locks.check(obj2, "get"))
+    print(obj1.locks.check(obj2, "listen"))
diff --git a/evennia/locks/tests.py b/evennia/locks/tests.py
index 9114a68060e..bb02877f067 100644
--- a/evennia/locks/tests.py
+++ b/evennia/locks/tests.py
@@ -26,23 +26,26 @@
 class TestLockCheck(EvenniaTest):
     def testrun(self):
         dbref = self.obj2.dbref
-        self.obj1.locks.add("owner:dbref(%s);edit:dbref(%s) or perm(Admin);examine:perm(Builder) "
-                            "and id(%s);delete:perm(Admin);get:all()" % (dbref, dbref, dbref))
-        self.obj2.permissions.add('Admin')
-        self.assertEqual(True, self.obj1.locks.check(self.obj2, 'owner'))
-        self.assertEqual(True, self.obj1.locks.check(self.obj2, 'edit'))
-        self.assertEqual(True, self.obj1.locks.check(self.obj2, 'examine'))
-        self.assertEqual(True, self.obj1.locks.check(self.obj2, 'delete'))
-        self.assertEqual(True, self.obj1.locks.check(self.obj2, 'get'))
+        self.obj1.locks.add(
+            "owner:dbref(%s);edit:dbref(%s) or perm(Admin);examine:perm(Builder) "
+            "and id(%s);delete:perm(Admin);get:all()" % (dbref, dbref, dbref)
+        )
+        self.obj2.permissions.add("Admin")
+        self.assertEqual(True, self.obj1.locks.check(self.obj2, "owner"))
+        self.assertEqual(True, self.obj1.locks.check(self.obj2, "edit"))
+        self.assertEqual(True, self.obj1.locks.check(self.obj2, "examine"))
+        self.assertEqual(True, self.obj1.locks.check(self.obj2, "delete"))
+        self.assertEqual(True, self.obj1.locks.check(self.obj2, "get"))
         self.obj1.locks.add("get:false()")
-        self.assertEqual(False, self.obj1.locks.check(self.obj2, 'get'))
-        self.assertEqual(True, self.obj1.locks.check(self.obj2, 'not_exist', default=True))
+        self.assertEqual(False, self.obj1.locks.check(self.obj2, "get"))
+        self.assertEqual(True, self.obj1.locks.check(self.obj2, "not_exist", default=True))
+
 
 class TestLockfuncs(EvenniaTest):
     def setUp(self):
         super(TestLockfuncs, self).setUp()
-        self.account2.permissions.add('Admin')
-        self.char2.permissions.add('Builder')
+        self.account2.permissions.add("Admin")
+        self.char2.permissions.add("Builder")
 
     def test_booleans(self):
         self.assertEqual(True, lockfuncs.true(self.account2, self.obj1))
@@ -55,121 +58,121 @@ def test_booleans(self):
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_account_perm(self):
-        self.assertEqual(False, lockfuncs.perm(self.account2, None, 'foo'))
-        self.assertEqual(False, lockfuncs.perm(self.account2, None, 'Developer'))
-        self.assertEqual(False, lockfuncs.perm(self.account2, None, 'Developers'))
-        self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Admin'))
-        self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Player'))
-        self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Players'))
-        self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Builder'))
-        self.assertEqual(True, lockfuncs.perm(self.account2, None, 'Builders'))
-        self.assertEqual(True, lockfuncs.perm_above(self.account2, None, 'Builder'))
+        self.assertEqual(False, lockfuncs.perm(self.account2, None, "foo"))
+        self.assertEqual(False, lockfuncs.perm(self.account2, None, "Developer"))
+        self.assertEqual(False, lockfuncs.perm(self.account2, None, "Developers"))
+        self.assertEqual(True, lockfuncs.perm(self.account2, None, "Admin"))
+        self.assertEqual(True, lockfuncs.perm(self.account2, None, "Admins"))
+        self.assertEqual(True, lockfuncs.perm(self.account2, None, "Player"))
+        self.assertEqual(True, lockfuncs.perm(self.account2, None, "Players"))
+        self.assertEqual(True, lockfuncs.perm(self.account2, None, "Builder"))
+        self.assertEqual(True, lockfuncs.perm(self.account2, None, "Builders"))
+        self.assertEqual(True, lockfuncs.perm_above(self.account2, None, "Builder"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_puppet_perm(self):
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'foo'))
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Developer'))
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Develoeprs'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Admin'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Player'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Players'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builder'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builders'))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "foo"))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "Developer"))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "Develoeprs"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Admin"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Admins"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Player"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Players"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Builder"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Builders"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_account_perm_above(self):
-        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Builder'))
-        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Builders'))
-        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Player'))
-        self.assertEqual(False, lockfuncs.perm_above(self.char2, None, 'Admin'))
-        self.assertEqual(False, lockfuncs.perm_above(self.char2, None, 'Admins'))
-        self.assertEqual(False, lockfuncs.perm_above(self.char2, None, 'Developers'))
+        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, "Builder"))
+        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, "Builders"))
+        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, "Player"))
+        self.assertEqual(False, lockfuncs.perm_above(self.char2, None, "Admin"))
+        self.assertEqual(False, lockfuncs.perm_above(self.char2, None, "Admins"))
+        self.assertEqual(False, lockfuncs.perm_above(self.char2, None, "Developers"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_quell_perm(self):
         self.account2.db._quell = True
         self.assertEqual(False, lockfuncs.false(self.char2, None))
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Developer'))
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Developers'))
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Admin'))
-        self.assertEqual(False, lockfuncs.perm(self.char2, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Player'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Players'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builder'))
-        self.assertEqual(True, lockfuncs.perm(self.char2, None, 'Builders'))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "Developer"))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "Developers"))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "Admin"))
+        self.assertEqual(False, lockfuncs.perm(self.char2, None, "Admins"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Player"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Players"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Builder"))
+        self.assertEqual(True, lockfuncs.perm(self.char2, None, "Builders"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_quell_above_perm(self):
-        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Player'))
-        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, 'Builder'))
+        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, "Player"))
+        self.assertEqual(True, lockfuncs.perm_above(self.char2, None, "Builder"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_object_perm(self):
-        self.obj2.permissions.add('Admin')
-        self.assertEqual(False, lockfuncs.perm(self.obj2, None, 'Developer'))
-        self.assertEqual(False, lockfuncs.perm(self.obj2, None, 'Developers'))
-        self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Admin'))
-        self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Player'))
-        self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Players'))
-        self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Builder'))
-        self.assertEqual(True, lockfuncs.perm(self.obj2, None, 'Builders'))
+        self.obj2.permissions.add("Admin")
+        self.assertEqual(False, lockfuncs.perm(self.obj2, None, "Developer"))
+        self.assertEqual(False, lockfuncs.perm(self.obj2, None, "Developers"))
+        self.assertEqual(True, lockfuncs.perm(self.obj2, None, "Admin"))
+        self.assertEqual(True, lockfuncs.perm(self.obj2, None, "Admins"))
+        self.assertEqual(True, lockfuncs.perm(self.obj2, None, "Player"))
+        self.assertEqual(True, lockfuncs.perm(self.obj2, None, "Players"))
+        self.assertEqual(True, lockfuncs.perm(self.obj2, None, "Builder"))
+        self.assertEqual(True, lockfuncs.perm(self.obj2, None, "Builders"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_object_above_perm(self):
-        self.obj2.permissions.add('Admin')
-        self.assertEqual(False, lockfuncs.perm_above(self.obj2, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.perm_above(self.obj2, None, 'Builder'))
-        self.assertEqual(True, lockfuncs.perm_above(self.obj2, None, 'Builders'))
+        self.obj2.permissions.add("Admin")
+        self.assertEqual(False, lockfuncs.perm_above(self.obj2, None, "Admins"))
+        self.assertEqual(True, lockfuncs.perm_above(self.obj2, None, "Builder"))
+        self.assertEqual(True, lockfuncs.perm_above(self.obj2, None, "Builders"))
 
     @override_settings(PERMISSION_HIERARCHY=settings_default.PERMISSION_HIERARCHY)
     def test_pperm(self):
-        self.obj2.permissions.add('Developer')
-        self.char2.permissions.add('Developer')
-        self.assertEqual(False, lockfuncs.pperm(self.obj2, None, 'Players'))
-        self.assertEqual(True, lockfuncs.pperm(self.char2, None, 'Players'))
-        self.assertEqual(True, lockfuncs.pperm(self.account, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.pperm_above(self.account, None, 'Builders'))
-        self.assertEqual(False, lockfuncs.pperm_above(self.account2, None, 'Admins'))
-        self.assertEqual(True, lockfuncs.pperm_above(self.char2, None, 'Players'))
+        self.obj2.permissions.add("Developer")
+        self.char2.permissions.add("Developer")
+        self.assertEqual(False, lockfuncs.pperm(self.obj2, None, "Players"))
+        self.assertEqual(True, lockfuncs.pperm(self.char2, None, "Players"))
+        self.assertEqual(True, lockfuncs.pperm(self.account, None, "Admins"))
+        self.assertEqual(True, lockfuncs.pperm_above(self.account, None, "Builders"))
+        self.assertEqual(False, lockfuncs.pperm_above(self.account2, None, "Admins"))
+        self.assertEqual(True, lockfuncs.pperm_above(self.char2, None, "Players"))
 
     def test_dbref(self):
         dbref = self.obj2.dbref
-        self.assertEqual(True, lockfuncs.dbref(self.obj2, None, '%s' % dbref))
-        self.assertEqual(False, lockfuncs.id(self.obj2, None, '%s' % (dbref + '1')))
+        self.assertEqual(True, lockfuncs.dbref(self.obj2, None, "%s" % dbref))
+        self.assertEqual(False, lockfuncs.id(self.obj2, None, "%s" % (dbref + "1")))
         dbref = self.account2.dbref
-        self.assertEqual(True, lockfuncs.pdbref(self.account2, None, '%s' % dbref))
-        self.assertEqual(False, lockfuncs.pid(self.account2, None, '%s' % (dbref + '1')))
+        self.assertEqual(True, lockfuncs.pdbref(self.account2, None, "%s" % dbref))
+        self.assertEqual(False, lockfuncs.pid(self.account2, None, "%s" % (dbref + "1")))
 
     def test_attr(self):
         self.obj2.db.testattr = 45
-        self.assertEqual(True, lockfuncs.attr(self.obj2, None, 'testattr', '45'))
-        self.assertEqual(False, lockfuncs.attr_gt(self.obj2, None, 'testattr', '45'))
-        self.assertEqual(True, lockfuncs.attr_ge(self.obj2, None, 'testattr', '45'))
-        self.assertEqual(False, lockfuncs.attr_lt(self.obj2, None, 'testattr', '45'))
-        self.assertEqual(True, lockfuncs.attr_le(self.obj2, None, 'testattr', '45'))
+        self.assertEqual(True, lockfuncs.attr(self.obj2, None, "testattr", "45"))
+        self.assertEqual(False, lockfuncs.attr_gt(self.obj2, None, "testattr", "45"))
+        self.assertEqual(True, lockfuncs.attr_ge(self.obj2, None, "testattr", "45"))
+        self.assertEqual(False, lockfuncs.attr_lt(self.obj2, None, "testattr", "45"))
+        self.assertEqual(True, lockfuncs.attr_le(self.obj2, None, "testattr", "45"))
 
-        self.assertEqual(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45'))
-        self.assertEqual(True, lockfuncs.objattr(None, self.obj2, 'testattr', '45'))
-        self.assertEqual(False, lockfuncs.objattr(None, self.obj2, 'testattr', '45', compare='lt'))
+        self.assertEqual(True, lockfuncs.objattr(None, self.obj2, "testattr", "45"))
+        self.assertEqual(True, lockfuncs.objattr(None, self.obj2, "testattr", "45"))
+        self.assertEqual(False, lockfuncs.objattr(None, self.obj2, "testattr", "45", compare="lt"))
 
     def test_locattr(self):
-        self.obj2.location.db.locattr = 'test'
-        self.assertEqual(True, lockfuncs.locattr(self.obj2, None, 'locattr', 'test'))
-        self.assertEqual(False, lockfuncs.locattr(self.obj2, None, 'fail', 'testfail'))
-        self.assertEqual(True, lockfuncs.objlocattr(None, self.obj2, 'locattr', 'test'))
+        self.obj2.location.db.locattr = "test"
+        self.assertEqual(True, lockfuncs.locattr(self.obj2, None, "locattr", "test"))
+        self.assertEqual(False, lockfuncs.locattr(self.obj2, None, "fail", "testfail"))
+        self.assertEqual(True, lockfuncs.objlocattr(None, self.obj2, "locattr", "test"))
 
     def test_tag(self):
         self.obj2.tags.add("test1")
         self.obj2.tags.add("test2", "category1")
-        self.assertEqual(True, lockfuncs.tag(self.obj2, None, 'test1'))
-        self.assertEqual(True, lockfuncs.tag(self.obj2, None, 'test2', 'category1'))
-        self.assertEqual(False, lockfuncs.tag(self.obj2, None, 'test1', 'category1'))
-        self.assertEqual(False, lockfuncs.tag(self.obj2, None, 'test1', 'category2'))
-        self.assertEqual(True, lockfuncs.objtag(None, self.obj2, 'test2', 'category1'))
-        self.assertEqual(False, lockfuncs.objtag(None, self.obj2, 'test2'))
+        self.assertEqual(True, lockfuncs.tag(self.obj2, None, "test1"))
+        self.assertEqual(True, lockfuncs.tag(self.obj2, None, "test2", "category1"))
+        self.assertEqual(False, lockfuncs.tag(self.obj2, None, "test1", "category1"))
+        self.assertEqual(False, lockfuncs.tag(self.obj2, None, "test1", "category2"))
+        self.assertEqual(True, lockfuncs.objtag(None, self.obj2, "test2", "category1"))
+        self.assertEqual(False, lockfuncs.objtag(None, self.obj2, "test2"))
 
     def test_inside_holds(self):
         self.assertEqual(True, lockfuncs.inside(self.char1, self.room1))
@@ -183,7 +186,7 @@ def test_has_account(self):
 
     @override_settings(IRC_ENABLED=True, TESTVAL=[1, 2, 3])
     def test_serversetting(self):
-        self.assertEqual(True, lockfuncs.serversetting(None, None, 'IRC_ENABLED', 'True'))
-        self.assertEqual(True, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 3]'))
-        self.assertEqual(False, lockfuncs.serversetting(None, None, 'TESTVAL', '[1, 2, 4]'))
-        self.assertEqual(False, lockfuncs.serversetting(None, None, 'TESTVAL', '123'))
+        self.assertEqual(True, lockfuncs.serversetting(None, None, "IRC_ENABLED", "True"))
+        self.assertEqual(True, lockfuncs.serversetting(None, None, "TESTVAL", "[1, 2, 3]"))
+        self.assertEqual(False, lockfuncs.serversetting(None, None, "TESTVAL", "[1, 2, 4]"))
+        self.assertEqual(False, lockfuncs.serversetting(None, None, "TESTVAL", "123"))
diff --git a/evennia/objects/admin.py b/evennia/objects/admin.py
index afb43a1b23f..49bec928c38 100644
--- a/evennia/objects/admin.py
+++ b/evennia/objects/admin.py
@@ -2,8 +2,6 @@
 # This sets up how models are displayed
 # in the web admin interface.
 #
-from builtins import object
-
 from django import forms
 from django.conf import settings
 from django.contrib import admin
@@ -17,6 +15,7 @@ class ObjectAttributeInline(AttributeInline):
     Defines inline descriptions of Attributes (experimental)
 
     """
+
     model = ObjectDB.db_attributes.through
     related_field = "objectdb"
 
@@ -26,6 +25,7 @@ class ObjectTagInline(TagInline):
     Defines inline descriptions of Tags (experimental)
 
     """
+
     model = ObjectDB.db_tags.through
     related_field = "objectdb"
 
@@ -35,27 +35,35 @@ class ObjectCreateForm(forms.ModelForm):
     This form details the look of the fields.
 
     """
+
     class Meta(object):
         model = ObjectDB
-        fields = '__all__'
-    db_key = forms.CharField(label="Name/Key",
-                             widget=forms.TextInput(attrs={'size': '78'}),
-                             help_text="Main identifier, like 'apple', 'strong guy', 'Elizabeth' etc. "
-                                       "If creating a Character, check so the name is unique among characters!",)
-    db_typeclass_path = forms.CharField(label="Typeclass",
-                                        initial=settings.BASE_OBJECT_TYPECLASS,
-                                        widget=forms.TextInput(attrs={'size': '78'}),
-                                        help_text="This defines what 'type' of entity this is. This variable holds a "
-                                                  "Python path to a module with a valid Evennia Typeclass. If you are "
-                                                  "creating a Character you should use the typeclass defined by "
-                                                  "settings.BASE_CHARACTER_TYPECLASS or one derived from that.")
-    db_cmdset_storage = forms.CharField(label="CmdSet",
-                                        initial="",
-                                        required=False,
-                                        widget=forms.TextInput(attrs={'size': '78'}),
-                                        help_text="Most non-character objects don't need a cmdset"
-                                                  " and can leave this field blank.")
-    raw_id_fields = ('db_destination', 'db_location', 'db_home')
+        fields = "__all__"
+
+    db_key = forms.CharField(
+        label="Name/Key",
+        widget=forms.TextInput(attrs={"size": "78"}),
+        help_text="Main identifier, like 'apple', 'strong guy', 'Elizabeth' etc. "
+        "If creating a Character, check so the name is unique among characters!",
+    )
+    db_typeclass_path = forms.CharField(
+        label="Typeclass",
+        initial=settings.BASE_OBJECT_TYPECLASS,
+        widget=forms.TextInput(attrs={"size": "78"}),
+        help_text="This defines what 'type' of entity this is. This variable holds a "
+        "Python path to a module with a valid Evennia Typeclass. If you are "
+        "creating a Character you should use the typeclass defined by "
+        "settings.BASE_CHARACTER_TYPECLASS or one derived from that.",
+    )
+    db_cmdset_storage = forms.CharField(
+        label="CmdSet",
+        initial="",
+        required=False,
+        widget=forms.TextInput(attrs={"size": "78"}),
+        help_text="Most non-character objects don't need a cmdset"
+        " and can leave this field blank.",
+    )
+    raw_id_fields = ("db_destination", "db_location", "db_home")
 
 
 class ObjectEditForm(ObjectCreateForm):
@@ -65,13 +73,16 @@ class ObjectEditForm(ObjectCreateForm):
     """
 
     class Meta(object):
-        fields = '__all__'
-    db_lock_storage = forms.CharField(label="Locks",
-                                      required=False,
-                                      widget=forms.Textarea(attrs={'cols': '100', 'rows': '2'}),
-                                      help_text="In-game lock definition string. If not given, defaults will be used. "
-                                                "This string should be on the form "
-                                                "<i>type:lockfunction(args);type2:lockfunction2(args);...")
+        fields = "__all__"
+
+    db_lock_storage = forms.CharField(
+        label="Locks",
+        required=False,
+        widget=forms.Textarea(attrs={"cols": "100", "rows": "2"}),
+        help_text="In-game lock definition string. If not given, defaults will be used. "
+        "This string should be on the form "
+        "<i>type:lockfunction(args);type2:lockfunction2(args);...",
+    )
 
 
 class ObjectDBAdmin(admin.ModelAdmin):
@@ -81,33 +92,48 @@ class ObjectDBAdmin(admin.ModelAdmin):
     """
 
     inlines = [ObjectTagInline, ObjectAttributeInline]
-    list_display = ('id', 'db_key', 'db_account', 'db_typeclass_path')
-    list_display_links = ('id', 'db_key')
-    ordering = ['db_account', 'db_typeclass_path', 'id']
-    search_fields = ['^db_key', 'db_typeclass_path']
-    raw_id_fields = ('db_destination', 'db_location', 'db_home')
+    list_display = ("id", "db_key", "db_account", "db_typeclass_path")
+    list_display_links = ("id", "db_key")
+    ordering = ["db_account", "db_typeclass_path", "id"]
+    search_fields = ["=id", "^db_key", "db_typeclass_path", "^db_account__db_key"]
+    raw_id_fields = ("db_destination", "db_location", "db_home")
 
     save_as = True
     save_on_top = True
     list_select_related = True
-    list_filter = ('db_typeclass_path',)
+    list_filter = ("db_typeclass_path",)
 
     # editing fields setup
 
     form = ObjectEditForm
     fieldsets = (
-        (None, {
-            'fields': (('db_key', 'db_typeclass_path'), ('db_lock_storage', ),
-                       ('db_location', 'db_home'), 'db_destination', 'db_cmdset_storage'
-                       )}),
+        (
+            None,
+            {
+                "fields": (
+                    ("db_key", "db_typeclass_path"),
+                    ("db_lock_storage",),
+                    ("db_location", "db_home"),
+                    "db_destination",
+                    "db_cmdset_storage",
+                )
+            },
+        ),
     )
 
     add_form = ObjectCreateForm
     add_fieldsets = (
-        (None, {
-            'fields': (('db_key', 'db_typeclass_path'),
-                       ('db_location', 'db_home'), 'db_destination', 'db_cmdset_storage'
-                       )}),
+        (
+            None,
+            {
+                "fields": (
+                    ("db_key", "db_typeclass_path"),
+                    ("db_location", "db_home"),
+                    "db_destination",
+                    "db_cmdset_storage",
+                )
+            },
+        ),
     )
 
     def get_fieldsets(self, request, obj=None):
@@ -133,10 +159,9 @@ def get_form(self, request, obj=None, **kwargs):
         """
         defaults = {}
         if obj is None:
-            defaults.update({
-                'form': self.add_form,
-                'fields': flatten_fieldsets(self.add_fieldsets),
-            })
+            defaults.update(
+                {"form": self.add_form, "fields": flatten_fieldsets(self.add_fieldsets)}
+            )
             defaults.update(kwargs)
         return super().get_form(request, obj, **defaults)
 
@@ -164,6 +189,7 @@ def save_model(self, request, obj, form, change):
     def response_add(self, request, obj, post_url_continue=None):
         from django.http import HttpResponseRedirect
         from django.urls import reverse
+
         return HttpResponseRedirect(reverse("admin:objects_objectdb_change", args=[obj.id]))
 
 
diff --git a/evennia/objects/manager.py b/evennia/objects/manager.py
index b65bc09a04f..39b91b3dc2e 100644
--- a/evennia/objects/manager.py
+++ b/evennia/objects/manager.py
@@ -8,7 +8,6 @@
 from django.db.models.fields import exceptions
 from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
 from evennia.utils.utils import is_iter, make_iter, string_partial_matching
-from builtins import int
 
 __all__ = ("ObjectManager",)
 _GA = object.__getattribute__
@@ -72,7 +71,7 @@ def get_object_with_account(self, ostring, exact=True, candidates=None):
             match (query): Matching query.
 
         """
-        ostring = str(ostring).lstrip('*')
+        ostring = str(ostring).lstrip("*")
         # simplest case - search by dbref
         dbref = self.dbref(ostring)
         if dbref:
@@ -82,16 +81,25 @@ def get_object_with_account(self, ostring, exact=True, candidates=None):
                 pass
 
         # not a dbref. Search by name.
-        cand_restriction = candidates is not None and Q(
-                pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj]) or Q()
+        cand_restriction = (
+            candidates is not None
+            and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj])
+            or Q()
+        )
         if exact:
-            return self.filter(cand_restriction & Q(db_account__username__iexact=ostring)).order_by("id")
+            return self.filter(cand_restriction & Q(db_account__username__iexact=ostring)).order_by(
+                "id"
+            )
         else:  # fuzzy matching
-            obj_cands = self.select_related().filter(cand_restriction & Q(db_account__username__istartswith=ostring))
+            obj_cands = self.select_related().filter(
+                cand_restriction & Q(db_account__username__istartswith=ostring)
+            )
             acct_cands = [obj.account for obj in obj_cands]
 
             if obj_cands:
-                index_matches = string_partial_matching([acct.key for acct in acct_cands], ostring, ret_index=True)
+                index_matches = string_partial_matching(
+                    [acct.key for acct in acct_cands], ostring, ret_index=True
+                )
                 acct_cands = [acct_cands[i].id for i in index_matches]
                 return obj_cands.filter(db_account__id__in=acct_cands).order_by("id")
 
@@ -107,10 +115,14 @@ def get_objs_with_key_and_typeclass(self, oname, otypeclass_path, candidates=Non
         Returns:
             matches (query): The matching objects.
         """
-        cand_restriction = candidates is not None and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates)
-                                                                if obj]) or Q()
-        return self.filter(cand_restriction & Q(
-            db_key__iexact=oname, db_typeclass_path__exact=otypeclass_path)).order_by('id')
+        cand_restriction = (
+            candidates is not None
+            and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj])
+            or Q()
+        )
+        return self.filter(
+            cand_restriction & Q(db_key__iexact=oname, db_typeclass_path__exact=otypeclass_path)
+        ).order_by("id")
 
     # attr/property related
 
@@ -127,12 +139,16 @@ def get_objs_with_attr(self, attribute_name, candidates=None):
             matches (query):  All objects having the given attribute_name defined at all.
 
         """
-        cand_restriction = \
+        cand_restriction = (
             candidates is not None and Q(id__in=[obj.id for obj in candidates]) or Q()
-        return self.filter(cand_restriction & Q(db_attributes__db_key=attribute_name)).order_by('id')
-
-    def get_objs_with_attr_value(self, attribute_name, attribute_value,
-                                 candidates=None, typeclasses=None):
+        )
+        return self.filter(cand_restriction & Q(db_attributes__db_key=attribute_name)).order_by(
+            "id"
+        )
+
+    def get_objs_with_attr_value(
+        self, attribute_name, attribute_value, candidates=None, typeclasses=None
+    ):
         """
         Get all objects having the given attrname set to the given value.
 
@@ -152,23 +168,37 @@ def get_objs_with_attr_value(self, attribute_name, attribute_value,
             cannot be indexed, searching by Attribute key is to be preferred whenever possible.
 
         """
-        cand_restriction = candidates is not None and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates)
-                                                                if obj]) or Q()
+        cand_restriction = (
+            candidates is not None
+            and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj])
+            or Q()
+        )
         type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q()
 
         # This doesn't work if attribute_value is an object. Workaround below
 
         if isinstance(attribute_value, (str, int, float, bool)):
-            return self.filter(cand_restriction & type_restriction & Q(
-                db_attributes__db_key=attribute_name, db_attributes__db_value=attribute_value)).order_by('id')
+            return self.filter(
+                cand_restriction
+                & type_restriction
+                & Q(db_attributes__db_key=attribute_name, db_attributes__db_value=attribute_value)
+            ).order_by("id")
         else:
             # We must loop for safety since the referenced lookup gives deepcopy error if attribute value is an object.
             global _ATTR
             if not _ATTR:
                 from evennia.typeclasses.models import Attribute as _ATTR
-            cands = list(self.filter(cand_restriction & type_restriction & Q(db_attributes__db_key=attribute_name)))
-            results = [attr.objectdb_set.all() for attr in _ATTR.objects.filter(
-                objectdb__in=cands, db_value=attribute_value).order_by('id')]
+            cands = list(
+                self.filter(
+                    cand_restriction & type_restriction & Q(db_attributes__db_key=attribute_name)
+                )
+            )
+            results = [
+                attr.objectdb_set.all()
+                for attr in _ATTR.objects.filter(
+                    objectdb__in=cands, db_value=attribute_value
+                ).order_by("id")
+            ]
             return chain(*results)
 
     def get_objs_with_db_property(self, property_name, candidates=None):
@@ -183,16 +213,21 @@ def get_objs_with_db_property(self, property_name, candidates=None):
             matches (list): The found matches.
 
         """
-        property_name = "db_%s" % property_name.lstrip('db_')
-        cand_restriction = candidates is not None and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates)
-                                                                if obj]) or Q()
+        property_name = "db_%s" % property_name.lstrip("db_")
+        cand_restriction = (
+            candidates is not None
+            and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj])
+            or Q()
+        )
         querykwargs = {property_name: None}
         try:
-            return list(self.filter(cand_restriction).exclude(Q(**querykwargs)).order_by('id'))
+            return list(self.filter(cand_restriction).exclude(Q(**querykwargs)).order_by("id"))
         except exceptions.FieldError:
             return []
 
-    def get_objs_with_db_property_value(self, property_name, property_value, candidates=None, typeclasses=None):
+    def get_objs_with_db_property_value(
+        self, property_name, property_value, candidates=None, typeclasses=None
+    ):
         """
         Get objects with a specific field name and value.
 
@@ -204,20 +239,28 @@ def get_objs_with_db_property_value(self, property_name, property_value, candida
 
         """
         if isinstance(property_name, str):
-            if not property_name.startswith('db_'):
+            if not property_name.startswith("db_"):
                 property_name = "db_%s" % property_name
         querykwargs = {property_name: property_value}
-        cand_restriction = candidates is not None and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates)
-                                                                if obj]) or Q()
+        cand_restriction = (
+            candidates is not None
+            and Q(pk__in=[_GA(obj, "id") for obj in make_iter(candidates) if obj])
+            or Q()
+        )
         type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q()
         try:
-            return list(self.filter(cand_restriction & type_restriction & Q(**querykwargs)).order_by('id'))
+            return list(
+                self.filter(cand_restriction & type_restriction & Q(**querykwargs)).order_by("id")
+            )
         except exceptions.FieldError:
             return []
         except ValueError:
             from evennia.utils import logger
-            logger.log_err("The property '%s' does not support search criteria of the type %s." %
-                           (property_name, type(property_value)))
+
+            logger.log_err(
+                "The property '%s' does not support search criteria of the type %s."
+                % (property_name, type(property_value))
+            )
             return []
 
     def get_contents(self, location, excludeobj=None):
@@ -232,11 +275,12 @@ def get_contents(self, location, excludeobj=None):
         Returns:
             contents (list): Matching contents, without excludeobj, if given.
         """
-        exclude_restriction = Q(pk__in=[_GA(obj, "id") for obj in make_iter(excludeobj)]) if excludeobj else Q()
-        return self.filter(db_location=location).exclude(exclude_restriction).order_by('id')
+        exclude_restriction = (
+            Q(pk__in=[_GA(obj, "id") for obj in make_iter(excludeobj)]) if excludeobj else Q()
+        )
+        return self.filter(db_location=location).exclude(exclude_restriction).order_by("id")
 
-    def get_objs_with_key_or_alias(self, ostring, exact=True,
-                                   candidates=None, typeclasses=None):
+    def get_objs_with_key_or_alias(self, ostring, exact=True, candidates=None, typeclasses=None):
         """
         Args:
             ostring (str): A search criterion.
@@ -265,16 +309,36 @@ def get_objs_with_key_or_alias(self, ostring, exact=True,
         type_restriction = typeclasses and Q(db_typeclass_path__in=make_iter(typeclasses)) or Q()
         if exact:
             # exact match - do direct search
-            return (self.filter(cand_restriction & type_restriction & (
-                Q(db_key__iexact=ostring) | Q(db_tags__db_key__iexact=ostring) & Q(
-                    db_tags__db_tagtype__iexact="alias")))).distinct().order_by('id')
+            return (
+                (
+                    self.filter(
+                        cand_restriction
+                        & type_restriction
+                        & (
+                            Q(db_key__iexact=ostring)
+                            | Q(db_tags__db_key__iexact=ostring)
+                            & Q(db_tags__db_tagtype__iexact="alias")
+                        )
+                    )
+                )
+                .distinct()
+                .order_by("id")
+            )
         elif candidates:
             # fuzzy with candidates
-            search_candidates = self.filter(cand_restriction & type_restriction).distinct().order_by('id')
+            search_candidates = (
+                self.filter(cand_restriction & type_restriction).distinct().order_by("id")
+            )
         else:
             # fuzzy without supplied candidates - we select our own candidates
-            search_candidates = self.filter(type_restriction & (Q(db_key__istartswith=ostring) |
-                                                                Q(db_tags__db_key__istartswith=ostring))).distinct().order_by('id')
+            search_candidates = (
+                self.filter(
+                    type_restriction
+                    & (Q(db_key__istartswith=ostring) | Q(db_tags__db_key__istartswith=ostring))
+                )
+                .distinct()
+                .order_by("id")
+            )
         # fuzzy matching
         key_strings = search_candidates.values_list("db_key", flat=True).order_by("id")
 
@@ -284,8 +348,9 @@ def get_objs_with_key_or_alias(self, ostring, exact=True,
             return [obj for ind, obj in enumerate(search_candidates) if ind in index_matches]
         else:
             # match by alias rather than by key
-            search_candidates = search_candidates.filter(db_tags__db_tagtype__iexact="alias",
-                                                         db_tags__db_key__icontains=ostring).distinct()
+            search_candidates = search_candidates.filter(
+                db_tags__db_tagtype__iexact="alias", db_tags__db_key__icontains=ostring
+            ).distinct()
             alias_strings = []
             alias_candidates = []
             # TODO create the alias_strings and alias_candidates lists more efficiently?
@@ -301,12 +366,15 @@ def get_objs_with_key_or_alias(self, ostring, exact=True,
 
     # main search methods and helper functions
 
-    def search_object(self, searchdata,
-                      attribute_name=None,
-                      typeclass=None,
-                      candidates=None,
-                      exact=True,
-                      use_dbref=True):
+    def search_object(
+        self,
+        searchdata,
+        attribute_name=None,
+        typeclass=None,
+        candidates=None,
+        exact=True,
+        use_dbref=True,
+    ):
         """
         Search as an object globally or in a list of candidates and
         return results. The result is always an Object. Always returns
@@ -346,6 +414,7 @@ def search_object(self, searchdata,
             matches (list): Matching objects
 
         """
+
         def _searcher(searchdata, candidates, typeclass, exact=False):
             """
             Helper method for searching objects. `typeclass` is only used
@@ -353,16 +422,19 @@ def _searcher(searchdata, candidates, typeclass, exact=False):
             """
             if attribute_name:
                 # attribute/property search (always exact).
-                matches = self.get_objs_with_db_property_value(attribute_name, searchdata,
-                                                               candidates=candidates, typeclasses=typeclass)
+                matches = self.get_objs_with_db_property_value(
+                    attribute_name, searchdata, candidates=candidates, typeclasses=typeclass
+                )
                 if matches:
                     return matches
-                return self.get_objs_with_attr_value(attribute_name, searchdata,
-                                                     candidates=candidates, typeclasses=typeclass)
+                return self.get_objs_with_attr_value(
+                    attribute_name, searchdata, candidates=candidates, typeclasses=typeclass
+                )
             else:
                 # normal key/alias search
-                return self.get_objs_with_key_or_alias(searchdata, exact=exact,
-                                                       candidates=candidates, typeclasses=typeclass)
+                return self.get_objs_with_key_or_alias(
+                    searchdata, exact=exact, candidates=candidates, typeclasses=typeclass
+                )
 
         if not searchdata and searchdata != 0:
             return []
@@ -384,8 +456,9 @@ def _searcher(searchdata, candidates, typeclass, exact=False):
             # Convenience check to make sure candidates are really dbobjs
             candidates = [cand for cand in make_iter(candidates) if cand]
             if typeclass:
-                candidates = [cand for cand in candidates
-                              if _GA(cand, "db_typeclass_path") in typeclass]
+                candidates = [
+                    cand for cand in candidates if _GA(cand, "db_typeclass_path") in typeclass
+                ]
 
         dbref = not attribute_name and exact and use_dbref and self.dbref(searchdata)
         if dbref:
@@ -426,6 +499,7 @@ def _searcher(searchdata, candidates, typeclass, exact=False):
                 pass
         # return a list (possibly empty)
         return matches
+
     # alias for backwards compatibility
     object_search = search_object
     search = search_object
@@ -433,10 +507,17 @@ def _searcher(searchdata, candidates, typeclass, exact=False):
     #
     # ObjectManager Copy method
 
-    def copy_object(self, original_object, new_key=None,
-                    new_location=None, new_home=None,
-                    new_permissions=None, new_locks=None,
-                    new_aliases=None, new_destination=None):
+    def copy_object(
+        self,
+        original_object,
+        new_key=None,
+        new_location=None,
+        new_home=None,
+        new_permissions=None,
+        new_locks=None,
+        new_aliases=None,
+        new_destination=None,
+    ):
         """
         Create and return a new object as a copy of the original object. All
         will be identical to the original except for the arguments given
@@ -479,14 +560,17 @@ def copy_object(self, original_object, new_key=None,
         # create new object
         from evennia.utils import create
         from evennia.scripts.models import ScriptDB
-        new_object = create.create_object(typeclass_path,
-                                          key=new_key,
-                                          location=new_location,
-                                          home=new_home,
-                                          permissions=new_permissions,
-                                          locks=new_locks,
-                                          aliases=new_aliases,
-                                          destination=new_destination)
+
+        new_object = create.create_object(
+            typeclass_path,
+            key=new_key,
+            location=new_location,
+            home=new_home,
+            permissions=new_permissions,
+            locks=new_locks,
+            aliases=new_aliases,
+            destination=new_destination,
+        )
         if not new_object:
             return None
 
@@ -507,7 +591,7 @@ def copy_object(self, original_object, new_key=None,
 
         # copy over all tags, if any
         for tag in original_object.tags.get(return_tagobj=True, return_list=True):
-            new_object.tags.add(tag=tag.key, category=tag.category, data=tag.data)
+            new_object.tags.add(tag=tag.db_key, category=tag.db_category, data=tag.db_data)
 
         return new_object
 
diff --git a/evennia/objects/migrations/0001_initial.py b/evennia/objects/migrations/0001_initial.py
index a3b299b6a55..610b11beb7f 100644
--- a/evennia/objects/migrations/0001_initial.py
+++ b/evennia/objects/migrations/0001_initial.py
@@ -7,30 +7,103 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0002_auto_20150109_0913'),
-    ]
+    dependencies = [("typeclasses", "0002_auto_20150109_0913")]
 
     operations = [
         migrations.CreateModel(
-            name='ObjectDB',
+            name="ObjectDB",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(max_length=255, verbose_name='key', db_index=True)),
-                ('db_typeclass_path', models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass')),
-                ('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
-                ('db_lock_storage', models.TextField(help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks', blank=True)),
-                ('db_sessid', models.CommaSeparatedIntegerField(help_text='csv list of session ids of connected Account, if any.', max_length=32, null=True, verbose_name='session id')),
-                ('db_cmdset_storage', models.CharField(help_text='optional python path to a cmdset class.', max_length=255, null=True, verbose_name='cmdset', blank=True)),
-                ('db_attributes', models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)),
-                ('db_destination', models.ForeignKey(related_name='destinations_set', on_delete=django.db.models.deletion.SET_NULL, blank=True, to='objects.ObjectDB', help_text='a destination, used only by exit objects.', null=True, verbose_name='destination')),
-                ('db_home', models.ForeignKey(related_name='homes_set', on_delete=django.db.models.deletion.SET_NULL, verbose_name='home location', blank=True, to='objects.ObjectDB', null=True)),
-                ('db_location', models.ForeignKey(related_name='locations_set', on_delete=django.db.models.deletion.SET_NULL, verbose_name='game location', blank=True, to='objects.ObjectDB', null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                ("db_key", models.CharField(max_length=255, verbose_name="key", db_index=True)),
+                (
+                    "db_typeclass_path",
+                    models.CharField(
+                        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                        max_length=255,
+                        null=True,
+                        verbose_name="typeclass",
+                    ),
+                ),
+                (
+                    "db_date_created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                        verbose_name="locks",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_sessid",
+                    models.CommaSeparatedIntegerField(
+                        help_text="csv list of session ids of connected Account, if any.",
+                        max_length=32,
+                        null=True,
+                        verbose_name="session id",
+                    ),
+                ),
+                (
+                    "db_cmdset_storage",
+                    models.CharField(
+                        help_text="optional python path to a cmdset class.",
+                        max_length=255,
+                        null=True,
+                        verbose_name="cmdset",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_attributes",
+                    models.ManyToManyField(
+                        help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                        to="typeclasses.Attribute",
+                        null=True,
+                    ),
+                ),
+                (
+                    "db_destination",
+                    models.ForeignKey(
+                        related_name="destinations_set",
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        blank=True,
+                        to="objects.ObjectDB",
+                        help_text="a destination, used only by exit objects.",
+                        null=True,
+                        verbose_name="destination",
+                    ),
+                ),
+                (
+                    "db_home",
+                    models.ForeignKey(
+                        related_name="homes_set",
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        verbose_name="home location",
+                        blank=True,
+                        to="objects.ObjectDB",
+                        null=True,
+                    ),
+                ),
+                (
+                    "db_location",
+                    models.ForeignKey(
+                        related_name="locations_set",
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        verbose_name="game location",
+                        blank=True,
+                        to="objects.ObjectDB",
+                        null=True,
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Object',
-                'verbose_name_plural': 'Objects',
-            },
+            options={"verbose_name": "Object", "verbose_name_plural": "Objects"},
             bases=(models.Model,),
-        ),
+        )
     ]
diff --git a/evennia/objects/migrations/0002_auto_20140917_0756.py b/evennia/objects/migrations/0002_auto_20140917_0756.py
index 785e19e1200..5cfafc720d0 100644
--- a/evennia/objects/migrations/0002_auto_20140917_0756.py
+++ b/evennia/objects/migrations/0002_auto_20140917_0756.py
@@ -9,22 +9,32 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('objects', '0001_initial'),
+        ("objects", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('typeclasses', '0001_initial'),
+        ("typeclasses", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='objectdb',
-            name='db_account',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.SET_NULL, verbose_name='account', to=settings.AUTH_USER_MODEL, help_text='an Account connected to this object, if any.', null=True),
+            model_name="objectdb",
+            name="db_account",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.SET_NULL,
+                verbose_name="account",
+                to=settings.AUTH_USER_MODEL,
+                help_text="an Account connected to this object, if any.",
+                null=True,
+            ),
             preserve_default=True,
         ),
         migrations.AddField(
-            model_name='objectdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True),
+            model_name="objectdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+                null=True,
+            ),
             preserve_default=True,
         ),
     ]
diff --git a/evennia/objects/migrations/0003_defaultcharacter_defaultexit_defaultobject_defaultroom.py b/evennia/objects/migrations/0003_defaultcharacter_defaultexit_defaultobject_defaultroom.py
index c69ac070d19..e53a616a076 100644
--- a/evennia/objects/migrations/0003_defaultcharacter_defaultexit_defaultobject_defaultroom.py
+++ b/evennia/objects/migrations/0003_defaultcharacter_defaultexit_defaultobject_defaultroom.py
@@ -6,45 +6,22 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0002_auto_20140917_0756'),
-    ]
+    dependencies = [("objects", "0002_auto_20140917_0756")]
 
     operations = [
         migrations.CreateModel(
-            name='DefaultObject',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('objects.objectdb',),
+            name="DefaultObject", fields=[], options={"proxy": True}, bases=("objects.objectdb",)
         ),
         migrations.CreateModel(
-            name='DefaultExit',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('objects.defaultobject',),
+            name="DefaultExit", fields=[], options={"proxy": True}, bases=("objects.defaultobject",)
         ),
         migrations.CreateModel(
-            name='DefaultCharacter',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('objects.defaultobject',),
+            name="DefaultCharacter",
+            fields=[],
+            options={"proxy": True},
+            bases=("objects.defaultobject",),
         ),
         migrations.CreateModel(
-            name='DefaultRoom',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('objects.defaultobject',),
+            name="DefaultRoom", fields=[], options={"proxy": True}, bases=("objects.defaultobject",)
         ),
     ]
diff --git a/evennia/objects/migrations/0004_auto_20150118_1622.py b/evennia/objects/migrations/0004_auto_20150118_1622.py
index 640b5e93861..b77d5fdfa83 100644
--- a/evennia/objects/migrations/0004_auto_20150118_1622.py
+++ b/evennia/objects/migrations/0004_auto_20150118_1622.py
@@ -13,10 +13,6 @@ def convert_defaults(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0003_defaultcharacter_defaultexit_defaultobject_defaultroom'),
-    ]
+    dependencies = [("objects", "0003_defaultcharacter_defaultexit_defaultobject_defaultroom")]
 
-    operations = [
-        migrations.RunPython(convert_defaults),
-    ]
+    operations = [migrations.RunPython(convert_defaults)]
diff --git a/evennia/objects/migrations/0005_auto_20150403_2339.py b/evennia/objects/migrations/0005_auto_20150403_2339.py
index 4b0521128e5..592a0aa08af 100644
--- a/evennia/objects/migrations/0005_auto_20150403_2339.py
+++ b/evennia/objects/migrations/0005_auto_20150403_2339.py
@@ -6,21 +6,11 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0004_auto_20150118_1622'),
-    ]
+    dependencies = [("objects", "0004_auto_20150118_1622")]
 
     operations = [
-        migrations.DeleteModel(
-            name='DefaultCharacter',
-        ),
-        migrations.DeleteModel(
-            name='DefaultExit',
-        ),
-        migrations.DeleteModel(
-            name='DefaultObject',
-        ),
-        migrations.DeleteModel(
-            name='DefaultRoom',
-        ),
+        migrations.DeleteModel(name="DefaultCharacter"),
+        migrations.DeleteModel(name="DefaultExit"),
+        migrations.DeleteModel(name="DefaultObject"),
+        migrations.DeleteModel(name="DefaultRoom"),
     ]
diff --git a/evennia/objects/migrations/0006_auto_20170606_1731.py b/evennia/objects/migrations/0006_auto_20170606_1731.py
index 9b672fcb686..6128e4fe355 100644
--- a/evennia/objects/migrations/0006_auto_20170606_1731.py
+++ b/evennia/objects/migrations/0006_auto_20170606_1731.py
@@ -9,24 +9,40 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0005_auto_20150403_2339'),
-    ]
+    dependencies = [("objects", "0005_auto_20150403_2339")]
 
     operations = [
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="objectdb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_sessid',
-            field=models.CharField(help_text='csv list of session ids of connected Account, if any.', max_length=32, null=True, validators=[django.core.validators.RegexValidator(re.compile('^\\d+(?:\\,\\d+)*\\Z'), code='invalid', message='Enter only digits separated by commas.')], verbose_name='session id'),
+            model_name="objectdb",
+            name="db_sessid",
+            field=models.CharField(
+                help_text="csv list of session ids of connected Account, if any.",
+                max_length=32,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        re.compile("^\\d+(?:\\,\\d+)*\\Z"),
+                        code="invalid",
+                        message="Enter only digits separated by commas.",
+                    )
+                ],
+                verbose_name="session id",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="objectdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
     ]
diff --git a/evennia/objects/migrations/0007_objectdb_db_account.py b/evennia/objects/migrations/0007_objectdb_db_account.py
index dae9100d350..aabc238a8b0 100644
--- a/evennia/objects/migrations/0007_objectdb_db_account.py
+++ b/evennia/objects/migrations/0007_objectdb_db_account.py
@@ -14,8 +14,8 @@ def _table_exists(db_cursor, tablename):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0007_copy_player_to_account'),
-        ('objects', '0006_auto_20170606_1731'),
+        ("accounts", "0007_copy_player_to_account"),
+        ("objects", "0006_auto_20170606_1731"),
     ]
 
     db_cursor = connection.cursor()
@@ -25,8 +25,14 @@ class Migration(migrations.Migration):
         # here we are not starting from scratch.
         operations = [
             migrations.AddField(
-                model_name='objectdb',
-                name='db_account',
-                field=models.ForeignKey(help_text='an Account connected to this object, if any.', null=True, on_delete=django.db.models.deletion.SET_NULL, to='accounts.AccountDB', verbose_name='account'),
-            ),
+                model_name="objectdb",
+                name="db_account",
+                field=models.ForeignKey(
+                    help_text="an Account connected to this object, if any.",
+                    null=True,
+                    on_delete=django.db.models.deletion.SET_NULL,
+                    to="accounts.AccountDB",
+                    verbose_name="account",
+                ),
+            )
         ]
diff --git a/evennia/objects/migrations/0008_auto_20170705_1736.py b/evennia/objects/migrations/0008_auto_20170705_1736.py
index 355a3399104..deb5fcc59b0 100644
--- a/evennia/objects/migrations/0008_auto_20170705_1736.py
+++ b/evennia/objects/migrations/0008_auto_20170705_1736.py
@@ -8,26 +8,22 @@
 def forwards(apps, schema_editor):
 
     try:
-        apps.get_model('accounts', 'AccountDB')
+        apps.get_model("accounts", "AccountDB")
     except LookupError:
         return
-    AccountDB = apps.get_model('accounts', 'AccountDB')
-    ObjectDB = apps.get_model('objects', 'ObjectDB')
+    AccountDB = apps.get_model("accounts", "AccountDB")
+    ObjectDB = apps.get_model("objects", "ObjectDB")
 
     for object in ObjectDB.objects.all():
         account = object.db_account
         if account:
             account = AccountDB.objects.get(id=account.id)
             object.db_account = account
-            object.save(update_fields=['db_account'])
+            object.save(update_fields=["db_account"])
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0007_objectdb_db_account'),
-    ]
+    dependencies = [("objects", "0007_objectdb_db_account")]
 
-    operations = [
-        migrations.RunPython(forwards)
-    ]
+    operations = [migrations.RunPython(forwards)]
diff --git a/evennia/objects/migrations/0009_remove_objectdb_db_player.py b/evennia/objects/migrations/0009_remove_objectdb_db_player.py
index 403b072dfea..4572057410d 100644
--- a/evennia/objects/migrations/0009_remove_objectdb_db_player.py
+++ b/evennia/objects/migrations/0009_remove_objectdb_db_player.py
@@ -12,9 +12,7 @@ def _table_exists(db_cursor, tablename):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0008_auto_20170705_1736'),
-    ]
+    dependencies = [("objects", "0008_auto_20170705_1736")]
 
     db_cursor = connection.cursor()
 
@@ -22,9 +20,4 @@ class Migration(migrations.Migration):
         # OBS - this is run BEFORE migrations are run!
         operations = []
     else:
-        operations = [
-            migrations.RemoveField(
-                model_name='objectdb',
-                name='db_player',
-            ),
-        ]
+        operations = [migrations.RemoveField(model_name="objectdb", name="db_player")]
diff --git a/evennia/objects/migrations/0010_auto_20190128_1820.py b/evennia/objects/migrations/0010_auto_20190128_1820.py
index 3b23d72e58e..ea0396acb4c 100644
--- a/evennia/objects/migrations/0010_auto_20190128_1820.py
+++ b/evennia/objects/migrations/0010_auto_20190128_1820.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 18:20
-from __future__ import unicode_literals
 
 from django.conf import settings
 import django.core.validators
@@ -11,69 +10,128 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('objects', '0009_remove_objectdb_db_player'),
-    ]
+    dependencies = [("objects", "0009_remove_objectdb_db_player")]
 
     operations = [
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_account',
-            field=models.ForeignKey(help_text='an Account connected to this object, if any.', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='account'),
+            model_name="objectdb",
+            name="db_account",
+            field=models.ForeignKey(
+                help_text="an Account connected to this object, if any.",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="account",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="objectdb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_cmdset_storage',
-            field=models.CharField(blank=True, help_text='optional python path to a cmdset class.', max_length=255, null=True, verbose_name='cmdset'),
+            model_name="objectdb",
+            name="db_cmdset_storage",
+            field=models.CharField(
+                blank=True,
+                help_text="optional python path to a cmdset class.",
+                max_length=255,
+                null=True,
+                verbose_name="cmdset",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='creation date'),
+            model_name="objectdb",
+            name="db_date_created",
+            field=models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_destination',
-            field=models.ForeignKey(blank=True, help_text='a destination, used only by exit objects.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='destinations_set', to='objects.ObjectDB', verbose_name='destination'),
+            model_name="objectdb",
+            name="db_destination",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="a destination, used only by exit objects.",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="destinations_set",
+                to="objects.ObjectDB",
+                verbose_name="destination",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_home',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='homes_set', to='objects.ObjectDB', verbose_name='home location'),
+            model_name="objectdb",
+            name="db_home",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="homes_set",
+                to="objects.ObjectDB",
+                verbose_name="home location",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_key',
-            field=models.CharField(db_index=True, max_length=255, verbose_name='key'),
+            model_name="objectdb",
+            name="db_key",
+            field=models.CharField(db_index=True, max_length=255, verbose_name="key"),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_location',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='locations_set', to='objects.ObjectDB', verbose_name='game location'),
+            model_name="objectdb",
+            name="db_location",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="locations_set",
+                to="objects.ObjectDB",
+                verbose_name="game location",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks'),
+            model_name="objectdb",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True,
+                help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                verbose_name="locks",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_sessid',
-            field=models.CharField(help_text='csv list of session ids of connected Account, if any.', max_length=32, null=True, validators=[django.core.validators.RegexValidator(re.compile('^\\d+(?:\\,\\d+)*\\Z', 32), code='invalid', message='Enter only digits separated by commas.')], verbose_name='session id'),
+            model_name="objectdb",
+            name="db_sessid",
+            field=models.CharField(
+                help_text="csv list of session ids of connected Account, if any.",
+                max_length=32,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        re.compile("^\\d+(?:\\,\\d+)*\\Z", 32),
+                        code="invalid",
+                        message="Enter only digits separated by commas.",
+                    )
+                ],
+                verbose_name="session id",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="objectdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
         migrations.AlterField(
-            model_name='objectdb',
-            name='db_typeclass_path',
-            field=models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass'),
+            model_name="objectdb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
         ),
     ]
diff --git a/evennia/objects/migrations/0011_auto_20191025_0831.py b/evennia/objects/migrations/0011_auto_20191025_0831.py
new file mode 100644
index 00000000000..98d61b87978
--- /dev/null
+++ b/evennia/objects/migrations/0011_auto_20191025_0831.py
@@ -0,0 +1,41 @@
+# Generated by Django 2.2.6 on 2019-10-25 12:31
+
+import django.core.validators
+from django.db import migrations, models
+import re
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("objects", "0010_auto_20190128_1820")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="objectdb",
+            name="db_sessid",
+            field=models.CharField(
+                help_text="csv list of session ids of connected Account, if any.",
+                max_length=32,
+                null=True,
+                validators=[
+                    django.core.validators.RegexValidator(
+                        re.compile("^\\d+(?:,\\d+)*\\Z"),
+                        code="invalid",
+                        message="Enter only digits separated by commas.",
+                    )
+                ],
+                verbose_name="session id",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="objectdb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                db_index=True,
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
+        ),
+    ]
diff --git a/evennia/objects/models.py b/evennia/objects/models.py
index 884cc28d809..f9e7799d48b 100644
--- a/evennia/objects/models.py
+++ b/evennia/objects/models.py
@@ -13,8 +13,6 @@
 the database object. Like everything else, they can be accessed
 transparently through the decorating TypeClass.
 """
-from builtins import object
-
 from django.conf import settings
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
@@ -23,7 +21,7 @@
 from evennia.typeclasses.models import TypedObject
 from evennia.objects.manager import ObjectDBManager
 from evennia.utils import logger
-from evennia.utils.utils import (make_iter, dbref, lazy_property)
+from evennia.utils.utils import make_iter, dbref, lazy_property
 
 
 class ContentsHandler(object):
@@ -53,7 +51,9 @@ def init(self):
         Re-initialize the content cache
 
         """
-        self._pkcache.update(dict((obj.pk, None) for obj in ObjectDB.objects.filter(db_location=self.obj) if obj.pk))
+        self._pkcache.update(
+            dict((obj.pk, None) for obj in ObjectDB.objects.filter(db_location=self.obj) if obj.pk)
+        )
 
     def get(self, exclude=None):
         """
@@ -111,6 +111,7 @@ def clear(self):
         self._pkcache = {}
         self.init()
 
+
 # -------------------------------------------------------------
 #
 # ObjectDB
@@ -156,6 +157,7 @@ class ObjectDB(TypedObject):
       - exits - exits from this object
 
     """
+
     #
     # ObjectDB Database model setup
     #
@@ -171,29 +173,62 @@ class ObjectDB(TypedObject):
     # will automatically save and cache the data more efficiently.
 
     # If this is a character object, the account is connected here.
-    db_account = models.ForeignKey("accounts.AccountDB", null=True, verbose_name='account', on_delete=models.SET_NULL,
-                                   help_text='an Account connected to this object, if any.')
+    db_account = models.ForeignKey(
+        "accounts.AccountDB",
+        null=True,
+        verbose_name="account",
+        on_delete=models.SET_NULL,
+        help_text="an Account connected to this object, if any.",
+    )
 
     # the session id associated with this account, if any
-    db_sessid = models.CharField(null=True, max_length=32, validators=[validate_comma_separated_integer_list],
-                                 verbose_name="session id",
-                                 help_text="csv list of session ids of connected Account, if any.")
+    db_sessid = models.CharField(
+        null=True,
+        max_length=32,
+        validators=[validate_comma_separated_integer_list],
+        verbose_name="session id",
+        help_text="csv list of session ids of connected Account, if any.",
+    )
     # The location in the game world. Since this one is likely
     # to change often, we set this with the 'location' property
     # to transparently handle Typeclassing.
-    db_location = models.ForeignKey('self', related_name="locations_set", db_index=True, on_delete=models.SET_NULL,
-                                    blank=True, null=True, verbose_name='game location')
+    db_location = models.ForeignKey(
+        "self",
+        related_name="locations_set",
+        db_index=True,
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+        verbose_name="game location",
+    )
     # a safety location, this usually don't change much.
-    db_home = models.ForeignKey('self', related_name="homes_set", on_delete=models.SET_NULL,
-                                blank=True, null=True, verbose_name='home location')
+    db_home = models.ForeignKey(
+        "self",
+        related_name="homes_set",
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+        verbose_name="home location",
+    )
     # destination of this object - primarily used by exits.
-    db_destination = models.ForeignKey('self', related_name="destinations_set",
-                                       db_index=True, on_delete=models.SET_NULL,
-                                       blank=True, null=True, verbose_name='destination',
-                                       help_text='a destination, used only by exit objects.')
+    db_destination = models.ForeignKey(
+        "self",
+        related_name="destinations_set",
+        db_index=True,
+        on_delete=models.SET_NULL,
+        blank=True,
+        null=True,
+        verbose_name="destination",
+        help_text="a destination, used only by exit objects.",
+    )
     # database storage of persistant cmdsets.
-    db_cmdset_storage = models.CharField('cmdset', max_length=255, null=True, blank=True,
-                                         help_text="optional python path to a cmdset class.")
+    db_cmdset_storage = models.CharField(
+        "cmdset",
+        max_length=255,
+        null=True,
+        blank=True,
+        help_text="optional python path to a cmdset class.",
+    )
 
     # Database manager
     objects = ObjectDBManager()
@@ -211,7 +246,7 @@ def contents_cache(self):
     def __cmdset_storage_get(self):
         """getter"""
         storage = self.db_cmdset_storage
-        return [path.strip() for path in storage.split(',')] if storage else []
+        return [path.strip() for path in storage.split(",")] if storage else []
 
     def __cmdset_storage_set(self, value):
         """setter"""
@@ -222,6 +257,7 @@ def __cmdset_storage_del(self):
         """deleter"""
         self.db_cmdset_storage = None
         self.save(update_fields=["db_cmdset_storage"])
+
     cmdset_storage = property(__cmdset_storage_get, __cmdset_storage_set, __cmdset_storage_del)
 
     # location getsetter
@@ -241,6 +277,7 @@ def __location_set(self, location):
                     # maybe it is just a name that happens to look like a dbid
                     pass
         try:
+
             def is_loc_loop(loc, depth=0):
                 """Recursively traverse target location, trying to catch a loop."""
                 if depth > 10:
@@ -250,6 +287,7 @@ def is_loc_loop(loc, depth=0):
                 elif loc is None:
                     raise RuntimeWarning
                 return is_loc_loop(loc.db_location, depth + 1)
+
             try:
                 is_loc_loop(location)
             except RuntimeWarning:
@@ -289,6 +327,7 @@ def __location_del(self):
         """Cleanly delete the location reference"""
         self.db_location = None
         self.save(update_fields=["db_location"])
+
     location = property(__location_get, __location_set, __location_del)
 
     def at_db_location_postsave(self, new):
@@ -312,10 +351,13 @@ def at_db_location_postsave(self, new):
             else:
                 # Since we cannot know at this point was old_location was, we
                 # trigger a full-on contents_cache update here.
-                logger.log_warn("db_location direct save triggered contents_cache.init() for all objects!")
+                logger.log_warn(
+                    "db_location direct save triggered contents_cache.init() for all objects!"
+                )
                 [o.contents_cache.init() for o in self.__dbclass__.get_all_cached_instances()]
 
     class Meta(object):
         """Define Django meta options"""
+
         verbose_name = "Object"
         verbose_name_plural = "Objects"
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index d908cc0b66d..43c2dcc6fe9 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -7,8 +7,6 @@
 """
 import time
 import inflect
-from builtins import object
-from future.utils import with_metaclass
 from collections import defaultdict
 
 from django.conf import settings
@@ -25,9 +23,14 @@
 from evennia.utils import search
 from evennia.utils import logger
 from evennia.utils import ansi
-from evennia.utils.utils import (variable_from_module, lazy_property,
-                                 make_iter, is_iter, list_to_string,
-                                 to_str)
+from evennia.utils.utils import (
+    variable_from_module,
+    lazy_property,
+    make_iter,
+    is_iter,
+    list_to_string,
+    to_str,
+)
 from django.utils.translation import ugettext as _
 
 _INFLECT = inflect.engine()
@@ -36,7 +39,7 @@
 _ScriptDB = None
 _SESSIONS = None
 
-_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit('.', 1))
+_AT_SEARCH_RESULT = variable_from_module(*settings.SEARCH_AT_RESULT.rsplit(".", 1))
 # the sessid_max is based on the length of the db_sessid csv field (excluding commas)
 _SESSID_MAX = 16 if _MULTISESSION_MODE in (1, 3) else 1
 
@@ -63,7 +66,9 @@ def _recache(self):
         global _SESSIONS
         if not _SESSIONS:
             from evennia.server.sessionhandler import SESSIONS as _SESSIONS
-        self._sessid_cache = list(set(int(val) for val in (self.obj.db_sessid or "").split(",") if val))
+        self._sessid_cache = list(
+            set(int(val) for val in (self.obj.db_sessid or "").split(",") if val)
+        )
         if any(sessid for sessid in self._sessid_cache if sessid not in _SESSIONS):
             # cache is out of sync with sessionhandler! Only retain the ones in the handler.
             self._sessid_cache = [sessid for sessid in self._sessid_cache if sessid in _SESSIONS]
@@ -89,9 +94,15 @@ def get(self, sessid=None):
         if not _SESSIONS:
             from evennia.server.sessionhandler import SESSIONS as _SESSIONS
         if sessid:
-            sessions = [_SESSIONS[sessid] if sessid in _SESSIONS else None] if sessid in self._sessid_cache else []
+            sessions = (
+                [_SESSIONS[sessid] if sessid in _SESSIONS else None]
+                if sessid in self._sessid_cache
+                else []
+            )
         else:
-            sessions = [_SESSIONS[ssid] if ssid in _SESSIONS else None for ssid in self._sessid_cache]
+            sessions = [
+                _SESSIONS[ssid] if ssid in _SESSIONS else None for ssid in self._sessid_cache
+            ]
         if None in sessions:
             # this happens only if our cache has gone out of sync with the SessionHandler.
             self._recache()
@@ -179,7 +190,7 @@ def count(self):
 # Base class to inherit from.
 
 
-class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
+class DefaultObject(ObjectDB, metaclass=TypeclassBase):
     """
     This is the root typeclass object, representing all entities that
     have an actual presence in-game. DefaultObjects generally have a
@@ -192,9 +203,10 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
     without `obj.save()` having to be called explicitly.
 
     """
+
     # lockstring of newly created objects, for easy overloading.
     # Will be formatted with the appropriate attributes.
-    lockstring = "control:id({account_id}) or perm(Admin);delete:id({account_id}) or perm(Admin)"
+    lockstring = "control:id({account_id}) or perm(Admin);" "delete:id({account_id}) or perm(Admin)"
 
     objects = ObjectManager()
 
@@ -239,8 +251,11 @@ def is_superuser(self):
         Check if user has an account, and if so, if it is a superuser.
 
         """
-        return self.db_account and self.db_account.is_superuser \
+        return (
+            self.db_account
+            and self.db_account.is_superuser
             and not self.db_account.attributes.get("_quell")
+        )
 
     def contents_get(self, exclude=None):
         """
@@ -265,8 +280,10 @@ def contents_get(self, exclude=None):
 
     def contents_set(self, *args):
         "You cannot replace this property"
-        raise AttributeError("{}.contents is read-only. Use obj.move_to or "
-                             "obj.location to move an object here.".format(self.__class__))
+        raise AttributeError(
+            "{}.contents is read-only. Use obj.move_to or "
+            "obj.location to move an object here.".format(self.__class__)
+        )
 
     contents = property(contents_get, contents_set, contents_set)
 
@@ -336,18 +353,21 @@ def get_numbered_name(self, count, looker, **kwargs):
             self.aliases.add(singular, category="plural_key")
         return singular, plural
 
-    def search(self, searchdata,
-               global_search=False,
-               use_nicks=True,
-               typeclass=None,
-               location=None,
-               attribute_name=None,
-               quiet=False,
-               exact=False,
-               candidates=None,
-               nofound_string=None,
-               multimatch_string=None,
-               use_dbref=None):
+    def search(
+        self,
+        searchdata,
+        global_search=False,
+        use_nicks=True,
+        typeclass=None,
+        location=None,
+        attribute_name=None,
+        quiet=False,
+        exact=False,
+        candidates=None,
+        nofound_string=None,
+        multimatch_string=None,
+        use_dbref=None,
+    ):
         """
         Returns an Object matching a search string/condition
 
@@ -418,12 +438,11 @@ def search(self, searchdata,
         """
         is_string = isinstance(searchdata, str)
 
-
         if is_string:
             # searchdata is a string; wrap some common self-references
-            if searchdata.lower() in ("here", ):
+            if searchdata.lower() in ("here",):
                 return [self.location] if quiet else self.location
-            if searchdata.lower() in ("me", "self",):
+            if searchdata.lower() in ("me", "self"):
                 return [self] if quiet else self
 
         if use_dbref is None:
@@ -431,10 +450,16 @@ def search(self, searchdata,
 
         if use_nicks:
             # do nick-replacement on search
-            searchdata = self.nicks.nickreplace(searchdata, categories=("object", "account"), include_account=True)
-
-        if (global_search or (is_string and searchdata.startswith("#") and
-                              len(searchdata) > 1 and searchdata[1:].isdigit())):
+            searchdata = self.nicks.nickreplace(
+                searchdata, categories=("object", "account"), include_account=True
+            )
+
+        if global_search or (
+            is_string
+            and searchdata.startswith("#")
+            and len(searchdata) > 1
+            and searchdata[1:].isdigit()
+        ):
             # only allow exact matching if searching the entire database
             # or unique #dbrefs
             exact = True
@@ -460,17 +485,24 @@ def search(self, searchdata,
                     # included in location.contents
                     candidates.append(self)
 
-        results = ObjectDB.objects.object_search(searchdata,
-                                                 attribute_name=attribute_name,
-                                                 typeclass=typeclass,
-                                                 candidates=candidates,
-                                                 exact=exact,
-                                                 use_dbref=use_dbref)
+        results = ObjectDB.objects.object_search(
+            searchdata,
+            attribute_name=attribute_name,
+            typeclass=typeclass,
+            candidates=candidates,
+            exact=exact,
+            use_dbref=use_dbref,
+        )
 
         if quiet:
             return results
-        return _AT_SEARCH_RESULT(results, self, query=searchdata,
-                                 nofound_string=nofound_string, multimatch_string=multimatch_string)
+        return _AT_SEARCH_RESULT(
+            results,
+            self,
+            query=searchdata,
+            nofound_string=nofound_string,
+            multimatch_string=multimatch_string,
+        )
 
     def search_account(self, searchdata, quiet=False):
         """
@@ -498,7 +530,7 @@ def search_account(self, searchdata, quiet=False):
         """
         if isinstance(searchdata, str):
             # searchdata is a string; wrap some common self-references
-            if searchdata.lower() in ("me", "self",):
+            if searchdata.lower() in ("me", "self"):
                 return [self.account] if quiet else self.account
 
         results = search.search_account(searchdata)
@@ -539,8 +571,12 @@ def execute_cmd(self, raw_string, session=None, **kwargs):
         """
         # nick replacement - we require full-word matching.
         # do text encoding conversion
-        raw_string = self.nicks.nickreplace(raw_string, categories=("inputline", "channel"), include_account=True)
-        return cmdhandler.cmdhandler(self, raw_string, callertype="object", session=session, **kwargs)
+        raw_string = self.nicks.nickreplace(
+            raw_string, categories=("inputline", "channel"), include_account=True
+        )
+        return cmdhandler.cmdhandler(
+            self, raw_string, callertype="object", session=session, **kwargs
+        )
 
     def msg(self, text=None, from_obj=None, session=None, options=None, **kwargs):
         """
@@ -593,14 +629,13 @@ def msg(self, text=None, from_obj=None, session=None, options=None, **kwargs):
                     text = to_str(text)
                 except Exception:
                     text = repr(text)
-            kwargs['text'] = text
+            kwargs["text"] = text
 
         # relay to session(s)
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
             session.data_out(**kwargs)
 
-
     def for_contents(self, func, exclude=None, **kwargs):
         """
         Runs a function on every object contained within this one.
@@ -681,17 +716,25 @@ def msg_contents(self, text=None, exclude=None, from_obj=None, mapping=None, **k
             contents = [obj for obj in contents if obj not in exclude]
         for obj in contents:
             if mapping:
-                substitutions = {t: sub.get_display_name(obj)
-                                 if hasattr(sub, 'get_display_name')
-                                 else str(sub) for t, sub in mapping.items()}
+                substitutions = {
+                    t: sub.get_display_name(obj) if hasattr(sub, "get_display_name") else str(sub)
+                    for t, sub in mapping.items()
+                }
                 outmessage = inmessage.format(**substitutions)
             else:
                 outmessage = inmessage
             obj.msg(text=(outmessage, outkwargs), from_obj=from_obj, **kwargs)
 
-    def move_to(self, destination, quiet=False,
-                emit_to_obj=None, use_destination=True, to_none=False, move_hooks=True,
-                **kwargs):
+    def move_to(
+        self,
+        destination,
+        quiet=False,
+        emit_to_obj=None,
+        use_destination=True,
+        to_none=False,
+        move_hooks=True,
+        **kwargs,
+    ):
         """
         Moves this object to a new location.
 
@@ -735,6 +778,7 @@ def move_to(self, destination, quiet=False,
              7. `self.at_after_move(source_location)`
 
         """
+
         def logerr(string="", err=None):
             """Simple log helper method"""
             logger.log_trace()
@@ -898,30 +942,32 @@ def create(cls, key, account=None, **kwargs):
         obj = None
 
         # Get IP address of creator, if available
-        ip = kwargs.pop('ip', '')
+        ip = kwargs.pop("ip", "")
 
         # If no typeclass supplied, use this class
-        kwargs['typeclass'] = kwargs.pop('typeclass', cls)
+        kwargs["typeclass"] = kwargs.pop("typeclass", cls)
 
         # Set the supplied key as the name of the intended object
-        kwargs['key'] = key
+        kwargs["key"] = key
 
         # Get a supplied description, if any
-        description = kwargs.pop('description', '')
+        description = kwargs.pop("description", "")
 
         # Create a sane lockstring if one wasn't supplied
-        lockstring = kwargs.get('locks')
+        lockstring = kwargs.get("locks")
         if account and not lockstring:
             lockstring = cls.lockstring.format(account_id=account.id)
-            kwargs['locks'] = lockstring
+            kwargs["locks"] = lockstring
 
         # Create object
         try:
             obj = create.create_object(**kwargs)
 
             # Record creator id and creation IP
-            if ip: obj.db.creator_ip = ip
-            if account: obj.db.creator_id = account.id
+            if ip:
+                obj.db.creator_ip = ip
+            if account:
+                obj.db.creator_id = account.id
 
             # Set description if there is none, or update it if provided
             if description or not obj.db.desc:
@@ -948,6 +994,7 @@ def copy(self, new_key=None, **kwargs):
             copy (Object): A copy of this object.
 
         """
+
         def find_clone_key():
             """
             Append 01, 02 etc to obj.key. Checks next higher number in the
@@ -956,9 +1003,13 @@ def find_clone_key():
             returns the new clone name on the form keyXX
             """
             key = self.key
-            num = sum(1 for obj in self.location.contents
-                      if obj.key.startswith(key) and obj.key.lstrip(key).isdigit())
+            num = sum(
+                1
+                for obj in self.location.contents
+                if obj.key.startswith(key) and obj.key.lstrip(key).isdigit()
+            )
             return "%s%03i" % (key, num)
+
         new_key = new_key or find_clone_key()
         new_obj = ObjectDB.objects.copy_object(self, new_key=new_key, **kwargs)
         self.at_object_post_copy(new_obj, **kwargs)
@@ -1006,7 +1057,9 @@ def delete(self):
         if self.account:
             # Remove the object from playable characters list
             if self in self.account.db._playable_characters:
-                self.account.db._playable_characters = [x for x in self.account.db._playable_characters if x != self]
+                self.account.db._playable_characters = [
+                    x for x in self.account.db._playable_characters if x != self
+                ]
             for session in self.sessions.all():
                 self.account.unpuppet_object(session)
 
@@ -1028,7 +1081,9 @@ def delete(self):
         super().delete()
         return True
 
-    def access(self, accessing_obj, access_type='read', default=False, no_superuser_bypass=False, **kwargs):
+    def access(
+        self, accessing_obj, access_type="read", default=False, no_superuser_bypass=False, **kwargs
+    ):
         """
         Determines if another object has permission to access this object
         in whatever way.
@@ -1044,8 +1099,12 @@ def access(self, accessing_obj, access_type='read', default=False, no_superuser_
           Passed on to the at_access hook along with the result of the access check.
 
         """
-        result = super().access(accessing_obj, access_type=access_type,
-                                                   default=default, no_superuser_bypass=no_superuser_bypass)
+        result = super().access(
+            accessing_obj,
+            access_type=access_type,
+            default=default,
+            no_superuser_bypass=no_superuser_bypass,
+        )
         self.at_access(result, accessing_obj, access_type, **kwargs)
         return result
 
@@ -1130,16 +1189,22 @@ def basetype_setup(self):
         # commands may set this (create an item and you should be its
         # controller, for example)
 
-        self.locks.add(";".join([
-            "control:perm(Developer)",  # edit locks/permissions, delete
-            "examine:perm(Builder)",   # examine properties
-            "view:all()",               # look at object (visibility)
-            "edit:perm(Admin)",       # edit properties/attributes
-            "delete:perm(Admin)",     # delete object
-            "get:all()",                # pick up object
-            "call:true()",              # allow to call commands on this object
-            "tell:perm(Admin)",        # allow emits to this object
-            "puppet:pperm(Developer)"]))  # lock down puppeting only to staff by default
+        self.locks.add(
+            ";".join(
+                [
+                    "control:perm(Developer)",  # edit locks/permissions, delete
+                    "examine:perm(Builder)",  # examine properties
+                    "view:all()",  # look at object (visibility)
+                    "edit:perm(Admin)",  # edit properties/attributes
+                    "delete:perm(Admin)",  # delete object
+                    "get:all()",  # pick up object
+                    "drop:holds()",  # drop only that which you hold
+                    "call:true()",  # allow to call commands on this object
+                    "tell:perm(Admin)",  # allow emits to this object
+                    "puppet:pperm(Developer)",
+                ]
+            )
+        )  # lock down puppeting only to staff by default
 
     def basetype_posthook_setup(self):
         """
@@ -1225,6 +1290,7 @@ def at_post_puppet(self, **kwargs):
             puppeting this Object.
 
         """
+        self.msg(f"You become |w{self.key}|n.")
         self.account.db._last_puppet = self
 
     def at_pre_unpuppet(self, **kwargs):
@@ -1350,18 +1416,22 @@ def announce_move_from(self, destination, msg=None, mapping=None, **kwargs):
             string = "{object} is leaving {origin}, heading for {destination}."
 
         location = self.location
-        exits = [o for o in location.contents if o.location is location and o.destination is destination]
+        exits = [
+            o for o in location.contents if o.location is location and o.destination is destination
+        ]
         if not mapping:
             mapping = {}
 
-        mapping.update({
-            "object": self,
-            "exit": exits[0] if exits else "somewhere",
-            "origin": location or "nowhere",
-            "destination": destination or "nowhere",
-        })
+        mapping.update(
+            {
+                "object": self,
+                "exit": exits[0] if exits else "somewhere",
+                "origin": location or "nowhere",
+                "destination": destination or "nowhere",
+            }
+        )
 
-        location.msg_contents(string, exclude=(self, ), mapping=mapping)
+        location.msg_contents(string, exclude=(self,), mapping=mapping)
 
     def announce_move_to(self, source_location, msg=None, mapping=None, **kwargs):
         """
@@ -1405,19 +1475,25 @@ def announce_move_to(self, source_location, msg=None, mapping=None, **kwargs):
         destination = self.location
         exits = []
         if origin:
-            exits = [o for o in destination.contents if o.location is destination and o.destination is origin]
+            exits = [
+                o
+                for o in destination.contents
+                if o.location is destination and o.destination is origin
+            ]
 
         if not mapping:
             mapping = {}
 
-        mapping.update({
-            "object": self,
-            "exit": exits[0] if exits else "somewhere",
-            "origin": origin or "nowhere",
-            "destination": destination or "nowhere",
-        })
+        mapping.update(
+            {
+                "object": self,
+                "exit": exits[0] if exits else "somewhere",
+                "origin": origin or "nowhere",
+                "destination": destination or "nowhere",
+            }
+        )
 
-        destination.msg_contents(string, exclude=(self, ), mapping=mapping)
+        destination.msg_contents(string, exclude=(self,), mapping=mapping)
 
     def at_after_move(self, source_location, **kwargs):
         """
@@ -1579,8 +1655,7 @@ def return_appearance(self, looker, **kwargs):
         if not looker:
             return ""
         # get and identify all objects
-        visible = (con for con in self.contents if con != looker and
-                   con.access(looker, "view"))
+        visible = (con for con in self.contents if con != looker and con.access(looker, "view"))
         exits, users, things = [], [], defaultdict(list)
         for con in visible:
             key = con.get_display_name(looker)
@@ -1606,7 +1681,9 @@ def return_appearance(self, looker, **kwargs):
                 if nitem == 1:
                     key, _ = itemlist[0].get_numbered_name(nitem, looker, key=key)
                 else:
-                    key = [item.get_numbered_name(nitem, looker, key=key)[1] for item in itemlist][0]
+                    key = [item.get_numbered_name(nitem, looker, key=key)[1] for item in itemlist][
+                        0
+                    ]
                 thing_strings.append(key)
 
             string += "\n|wYou see:|n " + list_to_string(users + thing_strings)
@@ -1752,6 +1829,12 @@ def at_before_drop(self, dropper, **kwargs):
             before it is even started.
 
         """
+        if not self.locks.get("drop"):
+            # TODO: This if-statment will be removed in Evennia 1.0
+            return True
+        if not self.access(dropper, "drop", default=False):
+            dropper.msg(f"You cannot drop {self.get_display_name(dropper)}")
+            return False
         return True
 
     def at_drop(self, dropper, **kwargs):
@@ -1795,8 +1878,15 @@ def at_before_say(self, message, **kwargs):
         """
         return message
 
-    def at_say(self, message, msg_self=None, msg_location=None,
-               receivers=None, msg_receivers=None, **kwargs):
+    def at_say(
+        self,
+        message,
+        msg_self=None,
+        msg_location=None,
+        receivers=None,
+        msg_receivers=None,
+        **kwargs,
+    ):
         """
         Display the actual say (or whisper) of self.
 
@@ -1841,12 +1931,13 @@ def at_say(self, message, msg_self=None, msg_location=None,
                 {location}: the location where object is.
 
         """
-        msg_type = 'say'
+        msg_type = "say"
         if kwargs.get("whisper", False):
             # whisper mode
-            msg_type = 'whisper'
-            msg_self = '{self} whisper to {all_receivers}, "{speech}"' if msg_self is True else msg_self
-            msg_receivers = '{object} whispers: "{speech}"'
+            msg_type = "whisper"
+            msg_self = (
+                '{self} whisper to {all_receivers}, "{speech}"' if msg_self is True else msg_self
+            )
             msg_receivers = msg_receivers or '{object} whispers: "{speech}"'
             msg_location = None
         else:
@@ -1854,70 +1945,84 @@ def at_say(self, message, msg_self=None, msg_location=None,
             msg_location = msg_location or '{object} says, "{speech}"'
             msg_receivers = msg_receivers or message
 
-        custom_mapping = kwargs.get('mapping', {})
+        custom_mapping = kwargs.get("mapping", {})
         receivers = make_iter(receivers) if receivers else None
         location = self.location
 
         if msg_self:
-            self_mapping = {"self": "You",
-                            "object": self.get_display_name(self),
-                            "location": location.get_display_name(self) if location else None,
-                            "receiver": None,
-                            "all_receivers": ", ".join(
-                                recv.get_display_name(self)
-                                for recv in receivers) if receivers else None,
-                            "speech": message}
+            self_mapping = {
+                "self": "You",
+                "object": self.get_display_name(self),
+                "location": location.get_display_name(self) if location else None,
+                "receiver": None,
+                "all_receivers": ", ".join(recv.get_display_name(self) for recv in receivers)
+                if receivers
+                else None,
+                "speech": message,
+            }
             self_mapping.update(custom_mapping)
             self.msg(text=(msg_self.format(**self_mapping), {"type": msg_type}), from_obj=self)
 
         if receivers and msg_receivers:
-            receiver_mapping = {"self": "You",
-                                "object": None,
-                                "location": None,
-                                "receiver": None,
-                                "all_receivers": None,
-                                "speech": message}
+            receiver_mapping = {
+                "self": "You",
+                "object": None,
+                "location": None,
+                "receiver": None,
+                "all_receivers": None,
+                "speech": message,
+            }
             for receiver in make_iter(receivers):
-                individual_mapping = {"object": self.get_display_name(receiver),
-                                      "location": location.get_display_name(receiver),
-                                      "receiver": receiver.get_display_name(receiver),
-                                      "all_receivers": ", ".join(
-                                            recv.get_display_name(recv)
-                                            for recv in receivers) if receivers else None}
+                individual_mapping = {
+                    "object": self.get_display_name(receiver),
+                    "location": location.get_display_name(receiver),
+                    "receiver": receiver.get_display_name(receiver),
+                    "all_receivers": ", ".join(recv.get_display_name(recv) for recv in receivers)
+                    if receivers
+                    else None,
+                }
                 receiver_mapping.update(individual_mapping)
                 receiver_mapping.update(custom_mapping)
-                receiver.msg(text=(msg_receivers.format(**receiver_mapping),
-                             {"type": msg_type}), from_obj=self)
+                receiver.msg(
+                    text=(msg_receivers.format(**receiver_mapping), {"type": msg_type}),
+                    from_obj=self,
+                )
 
         if self.location and msg_location:
-            location_mapping = {"self": "You",
-                                "object": self,
-                                "location": location,
-                                "all_receivers": ", ".join(str(recv) for recv in receivers) if receivers else None,
-                                "receiver": None,
-                                "speech": message}
+            location_mapping = {
+                "self": "You",
+                "object": self,
+                "location": location,
+                "all_receivers": ", ".join(str(recv) for recv in receivers) if receivers else None,
+                "receiver": None,
+                "speech": message,
+            }
             location_mapping.update(custom_mapping)
             exclude = []
             if msg_self:
                 exclude.append(self)
             if receivers:
                 exclude.extend(receivers)
-            self.location.msg_contents(text=(msg_location, {"type": msg_type}),
-                                       from_obj=self,
-                                       exclude=exclude,
-                                       mapping=location_mapping)
+            self.location.msg_contents(
+                text=(msg_location, {"type": msg_type}),
+                from_obj=self,
+                exclude=exclude,
+                mapping=location_mapping,
+            )
 
 
 #
 # Base Character object
 #
 
+
 class DefaultCharacter(DefaultObject):
     """
     This implements an Object puppeted by a Session - that is,
     a character avatar controlled by an account.
 
     """
+
     # lockstring of newly created rooms, for easy overloading.
     # Will be formatted with the appropriate attributes.
     lockstring = "puppet:id({character_id}) or pid({account_id}) or perm(Developer) or pperm(Developer);delete:id({account_id}) or perm(Admin)"
@@ -1939,6 +2044,7 @@ def create(cls, key, account, **kwargs):
         Kwargs:
             description (str): Brief description for this object.
             ip (str): IP address of creator (for object auditing).
+            All other kwargs will be passed into the create_object call.
 
         Returns:
             character (Object): A newly created Character of the given typeclass.
@@ -1947,27 +2053,26 @@ def create(cls, key, account, **kwargs):
         """
         errors = []
         obj = None
-
         # Get IP address of creator, if available
-        ip = kwargs.pop('ip', '')
+        ip = kwargs.pop("ip", "")
 
         # If no typeclass supplied, use this class
-        kwargs['typeclass'] = kwargs.pop('typeclass', cls)
+        kwargs["typeclass"] = kwargs.pop("typeclass", cls)
 
         # Set the supplied key as the name of the intended object
-        kwargs['key'] = key
+        kwargs["key"] = key
 
         # Get home for character
-        kwargs['home'] = ObjectDB.objects.get_id(kwargs.get('home', settings.DEFAULT_HOME))
+        kwargs["home"] = ObjectDB.objects.get_id(kwargs.get("home", settings.DEFAULT_HOME))
 
         # Get permissions
-        kwargs['permissions'] = kwargs.get('permissions', settings.PERMISSION_ACCOUNT_DEFAULT)
+        kwargs["permissions"] = kwargs.get("permissions", settings.PERMISSION_ACCOUNT_DEFAULT)
 
         # Get description if provided
-        description = kwargs.pop('description', '')
+        description = kwargs.pop("description", "")
 
         # Get locks if provided
-        locks = kwargs.pop('locks', '')
+        locks = kwargs.pop("locks", "")
 
         try:
             # Check to make sure account does not have too many chars
@@ -1979,7 +2084,8 @@ def create(cls, key, account, **kwargs):
             obj = create.create_object(**kwargs)
 
             # Record creator id and creation IP
-            if ip: obj.db.creator_ip = ip
+            if ip:
+                obj.db.creator_ip = ip
             if account:
                 obj.db.creator_id = account.id
                 if obj not in account.characters:
@@ -1988,9 +2094,9 @@ def create(cls, key, account, **kwargs):
             # Add locks
             if not locks and account:
                 # Allow only the character itself and the creator account to puppet this character (and Developers).
-                locks = cls.lockstring.format(**{'character_id': obj.id, 'account_id': account.id})
+                locks = cls.lockstring.format(**{"character_id": obj.id, "account_id": account.id})
             elif not locks and not account:
-                locks = cls.lockstring.format(**{'character_id': obj.id, 'account_id': -1})
+                locks = cls.lockstring.format(**{"character_id": obj.id, "account_id": -1})
 
             obj.locks.add(locks)
 
@@ -2015,8 +2121,9 @@ def basetype_setup(self):
 
         """
         super().basetype_setup()
-        self.locks.add(";".join(["get:false()",  # noone can pick up the character
-                                 "call:false()"]))  # no commands can be called on character from outside
+        self.locks.add(
+            ";".join(["get:false()", "call:false()"])  # noone can pick up the character
+        )  # no commands can be called on character from outside
         # add the default cmdset
         self.cmdset.add_default(settings.CMDSET_CHARACTER, permanent=True)
 
@@ -2035,14 +2142,20 @@ def at_pre_puppet(self, account, session=None, **kwargs):
             account (Account): This is the connecting account.
             session (Session): Session controlling the connection.
         """
-        if self.location is None:  # Make sure character's location is never None before being puppeted.
+        if (
+            self.location is None
+        ):  # Make sure character's location is never None before being puppeted.
             # Return to last location (or home, which should always exist),
             self.location = self.db.prelogout_location if self.db.prelogout_location else self.home
-            self.location.at_object_receive(self, None)  # and trigger the location's reception hook.
+            self.location.at_object_receive(
+                self, None
+            )  # and trigger the location's reception hook.
         if self.location:  # If the character is verified to be somewhere,
             self.db.prelogout_location = self.location  # save location again to be sure.
         else:
-            account.msg("|r%s has no location and no home is set.|n" % self, session=session)  # Note to set home.
+            account.msg(
+                "|r%s has no location and no home is set.|n" % self, session=session
+            )  # Note to set home.
 
     def at_post_puppet(self, **kwargs):
         """
@@ -2060,10 +2173,11 @@ def at_post_puppet(self, **kwargs):
 
         """
         self.msg("\nYou become |c%s|n.\n" % self.name)
-        self.msg((self.at_look(self.location), {'type':'look'}), options = None)
+        self.msg((self.at_look(self.location), {"type": "look"}), options=None)
 
         def message(obj, from_obj):
             obj.msg("%s has entered the game." % self.get_display_name(obj), from_obj=from_obj)
+
         self.location.for_contents(message, exclude=[self], from_obj=self)
 
     def at_post_unpuppet(self, account, session=None, **kwargs):
@@ -2083,8 +2197,10 @@ def at_post_unpuppet(self, account, session=None, **kwargs):
         if not self.sessions.count():
             # only remove this char from grid if no sessions control it anymore.
             if self.location:
+
                 def message(obj, from_obj):
                     obj.msg("%s has left the game." % self.get_display_name(obj), from_obj=from_obj)
+
                 self.location.for_contents(message, exclude=[self], from_obj=self)
                 self.db.prelogout_location = self.location
                 self.location = None
@@ -2111,6 +2227,7 @@ def connection_time(self):
             return time.time() - float(min(conn))
         return None
 
+
 #
 # Base Room object
 
@@ -2120,11 +2237,14 @@ class DefaultRoom(DefaultObject):
     This is the base room object. It's just like any Object except its
     location is always `None`.
     """
+
     # lockstring of newly created rooms, for easy overloading.
     # Will be formatted with the {id} of the creating object.
-    lockstring = "control:id({id}) or perm(Admin); " \
-                 "delete:id({id}) or perm(Admin); " \
-                 "edit:id({id}) or perm(Admin)"
+    lockstring = (
+        "control:id({id}) or perm(Admin); "
+        "delete:id({id}) or perm(Admin); "
+        "edit:id({id}) or perm(Admin)"
+    )
 
     @classmethod
     def create(cls, key, account, **kwargs):
@@ -2151,31 +2271,33 @@ def create(cls, key, account, **kwargs):
         obj = None
 
         # Get IP address of creator, if available
-        ip = kwargs.pop('ip', '')
+        ip = kwargs.pop("ip", "")
 
         # If no typeclass supplied, use this class
-        kwargs['typeclass'] = kwargs.pop('typeclass', cls)
+        kwargs["typeclass"] = kwargs.pop("typeclass", cls)
 
         # Set the supplied key as the name of the intended object
-        kwargs['key'] = key
+        kwargs["key"] = key
 
         # Get who to send errors to
-        kwargs['report_to'] = kwargs.pop('report_to', account)
+        kwargs["report_to"] = kwargs.pop("report_to", account)
 
         # Get description, if provided
-        description = kwargs.pop('description', '')
+        description = kwargs.pop("description", "")
 
         try:
             # Create the Room
             obj = create.create_object(**kwargs)
 
             # Set appropriate locks
-            lockstring = kwargs.get('locks', cls.lockstring.format(id=account.id))
+            lockstring = kwargs.get("locks", cls.lockstring.format(id=account.id))
             obj.locks.add(lockstring)
 
             # Record creator id and creation IP
-            if ip: obj.db.creator_ip = ip
-            if account: obj.db.creator_id = account.id
+            if ip:
+                obj.db.creator_ip = ip
+            if account:
+                obj.db.creator_id = account.id
 
             # If no description is set, set a default description
             if description or not obj.db.desc:
@@ -2195,8 +2317,9 @@ def basetype_setup(self):
         """
 
         super().basetype_setup()
-        self.locks.add(";".join(["get:false()",
-                                 "puppet:false()"]))  # would be weird to puppet a room ...
+        self.locks.add(
+            ";".join(["get:false()", "puppet:false()"])
+        )  # would be weird to puppet a room ...
         self.location = None
 
 
@@ -2204,12 +2327,14 @@ def basetype_setup(self):
 # Default Exit command, used by the base exit object
 #
 
+
 class ExitCommand(command.Command):
     """
     This is a command that simply cause the caller to traverse
     the object it is attached to.
 
     """
+
     obj = None
 
     def func(self):
@@ -2217,7 +2342,7 @@ def func(self):
         Default exit traverse if no syscommand is defined.
         """
 
-        if self.obj.access(self.caller, 'traverse'):
+        if self.obj.access(self.caller, "traverse"):
             # we may traverse the exit.
             self.obj.at_traverse(self.caller, self.obj.destination)
         else:
@@ -2246,6 +2371,7 @@ def get_extra_info(self, caller, **kwargs):
         else:
             return " (%s)" % self.obj.get_display_name(caller)
 
+
 #
 # Base Exit object
 
@@ -2267,9 +2393,11 @@ class DefaultExit(DefaultObject):
 
     # lockstring of newly created exits, for easy overloading.
     # Will be formatted with the {id} of the creating object.
-    lockstring = "control:id({id}) or perm(Admin); " \
-                 "delete:id({id}) or perm(Admin); " \
-                 "edit:id({id}) or perm(Admin)"
+    lockstring = (
+        "control:id({id}) or perm(Admin); "
+        "delete:id({id}) or perm(Admin); "
+        "edit:id({id}) or perm(Admin)"
+    )
 
     # Helper classes and methods to implement the Exit. These need not
     # be overloaded unless one want to change the foundation for how
@@ -2290,17 +2418,19 @@ def create_exit_cmdset(self, exidbobj):
 
         # create an exit command. We give the properties here,
         # to always trigger metaclass preparations
-        cmd = self.exit_command(key=exidbobj.db_key.strip().lower(),
-                                aliases=exidbobj.aliases.all(),
-                                locks=str(exidbobj.locks),
-                                auto_help=False,
-                                destination=exidbobj.db_destination,
-                                arg_regex=r"^$",
-                                is_exit=True,
-                                obj=exidbobj)
+        cmd = self.exit_command(
+            key=exidbobj.db_key.strip().lower(),
+            aliases=exidbobj.aliases.all(),
+            locks=str(exidbobj.locks),
+            auto_help=False,
+            destination=exidbobj.db_destination,
+            arg_regex=r"^$",
+            is_exit=True,
+            obj=exidbobj,
+        )
         # create a cmdset
         exit_cmdset = cmdset.CmdSet(None)
-        exit_cmdset.key = 'ExitCmdSet'
+        exit_cmdset.key = "ExitCmdSet"
         exit_cmdset.priority = self.priority
         exit_cmdset.duplicates = True
         # add command to cmdset
@@ -2337,34 +2467,36 @@ def create(cls, key, account, source, dest, **kwargs):
         obj = None
 
         # Get IP address of creator, if available
-        ip = kwargs.pop('ip', '')
+        ip = kwargs.pop("ip", "")
 
         # If no typeclass supplied, use this class
-        kwargs['typeclass'] = kwargs.pop('typeclass', cls)
+        kwargs["typeclass"] = kwargs.pop("typeclass", cls)
 
         # Set the supplied key as the name of the intended object
-        kwargs['key'] = key
+        kwargs["key"] = key
 
         # Get who to send errors to
-        kwargs['report_to'] = kwargs.pop('report_to', account)
+        kwargs["report_to"] = kwargs.pop("report_to", account)
 
         # Set to/from rooms
-        kwargs['location'] = source
-        kwargs['destination'] = dest
+        kwargs["location"] = source
+        kwargs["destination"] = dest
 
-        description = kwargs.pop('description', '')
+        description = kwargs.pop("description", "")
 
         try:
             # Create the Exit
             obj = create.create_object(**kwargs)
 
             # Set appropriate locks
-            lockstring = kwargs.get('locks', cls.lockstring.format(id=account.id))
+            lockstring = kwargs.get("locks", cls.lockstring.format(id=account.id))
             obj.locks.add(lockstring)
 
             # Record creator id and creation IP
-            if ip: obj.db.creator_ip = ip
-            if account: obj.db.creator_id = account.id
+            if ip:
+                obj.db.creator_ip = ip
+            if account:
+                obj.db.creator_id = account.id
 
             # If no description is set, set a default description
             if description or not obj.db.desc:
@@ -2387,9 +2519,15 @@ def basetype_setup(self):
         super().basetype_setup()
 
         # setting default locks (overload these in at_object_creation()
-        self.locks.add(";".join(["puppet:false()",  # would be weird to puppet an exit ...
-                                 "traverse:all()",  # who can pass through exit by default
-                                 "get:false()"]))   # noone can pick up the exit
+        self.locks.add(
+            ";".join(
+                [
+                    "puppet:false()",  # would be weird to puppet an exit ...
+                    "traverse:all()",  # who can pass through exit by default
+                    "get:false()",
+                ]
+            )
+        )  # noone can pick up the exit
 
         # an exit should have a destination (this is replaced at creation time)
         if self.location:
@@ -2439,7 +2577,7 @@ def at_traverse(self, traversing_object, target_location, **kwargs):
         else:
             if self.db.err_traverse:
                 # if exit has a better error message, let's use it.
-                self.caller.msg(self.db.err_traverse)
+                traversing_object.msg(self.db.err_traverse)
             else:
                 # No shorthand error message. Call hook.
                 self.at_failed_traverse(traversing_object)
diff --git a/evennia/objects/tests.py b/evennia/objects/tests.py
index 8098f55b2f0..592f2cda26d 100644
--- a/evennia/objects/tests.py
+++ b/evennia/objects/tests.py
@@ -5,35 +5,41 @@
 
 class DefaultObjectTest(EvenniaTest):
 
-    ip = '212.216.139.14'
+    ip = "212.216.139.14"
 
     def test_object_create(self):
-        description = 'A home for a grouch.'
-        obj, errors = DefaultObject.create('trashcan', self.account, description=description, ip=self.ip)
+        description = "A home for a grouch."
+        obj, errors = DefaultObject.create(
+            "trashcan", self.account, description=description, ip=self.ip
+        )
         self.assertTrue(obj, errors)
         self.assertFalse(errors, errors)
         self.assertEqual(description, obj.db.desc)
         self.assertEqual(obj.db.creator_ip, self.ip)
 
     def test_character_create(self):
-        description = 'A furry green monster, reeking of garbage.'
-        obj, errors = DefaultCharacter.create('oscar', self.account, description=description, ip=self.ip)
+        description = "A furry green monster, reeking of garbage."
+        obj, errors = DefaultCharacter.create(
+            "oscar", self.account, description=description, ip=self.ip
+        )
         self.assertTrue(obj, errors)
         self.assertFalse(errors, errors)
         self.assertEqual(description, obj.db.desc)
         self.assertEqual(obj.db.creator_ip, self.ip)
 
     def test_room_create(self):
-        description = 'A dimly-lit alley behind the local Chinese restaurant.'
-        obj, errors = DefaultRoom.create('alley', self.account, description=description, ip=self.ip)
+        description = "A dimly-lit alley behind the local Chinese restaurant."
+        obj, errors = DefaultRoom.create("alley", self.account, description=description, ip=self.ip)
         self.assertTrue(obj, errors)
         self.assertFalse(errors, errors)
         self.assertEqual(description, obj.db.desc)
         self.assertEqual(obj.db.creator_ip, self.ip)
 
     def test_exit_create(self):
-        description = 'The steaming depths of the dumpster, ripe with refuse in various states of decomposition.'
-        obj, errors = DefaultExit.create('in', self.account, self.room1, self.room2, description=description, ip=self.ip)
+        description = "The steaming depths of the dumpster, ripe with refuse in various states of decomposition."
+        obj, errors = DefaultExit.create(
+            "in", self.account, self.room1, self.room2, description=description, ip=self.ip
+        )
         self.assertTrue(obj, errors)
         self.assertFalse(errors, errors)
         self.assertEqual(description, obj.db.desc)
@@ -42,14 +48,15 @@ def test_exit_create(self):
     def test_urls(self):
         "Make sure objects are returning URLs"
         self.assertTrue(self.char1.get_absolute_url())
-        self.assertTrue('admin' in self.char1.web_get_admin_url())
+        self.assertTrue("admin" in self.char1.web_get_admin_url())
 
         self.assertTrue(self.room1.get_absolute_url())
-        self.assertTrue('admin' in self.room1.web_get_admin_url())
+        self.assertTrue("admin" in self.room1.web_get_admin_url())
 
 
 class TestObjectManager(EvenniaTest):
     "Test object manager methods"
+
     def test_get_object_with_account(self):
         query = ObjectDB.objects.get_object_with_account("TestAccount").first()
         self.assertEqual(query, self.char1)
@@ -64,30 +71,33 @@ def test_get_object_with_account(self):
         self.assertEqual(tuple(query), (self.char1, self.char2))
 
         query = ObjectDB.objects.get_object_with_account(
-            "TestAccou", candidates=[self.char1, self.obj1], exact=False)
+            "TestAccou", candidates=[self.char1, self.obj1], exact=False
+        )
         self.assertEqual(list(query), [self.char1])
 
     def test_get_objs_with_key_and_typeclass(self):
         query = ObjectDB.objects.get_objs_with_key_and_typeclass(
-            "Char", "evennia.objects.objects.DefaultCharacter")
+            "Char", "evennia.objects.objects.DefaultCharacter"
+        )
         self.assertEqual(list(query), [self.char1])
         query = ObjectDB.objects.get_objs_with_key_and_typeclass(
-            "Char", "evennia.objects.objects.DefaultObject")
+            "Char", "evennia.objects.objects.DefaultObject"
+        )
         self.assertFalse(query)
         query = ObjectDB.objects.get_objs_with_key_and_typeclass(
-            "NotFound", "evennia.objects.objects.DefaultCharacter")
+            "NotFound", "evennia.objects.objects.DefaultCharacter"
+        )
         self.assertFalse(query)
         query = ObjectDB.objects.get_objs_with_key_and_typeclass(
-            "Char", "evennia.objects.objects.DefaultCharacter", candidates=[self.char1, self.char2])
+            "Char", "evennia.objects.objects.DefaultCharacter", candidates=[self.char1, self.char2]
+        )
         self.assertEqual(list(query), [self.char1])
 
     def test_get_objs_with_attr(self):
         self.obj1.db.testattr = "testval1"
         query = ObjectDB.objects.get_objs_with_attr("testattr")
         self.assertEqual(list(query), [self.obj1])
-        query = ObjectDB.objects.get_objs_with_attr(
-            "testattr", candidates=[self.char1, self.obj1] )
+        query = ObjectDB.objects.get_objs_with_attr("testattr", candidates=[self.char1, self.obj1])
         self.assertEqual(list(query), [self.obj1])
-        query = ObjectDB.objects.get_objs_with_attr(
-            "NotFound", candidates=[self.char1, self.obj1] )
+        query = ObjectDB.objects.get_objs_with_attr("NotFound", candidates=[self.char1, self.obj1])
         self.assertFalse(query)
diff --git a/evennia/prototypes/menus.py b/evennia/prototypes/menus.py
index 5f38ab8f69c..c2418d102bb 100644
--- a/evennia/prototypes/menus.py
+++ b/evennia/prototypes/menus.py
@@ -28,7 +28,8 @@
 _MENU_ATTR_LITERAL_EVAL_ERROR = (
     "|rCritical Python syntax error in your value. Only primitive Python structures are allowed.\n"
     "You also need to use correct Python syntax. Remember especially to put quotes around all "
-    "strings inside lists and dicts.|n")
+    "strings inside lists and dicts.|n"
+)
 
 
 # Helper functions
@@ -52,8 +53,9 @@ def _get_flat_menu_prototype(caller, refresh=False, validate=False):
         flat_prototype = caller.ndb._menutree.olc_flat_prototype
     if not flat_prototype:
         prot = _get_menu_prototype(caller)
-        caller.ndb._menutree.olc_flat_prototype = \
-            flat_prototype = spawner.flatten_prototype(prot, validate=validate)
+        caller.ndb._menutree.olc_flat_prototype = flat_prototype = spawner.flatten_prototype(
+            prot, validate=validate
+        )
     return flat_prototype
 
 
@@ -95,11 +97,11 @@ def _format_option_value(prop, required=False, prototype=None, cropper=None):
         value (str): The formatted value.
     """
     if prototype is not None:
-        prop = prototype.get(prop, '')
+        prop = prototype.get(prop, "")
 
     out = prop
     if callable(prop):
-        if hasattr(prop, '__name__'):
+        if hasattr(prop, "__name__"):
             out = "<{}>".format(prop.__name__)
         else:
             out = repr(prop)
@@ -149,8 +151,11 @@ def _set_property(caller, raw_string, **kwargs):
         try:
             value = processor(raw_string)
         except Exception as err:
-            caller.msg("Could not set {prop} to {value} ({err})".format(
-                       prop=prop.replace("_", "-").capitalize(), value=raw_string, err=str(err)))
+            caller.msg(
+                "Could not set {prop} to {value} ({err})".format(
+                    prop=prop.replace("_", "-").capitalize(), value=raw_string, err=str(err)
+                )
+            )
             # this means we'll re-run the current node.
             return None
     else:
@@ -176,8 +181,9 @@ def _set_property(caller, raw_string, **kwargs):
         if err:
             out.append(" |yPython `literal_eval` warning: {}|n".format(err))
         if parsed_value != value:
-            out.append(" |g(Example-)value when parsed ({}):|n {}".format(
-                type(parsed_value), parsed_value))
+            out.append(
+                " |g(Example-)value when parsed ({}):|n {}".format(type(parsed_value), parsed_value)
+            )
         else:
             out.append(" |gNo change when parsed.")
 
@@ -190,25 +196,38 @@ def _wizard_options(curr_node, prev_node, next_node, color="|W", search=False):
     """Creates default navigation options available in the wizard."""
     options = []
     if prev_node:
-        options.append({"key": ("|wB|Wack", "b"),
-                        "desc": "{color}({node})|n".format(
-                            color=color, node=prev_node.replace("_", "-")),
-                        "goto": "node_{}".format(prev_node)})
+        options.append(
+            {
+                "key": ("|wB|Wack", "b"),
+                "desc": "{color}({node})|n".format(color=color, node=prev_node.replace("_", "-")),
+                "goto": "node_{}".format(prev_node),
+            }
+        )
     if next_node:
-        options.append({"key": ("|wF|Worward", "f"),
-                        "desc": "{color}({node})|n".format(
-                            color=color, node=next_node.replace("_", "-")),
-                        "goto": "node_{}".format(next_node)})
+        options.append(
+            {
+                "key": ("|wF|Worward", "f"),
+                "desc": "{color}({node})|n".format(color=color, node=next_node.replace("_", "-")),
+                "goto": "node_{}".format(next_node),
+            }
+        )
 
-    options.append({"key": ("|wI|Wndex", "i"),
-                    "goto": "node_index"})
+    options.append({"key": ("|wI|Wndex", "i"), "goto": "node_index"})
 
     if curr_node:
-        options.append({"key": ("|wV|Walidate prototype", "validate", "v"),
-                        "goto": ("node_validate_prototype", {"back": curr_node})})
+        options.append(
+            {
+                "key": ("|wV|Walidate prototype", "validate", "v"),
+                "goto": ("node_validate_prototype", {"back": curr_node}),
+            }
+        )
         if search:
-            options.append({"key": ("|wSE|Warch objects", "search object", "search", "se"),
-                            "goto": ("node_search_object", {"back": curr_node})})
+            options.append(
+                {
+                    "key": ("|wSE|Warch objects", "search object", "search", "se"),
+                    "goto": ("node_search_object", {"back": curr_node}),
+                }
+            )
 
     return options
 
@@ -219,7 +238,7 @@ def _set_actioninfo(caller, string):
 
 def _path_cropper(pythonpath):
     "Crop path to only the last component"
-    return pythonpath.split('.')[-1]
+    return pythonpath.split(".")[-1]
 
 
 def _validate_prototype(prototype):
@@ -238,30 +257,37 @@ def _validate_prototype(prototype):
         errors = "\n\n|y{}|n".format(exc)
         err = True
 
-    text = (txt + errors)
+    text = txt + errors
     return err, text
 
 
 def _format_protfuncs():
     out = []
-    sorted_funcs = [(key, func) for key, func in
-                    sorted(protlib.PROT_FUNCS.items(), key=lambda tup: tup[0])]
+    sorted_funcs = [
+        (key, func) for key, func in sorted(protlib.PROT_FUNCS.items(), key=lambda tup: tup[0])
+    ]
     for protfunc_name, protfunc in sorted_funcs:
-        out.append("- |c${name}|n - |W{docs}".format(
-            name=protfunc_name,
-            docs=utils.justify(protfunc.__doc__.strip(), align='l', indent=10).strip()))
+        out.append(
+            "- |c${name}|n - |W{docs}".format(
+                name=protfunc_name,
+                docs=utils.justify(protfunc.__doc__.strip(), align="l", indent=10).strip(),
+            )
+        )
     return "\n       ".join(out)
 
 
 def _format_lockfuncs():
     out = []
-    sorted_funcs = [(key, func) for key, func in
-                    sorted(get_all_lockfuncs().items(), key=lambda tup: tup[0])]
+    sorted_funcs = [
+        (key, func) for key, func in sorted(get_all_lockfuncs().items(), key=lambda tup: tup[0])
+    ]
     for lockfunc_name, lockfunc in sorted_funcs:
         doc = (lockfunc.__doc__ or "").strip()
-        out.append("- |c${name}|n - |W{docs}".format(
-            name=lockfunc_name,
-            docs=utils.justify(doc, align='l', indent=10).strip()))
+        out.append(
+            "- |c${name}|n - |W{docs}".format(
+                name=lockfunc_name, docs=utils.justify(doc, align="l", indent=10).strip()
+            )
+        )
     return "\n".join(out)
 
 
@@ -278,7 +304,7 @@ def _format_list_actions(*args, **kwargs):
 
     """
     actions = []
-    prefix = kwargs.get('prefix', "|WSelect with |w<num>|W. Other actions:|n ")
+    prefix = kwargs.get("prefix", "|WSelect with |w<num>|W. Other actions:|n ")
     for action in args:
         actions.append("|w{}|n|W{} |w<num>|n".format(action[0], action[1:]))
     return prefix + " |W|||n ".join(actions)
@@ -301,6 +327,7 @@ def _get_current_value(caller, keyname, comparer=None, formatter=str, only_inher
         current (str): The current value.
 
     """
+
     def _default_comparer(protval, flatval):
         if only_inherit:
             return "" if protval else flatval
@@ -374,6 +401,7 @@ def _default_parse(raw_inp, choices, *args):
 
 # validate prototype (available as option from all nodes)
 
+
 def node_validate_prototype(caller, raw_string, **kwargs):
     """General node to view and validate a protototype"""
     prototype = _get_flat_menu_prototype(caller, refresh=True, validate=False)
@@ -390,14 +418,14 @@ def node_validate_prototype(caller, raw_string, **kwargs):
     text = (text, helptext)
 
     options = _wizard_options(None, prev_node, None)
-    options.append({"key": "_default",
-                    "goto": "node_" + prev_node})
+    options.append({"key": "_default", "goto": "node_" + prev_node})
 
     return text, options
 
 
 # node examine_entity
 
+
 def node_examine_entity(caller, raw_string, **kwargs):
     """
     General node to view a text and then return to previous node.  Kwargs should contain "text" for
@@ -405,19 +433,19 @@ def node_examine_entity(caller, raw_string, **kwargs):
     """
     text = kwargs.get("text", "Nothing was found here.")
     helptext = "Use |wback|n to return to the previous node."
-    prev_node = kwargs.get('back', 'index')
+    prev_node = kwargs.get("back", "index")
 
     text = (text, helptext)
 
     options = _wizard_options(None, prev_node, None)
-    options.append({"key": "_default",
-                    "goto": "node_" + prev_node})
+    options.append({"key": "_default", "goto": "node_" + prev_node})
 
     return text, options
 
 
 # node object_search
 
+
 def _search_object(caller):
     "update search term based on query stored on menu; store match too"
     try:
@@ -444,8 +472,9 @@ def _search_object(caller):
             results = caller.search_account(searchstring, quiet=True)
     else:
         keyquery = Q(db_key__istartswith=searchstring)
-        aliasquery = Q(db_tags__db_key__istartswith=searchstring,
-                       db_tags__db_tagtype__iexact="alias")
+        aliasquery = Q(
+            db_tags__db_key__istartswith=searchstring, db_tags__db_tagtype__iexact="alias"
+        )
         results = ObjectDB.objects.filter(keyquery | aliasquery).distinct()
 
     caller.msg("Searching for '{}' ...".format(searchstring))
@@ -454,12 +483,12 @@ def _search_object(caller):
 
 
 def _object_search_select(caller, obj_entry, **kwargs):
-    choices = kwargs['available_choices']
+    choices = kwargs["available_choices"]
     num = choices.index(obj_entry)
     matches = caller.ndb._menutree.olc_search_object_matches
     obj = matches[num]
 
-    if not obj.access(caller, 'examine'):
+    if not obj.access(caller, "examine"):
         caller.msg("|rYou don't have 'examine' access on this object.|n")
         del caller.ndb._menutree.olc_search_object_term
         return "node_search_object"
@@ -471,9 +500,10 @@ def _object_search_select(caller, obj_entry, **kwargs):
 
 def _object_search_actions(caller, raw_inp, **kwargs):
     "All this does is to queue a search query"
-    choices = kwargs['available_choices']
+    choices = kwargs["available_choices"]
     obj_entry, action = _default_parse(
-        raw_inp, choices, ("examine", "e"), ("create prototype from object", "create", "c"))
+        raw_inp, choices, ("examine", "e"), ("create prototype from object", "create", "c")
+    )
 
     raw_inp = raw_inp.strip()
 
@@ -486,7 +516,7 @@ def _object_search_actions(caller, raw_inp, **kwargs):
 
         if action == "examine":
 
-            if not obj.access(caller, 'examine'):
+            if not obj.access(caller, "examine"):
                 caller.msg("\n|rYou don't have 'examine' access on this object.|n")
                 del caller.ndb._menutree.olc_search_object_term
                 return "node_search_object"
@@ -496,7 +526,7 @@ def _object_search_actions(caller, raw_inp, **kwargs):
         else:
             # load prototype
 
-            if not obj.access(caller, 'edit'):
+            if not obj.access(caller, "edit"):
                 caller.msg("|rYou don't have access to do this with this object.|n")
                 del caller.ndb._menutree.olc_search_object_term
                 return "node_search_object"
@@ -530,9 +560,12 @@ def node_search_object(caller, raw_inp, **kwargs):
         Found {num} match{post}.
 
          (|RWarning: creating a prototype will |roverwrite|r |Rthe current prototype!)|n""".format(
-            num=nmatches, post="es" if nmatches > 1 else "")
-        _set_actioninfo(caller, _format_list_actions(
-                "examine", "create prototype from object", prefix="Actions: "))
+            num=nmatches, post="es" if nmatches > 1 else ""
+        )
+        _set_actioninfo(
+            caller,
+            _format_list_actions("examine", "create prototype from object", prefix="Actions: "),
+        )
     else:
         text = "Enter search criterion."
 
@@ -549,11 +582,11 @@ def node_search_object(caller, raw_inp, **kwargs):
     text = (text, helptext)
 
     options = _wizard_options(None, prev_node, None)
-    options.append({"key": "_default",
-                    "goto": (_object_search_actions, {"back": prev_node})})
+    options.append({"key": "_default", "goto": (_object_search_actions, {"back": prev_node})})
 
     return text, options
 
+
 # main index (start page) node
 
 
@@ -598,16 +631,16 @@ def node_index(caller):
        only.  They can also be nested for combined effects.
 
        {pfuncs}
-       """.format(pfuncs=_format_protfuncs())
+       """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     # If a prototype is being edited, show its key and
     # prototype_key under the title
-    loaded_prototype = ''
-    if 'prototype_key' in prototype \
-            or 'key' in prototype:
-        loaded_prototype = ' --- Editing: |y{}({})|n --- '.format(
-            prototype.get('key', ''),
-            prototype.get('prototype_key', '')
+    loaded_prototype = ""
+    if "prototype_key" in prototype or "key" in prototype:
+        loaded_prototype = " --- Editing: |y{}({})|n --- ".format(
+            prototype.get("key", ""), prototype.get("prototype_key", "")
         )
     text = text % (loaded_prototype)
 
@@ -615,41 +648,62 @@ def node_index(caller):
 
     options = []
     options.append(
-        {"desc": "|WPrototype-Key|n|n{}".format(
-            _format_option_value("Key", "prototype_key" not in prototype, prototype, None)),
-         "goto": "node_prototype_key"})
-    for key in ('Prototype_Parent', 'Typeclass', 'Key', 'Aliases', 'Attrs', 'Tags', 'Locks',
-                'Permissions', 'Location', 'Home', 'Destination'):
+        {
+            "desc": "|WPrototype-Key|n|n{}".format(
+                _format_option_value("Key", "prototype_key" not in prototype, prototype, None)
+            ),
+            "goto": "node_prototype_key",
+        }
+    )
+    for key in (
+        "Prototype_Parent",
+        "Typeclass",
+        "Key",
+        "Aliases",
+        "Attrs",
+        "Tags",
+        "Locks",
+        "Permissions",
+        "Location",
+        "Home",
+        "Destination",
+    ):
         required = False
         cropper = None
         if key in ("Prototype_Parent", "Typeclass"):
             required = ("prototype_parent" not in prototype) and ("typeclass" not in prototype)
-        if key == 'Typeclass':
+        if key == "Typeclass":
             cropper = _path_cropper
         options.append(
-            {"desc": "{}{}|n{}".format(
-                "|W" if key == "Prototype_Parent" else "|w",
-                key.replace("_", "-"),
-                _format_option_value(key, required, prototype, cropper=cropper)),
-             "goto": "node_{}".format(key.lower())})
+            {
+                "desc": "{}{}|n{}".format(
+                    "|W" if key == "Prototype_Parent" else "|w",
+                    key.replace("_", "-"),
+                    _format_option_value(key, required, prototype, cropper=cropper),
+                ),
+                "goto": "node_{}".format(key.lower()),
+            }
+        )
     required = False
-    for key in ('Desc', 'Tags', 'Locks'):
+    for key in ("Desc", "Tags", "Locks"):
         options.append(
-            {"desc": "|WPrototype-{}|n|n{}".format(
-                key, _format_option_value(key, required, prototype, None)),
-             "goto": "node_prototype_{}".format(key.lower())})
-
-    options.extend((
-            {"key": ("|wV|Walidate prototype", "validate", "v"),
-             "goto": "node_validate_prototype"},
-            {"key": ("|wSA|Wve prototype", "save", "sa"),
-             "goto": "node_prototype_save"},
-            {"key": ("|wSP|Wawn prototype", "spawn", "sp"),
-             "goto": "node_prototype_spawn"},
-            {"key": ("|wLO|Wad prototype", "load", "lo"),
-             "goto": "node_prototype_load"},
-            {"key": ("|wSE|Warch objects|n", "search", "se"),
-             "goto": "node_search_object"}))
+            {
+                "desc": "|WPrototype-{}|n|n{}".format(
+                    key, _format_option_value(key, required, prototype, None)
+                ),
+                "goto": "node_prototype_{}".format(key.lower()),
+            }
+        )
+
+    options.extend(
+        (
+            {"key": ("|wV|Walidate prototype", "validate", "v"), "goto": "node_validate_prototype"},
+            {"key": ("|wSA|Wve prototype", "save", "sa"), "goto": "node_prototype_save"},
+            {"key": ("|wSP|Wawn prototype", "spawn", "sp"), "goto": "node_prototype_spawn"},
+            {"key": ("|wLO|Wad prototype", "load", "lo"), "goto": "node_prototype_load"},
+            {"key": ("|wSE|Warch objects|n", "search", "se"), "goto": "node_search_object"},
+        )
+    )
 
     return text, options
 
@@ -665,10 +719,13 @@ def _check_prototype_key(caller, key):
         old_prototype = old_prototype[0]
         # we are starting a new prototype that matches an existing
         if not caller.locks.check_lockstring(
-                caller, old_prototype['prototype_locks'], access_type='edit'):
+            caller, old_prototype["prototype_locks"], access_type="edit"
+        ):
             # return to the node_prototype_key to try another key
-            caller.msg("Prototype '{key}' already exists and you don't "
-                       "have permission to edit it.".format(key=key))
+            caller.msg(
+                "Prototype '{key}' already exists and you don't "
+                "have permission to edit it.".format(key=key)
+            )
             return "node_prototype_key"
         elif olc_new:
             # we are selecting an existing prototype to edit. Reset to index.
@@ -677,7 +734,7 @@ def _check_prototype_key(caller, key):
             caller.msg("Prototype already exists. Reloading.")
             return "node_index"
 
-    return _set_property(caller, key, prop='prototype_key')
+    return _set_property(caller, key, prop="prototype_key")
 
 
 def node_prototype_key(caller):
@@ -688,7 +745,9 @@ def node_prototype_key(caller):
 
         (To set a new value, just write it and press enter)
 
-        {current}""".format(current=_get_current_value(caller, "prototype_key"))
+        {current}""".format(
+        current=_get_current_value(caller, "prototype_key")
+    )
 
     helptext = """
         The prototype-key is not itself used when spawnng the new object, but is only used for
@@ -698,8 +757,7 @@ def node_prototype_key(caller):
         """
 
     options = _wizard_options("prototype_key", "index", "prototype_parent")
-    options.append({"key": "_default",
-                    "goto": _check_prototype_key})
+    options.append({"key": "_default", "goto": _check_prototype_key})
 
     text = (text, helptext)
     return text, options
@@ -710,32 +768,36 @@ def node_prototype_key(caller):
 
 def _all_prototype_parents(caller):
     """Return prototype_key of all available prototypes for listing in menu"""
-    return [prototype["prototype_key"]
-            for prototype in protlib.search_prototype() if "prototype_key" in prototype]
+    return [
+        prototype["prototype_key"]
+        for prototype in protlib.search_prototype()
+        if "prototype_key" in prototype
+    ]
 
 
 def _prototype_parent_actions(caller, raw_inp, **kwargs):
     """Parse the default Convert prototype to a string representation for closer inspection"""
     choices = kwargs.get("available_choices", [])
     prototype_parent, action = _default_parse(
-        raw_inp, choices, ("examine", "e", "l"), ("add", "a"), ("remove", "r", 'delete', 'd'))
+        raw_inp, choices, ("examine", "e", "l"), ("add", "a"), ("remove", "r", "delete", "d")
+    )
 
     if prototype_parent:
         # a selection of parent was made
         prototype_parent = protlib.search_prototype(key=prototype_parent)[0]
-        prototype_parent_key = prototype_parent['prototype_key']
+        prototype_parent_key = prototype_parent["prototype_key"]
 
         # which action to apply on the selection
-        if action == 'examine':
+        if action == "examine":
             # examine the prototype
             txt = protlib.prototype_to_str(prototype_parent)
-            kwargs['text'] = txt
-            kwargs['back'] = 'prototype_parent'
+            kwargs["text"] = txt
+            kwargs["back"] = "prototype_parent"
             return "node_examine_entity", kwargs
-        elif action == 'add':
+        elif action == "add":
             # add/append parent
             prot = _get_menu_prototype(caller)
-            current_prot_parent = prot.get('prototype_parent', None)
+            current_prot_parent = prot.get("prototype_parent", None)
             if current_prot_parent:
                 current_prot_parent = utils.make_iter(current_prot_parent)
                 if prototype_parent_key in current_prot_parent:
@@ -752,26 +814,29 @@ def _prototype_parent_actions(caller, raw_inp, **kwargs):
                 else:
                     raise RuntimeError("Not found.")
             except RuntimeError as err:
-                caller.msg("Selected prototype-parent {} "
-                           "caused Error(s):\n|r{}|n".format(prototype_parent, err))
+                caller.msg(
+                    "Selected prototype-parent {} "
+                    "caused Error(s):\n|r{}|n".format(prototype_parent, err)
+                )
                 return "node_prototype_parent"
             _set_prototype_value(caller, "prototype_parent", current_prot_parent)
             _get_flat_menu_prototype(caller, refresh=True)
         elif action == "remove":
             # remove prototype parent
             prot = _get_menu_prototype(caller)
-            current_prot_parent = prot.get('prototype_parent', None)
+            current_prot_parent = prot.get("prototype_parent", None)
             if current_prot_parent:
                 current_prot_parent = utils.make_iter(current_prot_parent)
                 try:
                     current_prot_parent.remove(prototype_parent_key)
-                    _set_prototype_value(caller, 'prototype_parent', current_prot_parent)
+                    _set_prototype_value(caller, "prototype_parent", current_prot_parent)
                     _get_flat_menu_prototype(caller, refresh=True)
                     caller.msg("Removed prototype parent {}.".format(prototype_parent_key))
                 except ValueError:
-                    caller.msg("|rPrototype-parent {} could not be removed.".format(
-                        prototype_parent_key))
-        return 'node_prototype_parent'
+                    caller.msg(
+                        "|rPrototype-parent {} could not be removed.".format(prototype_parent_key)
+                    )
+        return "node_prototype_parent"
 
 
 def _prototype_parent_select(caller, new_parent):
@@ -784,12 +849,17 @@ def _prototype_parent_select(caller, new_parent):
         else:
             raise RuntimeError("Not found.")
     except RuntimeError as err:
-        caller.msg("Selected prototype-parent {} "
-                   "caused Error(s):\n|r{}|n".format(new_parent, err))
+        caller.msg(
+            "Selected prototype-parent {} " "caused Error(s):\n|r{}|n".format(new_parent, err)
+        )
     else:
-        ret = _set_property(caller, new_parent,
-                            prop="prototype_parent",
-                            processor=str, next_node="node_prototype_parent")
+        ret = _set_property(
+            caller,
+            new_parent,
+            prop="prototype_parent",
+            processor=str,
+            next_node="node_prototype_parent",
+        )
         _get_flat_menu_prototype(caller, refresh=True)
         caller.msg("Selected prototype parent |c{}|n.".format(new_parent))
     return ret
@@ -799,7 +869,7 @@ def _prototype_parent_select(caller, new_parent):
 def node_prototype_parent(caller):
     prototype = _get_menu_prototype(caller)
 
-    prot_parent_keys = prototype.get('prototype_parent')
+    prot_parent_keys = prototype.get("prototype_parent")
 
     text = """
         The |cPrototype Parent|n allows you to |winherit|n prototype values from another named
@@ -825,9 +895,11 @@ def node_prototype_parent(caller):
             prot_parent = protlib.search_prototype(pkey)
             if prot_parent:
                 prot_parent = prot_parent[0]
-                ptexts.append("|c -- {pkey} -- |n\n{prot}".format(
-                    pkey=pkey,
-                    prot=protlib.prototype_to_str(prot_parent)))
+                ptexts.append(
+                    "|c -- {pkey} -- |n\n{prot}".format(
+                        pkey=pkey, prot=protlib.prototype_to_str(prot_parent)
+                    )
+                )
             else:
                 ptexts.append("Prototype parent |r{pkey} was not found.".format(pkey=pkey))
 
@@ -839,19 +911,21 @@ def node_prototype_parent(caller):
     text = (text, helptext)
 
     options = _wizard_options("prototype_parent", "prototype_key", "typeclass", color="|W")
-    options.append({"key": "_default",
-                    "goto": _prototype_parent_actions})
+    options.append({"key": "_default", "goto": _prototype_parent_actions})
 
     return text, options
 
 
 # typeclasses node
 
+
 def _all_typeclasses(caller):
     """Get name of available typeclasses."""
-    return list(name for name in
-                sorted(utils.get_all_typeclasses("evennia.objects.models.ObjectDB").keys())
-                if name != "evennia.objects.models.ObjectDB")
+    return list(
+        name
+        for name in sorted(utils.get_all_typeclasses("evennia.objects.models.ObjectDB").keys())
+        if name != "evennia.objects.models.ObjectDB"
+    )
 
 
 def _typeclass_actions(caller, raw_inp, **kwargs):
@@ -859,10 +933,11 @@ def _typeclass_actions(caller, raw_inp, **kwargs):
 
     choices = kwargs.get("available_choices", [])
     typeclass_path, action = _default_parse(
-        raw_inp, choices, ("examine", "e", "l"), ("remove", "r", "delete", "d"))
+        raw_inp, choices, ("examine", "e", "l"), ("remove", "r", "delete", "d")
+    )
 
     if typeclass_path:
-        if action == 'examine':
+        if action == "examine":
             typeclass = utils.get_all_typeclasses().get(typeclass_path)
             if typeclass:
                 docstr = []
@@ -871,16 +946,19 @@ def _typeclass_actions(caller, raw_inp, **kwargs):
                         docstr.append(line)
                     elif docstr:
                         break
-                docstr = '\n'.join(docstr) if docstr else "<empty>"
-                txt = "Typeclass |c{typeclass_path}|n; " \
-                      "First paragraph of docstring:\n\n{docstring}".format(
-                        typeclass_path=typeclass_path, docstring=docstr)
+                docstr = "\n".join(docstr) if docstr else "<empty>"
+                txt = (
+                    "Typeclass |c{typeclass_path}|n; "
+                    "First paragraph of docstring:\n\n{docstring}".format(
+                        typeclass_path=typeclass_path, docstring=docstr
+                    )
+                )
             else:
                 txt = "This is typeclass |y{}|n.".format(typeclass)
             return "node_examine_entity", {"text": txt, "back": "typeclass"}
-        elif action == 'remove':
+        elif action == "remove":
             prototype = _get_menu_prototype(caller)
-            old_typeclass = prototype.pop('typeclass', None)
+            old_typeclass = prototype.pop("typeclass", None)
             if old_typeclass:
                 _set_menu_prototype(caller, prototype)
                 caller.msg("Cleared typeclass {}.".format(old_typeclass))
@@ -891,7 +969,7 @@ def _typeclass_actions(caller, raw_inp, **kwargs):
 
 def _typeclass_select(caller, typeclass):
     """Select typeclass from list and add it to prototype. Return next node to go to."""
-    ret = _set_property(caller, typeclass, prop='typeclass', processor=str)
+    ret = _set_property(caller, typeclass, prop="typeclass", processor=str)
     caller.msg("Selected typeclass |c{}|n.".format(typeclass))
     return ret
 
@@ -905,9 +983,11 @@ def node_typeclass(caller):
         one of the prototype's |cparents|n.
 
         {current}
-    """.format(current=_get_current_value(caller, "typeclass"),
-               actions="|WSelect with |w<num>|W. Other actions: "
-                       "|we|Wxamine |w<num>|W, |wr|Wemove selection")
+    """.format(
+        current=_get_current_value(caller, "typeclass"),
+        actions="|WSelect with |w<num>|W. Other actions: "
+        "|we|Wxamine |w<num>|W, |wr|Wemove selection",
+    )
 
     helptext = """
         A |nTypeclass|n is specified by the actual python-path to the class definition in the
@@ -920,8 +1000,7 @@ def node_typeclass(caller):
     text = (text, helptext)
 
     options = _wizard_options("typeclass", "prototype_parent", "key", color="|W")
-    options.append({"key": "_default",
-                    "goto": _typeclass_actions})
+    options.append({"key": "_default", "goto": _typeclass_actions})
     return text, options
 
 
@@ -933,7 +1012,9 @@ def node_key(caller):
         The |cKey|n is the given name of the object to spawn. This will retain the given case.
 
         {current}
-    """.format(current=_get_current_value(caller, "key"))
+    """.format(
+        current=_get_current_value(caller, "key")
+    )
 
     helptext = """
         The key should often not be identical for every spawned object. Using a randomising
@@ -942,15 +1023,19 @@ def node_key(caller):
 
         |c$protfuncs|n
         {pfuncs}
-    """.format(pfuncs=_format_protfuncs())
+    """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("key", "typeclass", "aliases")
-    options.append({"key": "_default",
-                    "goto": (_set_property,
-                             dict(prop="key",
-                                  processor=lambda s: s.strip()))})
+    options.append(
+        {
+            "key": "_default",
+            "goto": (_set_property, dict(prop="key", processor=lambda s: s.strip())),
+        }
+    )
     return text, options
 
 
@@ -981,11 +1066,10 @@ def _aliases_select(caller, alias):
 def _aliases_actions(caller, raw_inp, **kwargs):
     """Parse actions for aliases listing"""
     choices = kwargs.get("available_choices", [])
-    alias, action = _default_parse(
-        raw_inp, choices, ("remove", "r", "delete", "d"))
+    alias, action = _default_parse(raw_inp, choices, ("remove", "r", "delete", "d"))
 
     aliases = _all_aliases(caller)
-    if alias and action == 'remove':
+    if alias and action == "remove":
         try:
             aliases.remove(alias)
             _set_prototype_value(caller, "aliases", aliases)
@@ -1012,14 +1096,18 @@ def node_aliases(caller):
         case sensitive.
 
         {current}
-    """.format(current=_get_current_value(
-                   caller, 'aliases',
-                   comparer=lambda propval, flatval: [al for al in flatval if al not in propval],
-                   formatter=lambda lst: "\n" + ", ".join(lst), only_inherit=True))
-    _set_actioninfo(caller,
-                    _format_list_actions(
-                        "remove",
-                        prefix="|w<text>|W to add new alias. Other action: "))
+    """.format(
+        current=_get_current_value(
+            caller,
+            "aliases",
+            comparer=lambda propval, flatval: [al for al in flatval if al not in propval],
+            formatter=lambda lst: "\n" + ", ".join(lst),
+            only_inherit=True,
+        )
+    )
+    _set_actioninfo(
+        caller, _format_list_actions("remove", prefix="|w<text>|W to add new alias. Other action: ")
+    )
 
     helptext = """
         Aliases are fixed alternative identifiers and are stored with the new object.
@@ -1027,13 +1115,14 @@ def node_aliases(caller):
         |c$protfuncs|n
 
         {pfuncs}
-    """.format(pfuncs=_format_protfuncs())
+    """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("aliases", "key", "attrs")
-    options.append({"key": "_default",
-                    "goto": _aliases_actions})
+    options.append({"key": "_default", "goto": _aliases_actions})
     return text, options
 
 
@@ -1042,8 +1131,10 @@ def node_aliases(caller):
 
 def _caller_attrs(caller):
     prototype = _get_menu_prototype(caller)
-    attrs = ["{}={}".format(tup[0], utils.crop(utils.to_str(tup[1]), width=10))
-             for tup in prototype.get("attrs", [])]
+    attrs = [
+        "{}={}".format(tup[0], utils.crop(utils.to_str(tup[1]), width=10))
+        for tup in prototype.get("attrs", [])
+    ]
     return attrs
 
 
@@ -1062,12 +1153,13 @@ def _display_attribute(attr_tuple):
     attrkey, value, category, locks = attr_tuple
     value = protlib.protfunc_parser(value)
     typ = type(value)
-    out = ("{attrkey} |c=|n {value} |W({typ}{category}{locks})|n".format(
-            attrkey=attrkey,
-            value=value,
-            typ=typ,
-            category=", category={}".format(category) if category else '',
-            locks=", locks={}".format(";".join(locks)) if any(locks) else ''))
+    out = "{attrkey} |c=|n {value} |W({typ}{category}{locks})|n".format(
+        attrkey=attrkey,
+        value=value,
+        typ=typ,
+        category=", category={}".format(category) if category else "",
+        locks=", locks={}".format(";".join(locks)) if any(locks) else "",
+    )
 
     return out
 
@@ -1090,15 +1182,15 @@ def _add_attr(caller, attr_string, **kwargs):
     Returns:
         result (str): Result string of action.
     """
-    attrname = ''
-    value = ''
+    attrname = ""
+    value = ""
     category = None
-    locks = ''
+    locks = ""
 
-    if 'delete' in kwargs:
+    if "delete" in kwargs:
         attrname = attr_string.lower().strip()
-    elif '=' in attr_string:
-        attrname, value = (part.strip() for part in attr_string.split('=', 1))
+    elif "=" in attr_string:
+        attrname, value = (part.strip() for part in attr_string.split("=", 1))
         attrname = attrname.lower()
         nameparts = attrname.split(";", 2)
         nparts = len(nameparts)
@@ -1110,9 +1202,9 @@ def _add_attr(caller, attr_string, **kwargs):
 
     if attrname:
         prot = _get_menu_prototype(caller)
-        attrs = prot.get('attrs', [])
+        attrs = prot.get("attrs", [])
 
-        if 'delete' in kwargs:
+        if "delete" in kwargs:
             try:
                 ind = [tup[0] for tup in attrs].index(attrname)
                 del attrs[ind]
@@ -1143,8 +1235,7 @@ def _attr_select(caller, attrstr):
 
     attr_tup = _get_tup_by_attrname(caller, attrname)
     if attr_tup:
-        return "node_examine_entity", \
-            {"text": _display_attribute(attr_tup), "back": "attrs"}
+        return "node_examine_entity", {"text": _display_attribute(attr_tup), "back": "attrs"}
     else:
         caller.msg("Attribute not found.")
         return "node_attrs"
@@ -1154,7 +1245,8 @@ def _attrs_actions(caller, raw_inp, **kwargs):
     """Parse actions for attribute listing"""
     choices = kwargs.get("available_choices", [])
     attrstr, action = _default_parse(
-        raw_inp, choices, ('examine', 'e'), ('remove', 'r', 'delete', 'd'))
+        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d")
+    )
     if attrstr is None:
         attrstr = raw_inp
     try:
@@ -1167,10 +1259,9 @@ def _attrs_actions(caller, raw_inp, **kwargs):
     attr_tup = _get_tup_by_attrname(caller, attrname)
 
     if action and attr_tup:
-        if action == 'examine':
-            return "node_examine_entity", \
-                   {"text": _display_attribute(attr_tup), "back": "attrs"}
-        elif action == 'remove':
+        if action == "examine":
+            return "node_examine_entity", {"text": _display_attribute(attr_tup), "back": "attrs"}
+        elif action == "remove":
             res = _add_attr(caller, attrname, delete=True)
             caller.msg(res)
     else:
@@ -1181,12 +1272,14 @@ def _attrs_actions(caller, raw_inp, **kwargs):
 
 @list_node(_caller_attrs, _attr_select)
 def node_attrs(caller):
-
     def _currentcmp(propval, flatval):
         "match by key + category"
         cmp1 = [(tup[0].lower(), tup[2].lower() if tup[2] else None) for tup in propval]
-        return [tup for tup in flatval if (tup[0].lower(), tup[2].lower()
-                if tup[2] else None) not in cmp1]
+        return [
+            tup
+            for tup in flatval
+            if (tup[0].lower(), tup[2].lower() if tup[2] else None) not in cmp1
+        ]
 
     text = """
         |cAttributes|n are custom properties of the object. Enter attributes on one of these forms:
@@ -1200,11 +1293,14 @@ def _currentcmp(propval, flatval):
 
         {current}
     """.format(
-            current=_get_current_value(
-                caller, "attrs",
-                comparer=_currentcmp,
-                formatter=lambda lst: "\n" + "\n".join(_display_attribute(tup) for tup in lst),
-                only_inherit=True))
+        current=_get_current_value(
+            caller,
+            "attrs",
+            comparer=_currentcmp,
+            formatter=lambda lst: "\n" + "\n".join(_display_attribute(tup) for tup in lst),
+            only_inherit=True,
+        )
+    )
     _set_actioninfo(caller, _format_list_actions("examine", "remove", prefix="Actions: "))
 
     helptext = """
@@ -1216,13 +1312,14 @@ def _currentcmp(propval, flatval):
         |c$protfuncs
 
         {pfuncs}
-    """.format(pfuncs=_format_protfuncs())
+    """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("attrs", "aliases", "tags")
-    options.append({"key": "_default",
-                    "goto": _attrs_actions})
+    options.append({"key": "_default", "goto": _attrs_actions})
     return text, options
 
 
@@ -1248,8 +1345,9 @@ def _get_tup_by_tagname(caller, tagname):
 def _display_tag(tag_tuple):
     """Pretty-print tag tuple"""
     tagkey, category, data = tag_tuple
-    out = ("Tag: '{tagkey}' (category: {category}{dat})".format(
-           tagkey=tagkey, category=category, dat=", data: {}".format(data) if data else ""))
+    out = "Tag: '{tagkey}' (category: {category}{dat})".format(
+        tagkey=tagkey, category=category, dat=", data: {}".format(data) if data else ""
+    )
     return out
 
 
@@ -1276,7 +1374,7 @@ def _add_tag(caller, tag_string, **kwargs):
     category = None
     data = ""
 
-    if 'delete' in kwargs:
+    if "delete" in kwargs:
         tag = tag_string.lower().strip()
     else:
         nameparts = tag.split(";", 2)
@@ -1290,11 +1388,11 @@ def _add_tag(caller, tag_string, **kwargs):
 
     if tag:
         prot = _get_menu_prototype(caller)
-        tags = prot.get('tags', [])
+        tags = prot.get("tags", [])
 
         old_tag = _get_tup_by_tagname(caller, tag)
 
-        if 'delete' in kwargs:
+        if "delete" in kwargs:
 
             if old_tag:
                 tags.pop(tags.index(old_tag))
@@ -1321,8 +1419,7 @@ def _add_tag(caller, tag_string, **kwargs):
 def _tag_select(caller, tagname):
     tag_tup = _get_tup_by_tagname(caller, tagname)
     if tag_tup:
-        return "node_examine_entity", \
-            {"text": _display_tag(tag_tup), "back": "attrs"}
+        return "node_examine_entity", {"text": _display_tag(tag_tup), "back": "attrs"}
     else:
         caller.msg("Tag not found.")
         return "node_attrs"
@@ -1332,7 +1429,8 @@ def _tags_actions(caller, raw_inp, **kwargs):
     """Parse actions for tags listing"""
     choices = kwargs.get("available_choices", [])
     tagname, action = _default_parse(
-            raw_inp, choices, ('examine', 'e'), ('remove', 'r', 'delete', 'd'))
+        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d")
+    )
 
     if tagname is None:
         tagname = raw_inp.lower().strip()
@@ -1340,10 +1438,9 @@ def _tags_actions(caller, raw_inp, **kwargs):
     tag_tup = _get_tup_by_tagname(caller, tagname)
 
     if tag_tup:
-        if action == 'examine':
-            return "node_examine_entity", \
-                    {"text": _display_tag(tag_tup), 'back': 'tags'}
-        elif action == 'remove':
+        if action == "examine":
+            return "node_examine_entity", {"text": _display_tag(tag_tup), "back": "tags"}
+        elif action == "remove":
             res = _add_tag(caller, tagname, delete=True)
             caller.msg(res)
     else:
@@ -1354,12 +1451,14 @@ def _tags_actions(caller, raw_inp, **kwargs):
 
 @list_node(_caller_tags, _tag_select)
 def node_tags(caller):
-
     def _currentcmp(propval, flatval):
         "match by key + category"
         cmp1 = [(tup[0].lower(), tup[1].lower() if tup[2] else None) for tup in propval]
-        return [tup for tup in flatval if (tup[0].lower(), tup[1].lower()
-                if tup[1] else None) not in cmp1]
+        return [
+            tup
+            for tup in flatval
+            if (tup[0].lower(), tup[1].lower() if tup[1] else None) not in cmp1
+        ]
 
     text = """
         |cTags|n are used to group objects so they can quickly be found later. Enter tags on one of
@@ -1370,11 +1469,14 @@ def _currentcmp(propval, flatval):
 
         {current}
     """.format(
-            current=_get_current_value(
-                caller, 'tags',
-                comparer=_currentcmp,
-                formatter=lambda lst: "\n" + "\n".join(_display_tag(tup) for tup in lst),
-                only_inherit=True))
+        current=_get_current_value(
+            caller,
+            "tags",
+            comparer=_currentcmp,
+            formatter=lambda lst: "\n" + "\n".join(_display_tag(tup) for tup in lst),
+            only_inherit=True,
+        )
+    )
     _set_actioninfo(caller, _format_list_actions("examine", "remove", prefix="Actions: "))
 
     helptext = """
@@ -1385,17 +1487,19 @@ def _currentcmp(propval, flatval):
         All objects created with this prototype will automatically get assigned a tag named the same
         as the |cprototype_key|n and with a category "{tag_category}". This allows the spawner to
         optionally update previously spawned objects when their prototype changes.
-    """.format(tag_category=protlib._PROTOTYPE_TAG_CATEGORY)
+    """.format(
+        tag_category=protlib._PROTOTYPE_TAG_CATEGORY
+    )
 
     text = (text, helptext)
     options = _wizard_options("tags", "attrs", "locks")
-    options.append({"key": "_default",
-                    "goto": _tags_actions})
+    options.append({"key": "_default", "goto": _tags_actions})
     return text, options
 
 
 # locks node
 
+
 def _caller_locks(caller):
     locks = _get_menu_prototype(caller).get("locks", "")
     return [lck for lck in locks.split(";") if lck]
@@ -1419,7 +1523,7 @@ def _lock_add(caller, lock, **kwargs):
 
     locktype = locktype.strip().lower()
 
-    if 'delete' in kwargs:
+    if "delete" in kwargs:
         try:
             ind = locks.index(lock)
             locks.pop(ind)
@@ -1443,12 +1547,13 @@ def _lock_add(caller, lock, **kwargs):
 def _locks_actions(caller, raw_inp, **kwargs):
     choices = kwargs.get("available_choices", [])
     lock, action = _default_parse(
-        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d"))
+        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d")
+    )
 
     if lock:
-        if action == 'examine':
+        if action == "examine":
             return "node_examine_entity", {"text": _locks_display(caller, lock), "back": "locks"}
-        elif action == 'remove':
+        elif action == "remove":
             ret = _lock_add(caller, lock, delete=True)
             caller.msg(ret)
     else:
@@ -1460,11 +1565,10 @@ def _locks_actions(caller, raw_inp, **kwargs):
 
 @list_node(_caller_locks, _lock_select)
 def node_locks(caller):
-
     def _currentcmp(propval, flatval):
         "match by locktype"
-        cmp1 = [lck.split(":", 1)[0] for lck in propval.split(';')]
-        return ";".join(lstr for lstr in flatval.split(';') if lstr.split(':', 1)[0] not in cmp1)
+        cmp1 = [lck.split(":", 1)[0] for lck in propval.split(";")]
+        return ";".join(lstr for lstr in flatval.split(";") if lstr.split(":", 1)[0] not in cmp1)
 
     text = """
         The |cLock string|n defines limitations for accessing various properties of the object once
@@ -1475,13 +1579,17 @@ def _currentcmp(propval, flatval):
 
         {current}{action}
         """.format(
-                current=_get_current_value(
-                    caller, 'locks',
-                    comparer=_currentcmp,
-                    formatter=lambda lockstr: "\n".join(_locks_display(caller, lstr)
-                                                        for lstr in lockstr.split(';')),
-                    only_inherit=True),
-                action=_format_list_actions("examine", "remove", prefix="Actions: "))
+        current=_get_current_value(
+            caller,
+            "locks",
+            comparer=_currentcmp,
+            formatter=lambda lockstr: "\n".join(
+                _locks_display(caller, lstr) for lstr in lockstr.split(";")
+            ),
+            only_inherit=True,
+        ),
+        action=_format_list_actions("examine", "remove", prefix="Actions: "),
+    )
 
     helptext = """
         Here is an example of two lock strings:
@@ -1497,19 +1605,21 @@ def _currentcmp(propval, flatval):
         |cAvailable lockfuncs:|n
 
         {lfuncs}
-    """.format(lfuncs=_format_lockfuncs())
+    """.format(
+        lfuncs=_format_lockfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("locks", "tags", "permissions")
-    options.append({"key": "_default",
-                    "goto": _locks_actions})
+    options.append({"key": "_default", "goto": _locks_actions})
 
     return text, options
 
 
 # permissions node
 
+
 def _caller_permissions(caller):
     prototype = _get_menu_prototype(caller)
     perms = prototype.get("permissions", [])
@@ -1519,13 +1629,16 @@ def _caller_permissions(caller):
 def _display_perm(caller, permission, only_hierarchy=False):
     hierarchy = settings.PERMISSION_HIERARCHY
     perm_low = permission.lower()
-    txt = ''
+    txt = ""
     if perm_low in [prm.lower() for prm in hierarchy]:
         txt = "Permission (in hieararchy): {}".format(
             ", ".join(
-                ["|w[{}]|n".format(prm)
-                 if prm.lower() == perm_low else "|W{}|n".format(prm)
-                 for prm in hierarchy]))
+                [
+                    "|w[{}]|n".format(prm) if prm.lower() == perm_low else "|W{}|n".format(prm)
+                    for prm in hierarchy
+                ]
+            )
+        )
     elif not only_hierarchy:
         txt = "Permission: '{}'".format(permission)
     return txt
@@ -1540,7 +1653,7 @@ def _add_perm(caller, perm, **kwargs):
         perm_low = perm.lower()
         perms = _caller_permissions(caller)
         perms_low = [prm.lower() for prm in perms]
-        if 'delete' in kwargs:
+        if "delete" in kwargs:
             try:
                 ind = perms_low.index(perm_low)
                 del perms[ind]
@@ -1561,13 +1674,16 @@ def _permissions_actions(caller, raw_inp, **kwargs):
     """Parse actions for permission listing"""
     choices = kwargs.get("available_choices", [])
     perm, action = _default_parse(
-            raw_inp, choices, ('examine', 'e'), ('remove', 'r', 'delete', 'd'))
+        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d")
+    )
 
     if perm:
-        if action == 'examine':
-            return "node_examine_entity", \
-                {"text": _display_perm(caller, perm), "back": "permissions"}
-        elif action == 'remove':
+        if action == "examine":
+            return (
+                "node_examine_entity",
+                {"text": _display_perm(caller, perm), "back": "permissions"},
+            )
+        elif action == "remove":
             res = _add_perm(caller, perm, delete=True)
             caller.msg(res)
     else:
@@ -1578,7 +1694,6 @@ def _permissions_actions(caller, raw_inp, **kwargs):
 
 @list_node(_caller_permissions, _permission_select)
 def node_permissions(caller):
-
     def _currentcmp(pval, fval):
         cmp1 = [perm.lower() for perm in pval]
         return [perm for perm in fval if perm.lower() not in cmp1]
@@ -1591,10 +1706,14 @@ def _currentcmp(pval, fval):
 
         {current}
     """.format(
-            current=_get_current_value(
-                caller, 'permissions',
-                comparer=_currentcmp,
-                formatter=lambda lst: "\n" + "\n".join(prm for prm in lst), only_inherit=True))
+        current=_get_current_value(
+            caller,
+            "permissions",
+            comparer=_currentcmp,
+            formatter=lambda lst: "\n" + "\n".join(prm for prm in lst),
+            only_inherit=True,
+        )
+    )
     _set_actioninfo(caller, _format_list_actions("examine", "remove", prefix="Actions: "))
 
     helptext = """
@@ -1607,13 +1726,14 @@ def _currentcmp(pval, fval):
 
         For example, a |clock|n string like "edit:perm(Builder)" will grant access to accessors
         having the |cpermission|n "Builder" or higher.
-    """.format(permissions=", ".join(settings.PERMISSION_HIERARCHY))
+    """.format(
+        permissions=", ".join(settings.PERMISSION_HIERARCHY)
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("permissions", "locks", "location")
-    options.append({"key": "_default",
-                    "goto": _permissions_actions})
+    options.append({"key": "_default", "goto": _permissions_actions})
 
     return text, options
 
@@ -1628,7 +1748,9 @@ def node_location(caller):
         inventory of |c{caller}|n by default.
 
         {current}
-    """.format(caller=caller.key, current=_get_current_value(caller, "location"))
+    """.format(
+        caller=caller.key, current=_get_current_value(caller, "location")
+    )
 
     helptext = """
         You get the most control by not specifying the location - you can then teleport the spawned
@@ -1637,15 +1759,19 @@ def node_location(caller):
 
         |c$protfuncs|n
         {pfuncs}
-    """.format(pfuncs=_format_protfuncs())
+    """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("location", "permissions", "home", search=True)
-    options.append({"key": "_default",
-                    "goto": (_set_property,
-                             dict(prop="location",
-                                  processor=lambda s: s.strip()))})
+    options.append(
+        {
+            "key": "_default",
+            "goto": (_set_property, dict(prop="location", processor=lambda s: s.strip())),
+        }
+    )
     return text, options
 
 
@@ -1662,8 +1788,9 @@ def node_home(caller):
         If unset, the global home default (|w{default}|n) will be used.
 
         {current}
-        """.format(default=settings.DEFAULT_HOME,
-                   current=_get_current_value(caller, "home"))
+        """.format(
+        default=settings.DEFAULT_HOME, current=_get_current_value(caller, "home")
+    )
     helptext = """
         The home can be given as a #dbref but can also be specified using the protfunc
         '$obj(name)'. Use |wSE|nearch to find objects in the database.
@@ -1673,15 +1800,19 @@ def node_home(caller):
 
         |c$protfuncs|n
         {pfuncs}
-    """.format(pfuncs=_format_protfuncs())
+    """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("home", "location", "destination", search=True)
-    options.append({"key": "_default",
-                    "goto": (_set_property,
-                             dict(prop="home",
-                                  processor=lambda s: s.strip()))})
+    options.append(
+        {
+            "key": "_default",
+            "goto": (_set_property, dict(prop="home", processor=lambda s: s.strip())),
+        }
+    )
     return text, options
 
 
@@ -1695,7 +1826,9 @@ def node_destination(caller):
         the exit 'leads to'. It's usually unset for all other types of objects.
 
         {current}
-    """.format(current=_get_current_value(caller, "destination"))
+    """.format(
+        current=_get_current_value(caller, "destination")
+    )
 
     helptext = """
         The destination can be given as a #dbref but can also be specified using the protfunc
@@ -1703,15 +1836,19 @@ def node_destination(caller):
 
         |c$protfuncs|n
         {pfuncs}
-    """.format(pfuncs=_format_protfuncs())
+    """.format(
+        pfuncs=_format_protfuncs()
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("destination", "home", "prototype_desc", search=True)
-    options.append({"key": "_default",
-                    "goto": (_set_property,
-                             dict(prop="destination",
-                                  processor=lambda s: s.strip()))})
+    options.append(
+        {
+            "key": "_default",
+            "goto": (_set_property, dict(prop="destination", processor=lambda s: s.strip())),
+        }
+    )
     return text, options
 
 
@@ -1724,7 +1861,9 @@ def node_prototype_desc(caller):
         The |cPrototype-Description|n briefly describes the prototype when it's viewed in listings.
 
         {current}
-        """.format(current=_get_current_value(caller, "prototype_desc"))
+        """.format(
+        current=_get_current_value(caller, "prototype_desc")
+    )
 
     helptext = """
         Giving a brief description helps you and others to locate the prototype for use later.
@@ -1733,11 +1872,19 @@ def node_prototype_desc(caller):
     text = (text, helptext)
 
     options = _wizard_options("prototype_desc", "prototype_key", "prototype_tags")
-    options.append({"key": "_default",
-                    "goto": (_set_property,
-                             dict(prop='prototype_desc',
-                                  processor=lambda s: s.strip(),
-                                  next_node="node_prototype_desc"))})
+    options.append(
+        {
+            "key": "_default",
+            "goto": (
+                _set_property,
+                dict(
+                    prop="prototype_desc",
+                    processor=lambda s: s.strip(),
+                    next_node="node_prototype_desc",
+                ),
+            ),
+        }
+    )
 
     return text, options
 
@@ -1748,6 +1895,7 @@ def node_prototype_desc(caller):
 def _caller_prototype_tags(caller):
     prototype = _get_menu_prototype(caller)
     tags = prototype.get("prototype_tags", [])
+    tags = [tag[0] if isinstance(tag, tuple) else tag for tag in tags]
     return tags
 
 
@@ -1771,11 +1919,10 @@ def _add_prototype_tag(caller, tag_string, **kwargs):
     tag = tag_string.strip().lower()
 
     if tag:
-        prot = _get_menu_prototype(caller)
-        tags = prot.get('prototype_tags', [])
+        tags = _caller_prototype_tags(caller)
         exists = tag in tags
 
-        if 'delete' in kwargs:
+        if "delete" in kwargs:
             if exists:
                 tags.pop(tags.index(tag))
                 text = "Removed Prototype-Tag '{}'.".format(tag)
@@ -1803,11 +1950,10 @@ def _prototype_tag_select(caller, tagname):
 def _prototype_tags_actions(caller, raw_inp, **kwargs):
     """Parse actions for tags listing"""
     choices = kwargs.get("available_choices", [])
-    tagname, action = _default_parse(
-            raw_inp, choices, ('remove', 'r', 'delete', 'd'))
+    tagname, action = _default_parse(raw_inp, choices, ("remove", "r", "delete", "d"))
 
     if tagname:
-        if action == 'remove':
+        if action == "remove":
             res = _add_prototype_tag(caller, tagname, delete=True)
             caller.msg(res)
     else:
@@ -1825,22 +1971,28 @@ def node_prototype_tags(caller):
 
         {current}
         """.format(
-                current=_get_current_value(
-                    caller, 'prototype_tags',
-                    formatter=lambda lst: ", ".join(tg for tg in lst), only_inherit=True))
-    _set_actioninfo(caller, _format_list_actions(
-                    "remove", prefix="|w<text>|n|W to add Tag. Other Action:|n "))
+        current=_get_current_value(
+            caller,
+            "prototype_tags",
+            formatter=lambda lst: ", ".join(tg for tg in lst),
+            only_inherit=True,
+        )
+    )
+    _set_actioninfo(
+        caller, _format_list_actions("remove", prefix="|w<text>|n|W to add Tag. Other Action:|n ")
+    )
     helptext = """
         Using prototype-tags is a good way to organize and group large numbers of prototypes by
         genre, type etc. Under the hood, prototypes' tags will all be stored with the category
         '{tagmetacategory}'.
-    """.format(tagmetacategory=protlib._PROTOTYPE_TAG_META_CATEGORY)
+    """.format(
+        tagmetacategory=protlib._PROTOTYPE_TAG_META_CATEGORY
+    )
 
     text = (text, helptext)
 
     options = _wizard_options("prototype_tags", "prototype_desc", "prototype_locks")
-    options.append({"key": "_default",
-                    "goto": _prototype_tags_actions})
+    options.append({"key": "_default", "goto": _prototype_tags_actions})
 
     return text, options
 
@@ -1854,7 +2006,10 @@ def _caller_prototype_locks(caller):
 
 
 def _prototype_lock_select(caller, lockstr):
-    return "node_examine_entity", {"text": _locks_display(caller, lockstr), "back": "prototype_locks"}
+    return (
+        "node_examine_entity",
+        {"text": _locks_display(caller, lockstr), "back": "prototype_locks"},
+    )
 
 
 def _prototype_lock_add(caller, lock, **kwargs):
@@ -1867,7 +2022,7 @@ def _prototype_lock_add(caller, lock, **kwargs):
 
     locktype = locktype.strip().lower()
 
-    if 'delete' in kwargs:
+    if "delete" in kwargs:
         try:
             ind = locks.index(lock)
             locks.pop(ind)
@@ -1891,12 +2046,13 @@ def _prototype_lock_add(caller, lock, **kwargs):
 def _prototype_locks_actions(caller, raw_inp, **kwargs):
     choices = kwargs.get("available_choices", [])
     lock, action = _default_parse(
-        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d"))
+        raw_inp, choices, ("examine", "e"), ("remove", "r", "delete", "d")
+    )
 
     if lock:
-        if action == 'examine':
+        if action == "examine":
             return "node_examine_entity", {"text": _locks_display(caller, lock), "back": "locks"}
-        elif action == 'remove':
+        elif action == "remove":
             ret = _prototype_lock_add(caller, lock.strip(), delete=True)
             caller.msg(ret)
     else:
@@ -1922,12 +2078,16 @@ def node_prototype_locks(caller):
 
         {current}
     """.format(
-            current=_get_current_value(
-                caller, 'prototype_locks',
-                formatter=lambda lstring: "\n".join(_locks_display(caller, lstr)
-                                                    for lstr in lstring.split(';')),
-                only_inherit=True))
-    _set_actioninfo(caller, _format_list_actions('examine', "remove", prefix="Actions: "))
+        current=_get_current_value(
+            caller,
+            "prototype_locks",
+            formatter=lambda lstring: "\n".join(
+                _locks_display(caller, lstr) for lstr in lstring.split(";")
+            ),
+            only_inherit=True,
+        )
+    )
+    _set_actioninfo(caller, _format_list_actions("examine", "remove", prefix="Actions: "))
 
     helptext = """
         Prototype locks can be used to vary access for different tiers of builders. It also allows
@@ -1938,8 +2098,7 @@ def node_prototype_locks(caller):
     text = (text, helptext)
 
     options = _wizard_options("prototype_locks", "prototype_tags", "index")
-    options.append({"key": "_default",
-                    "goto": _prototype_locks_actions})
+    options.append({"key": "_default", "goto": _prototype_locks_actions})
 
     return text, options
 
@@ -1949,10 +2108,10 @@ def node_prototype_locks(caller):
 
 def _apply_diff(caller, **kwargs):
     """update existing objects"""
-    prototype = kwargs['prototype']
-    objects = kwargs['objects']
-    back_node = kwargs['back_node']
-    diff = kwargs.get('diff', None)
+    prototype = kwargs["prototype"]
+    objects = kwargs["objects"]
+    back_node = kwargs["back_node"]
+    diff = kwargs.get("diff", None)
     num_changed = spawner.batch_update_objects_with_prototype(prototype, diff=diff, objects=objects)
     caller.msg("|g{num} objects were updated successfully.|n".format(num=num_changed))
     return back_node
@@ -1961,8 +2120,8 @@ def _apply_diff(caller, **kwargs):
 def _keep_diff(caller, **kwargs):
     """Change to KEEP setting for a given section of a diff"""
     # from evennia import set_trace;set_trace(term_size=(182, 50))
-    path = kwargs['path']
-    diff = kwargs['diff']
+    path = kwargs["path"]
+    diff = kwargs["diff"]
     tmp = diff
     for key in path[:-1]:
         tmp = tmp[key]
@@ -1984,7 +2143,7 @@ def _format_diff_text_and_options(diff, **kwargs):
         options (list): List of options dict.
 
     """
-    valid_instructions = ('KEEP', 'REMOVE', 'ADD', 'UPDATE')
+    valid_instructions = ("KEEP", "REMOVE", "ADD", "UPDATE")
 
     def _visualize(obj, rootname, get_name=False):
         if utils.is_iter(obj):
@@ -2003,26 +2162,32 @@ def _parse_diffpart(diffpart, optnum, *args):
         if typ == tuple and len(diffpart) == 3 and diffpart[2] in valid_instructions:
             rootname = args[0]
             old, new, instruction = diffpart
-            if instruction == 'KEEP':
+            if instruction == "KEEP":
                 texts.append("   |gKEEP|W:|n {old}".format(old=_visualize(old, rootname)))
             else:
                 vold = _visualize(old, rootname)
                 vnew = _visualize(new, rootname)
                 vsep = "" if len(vold) < 78 else "\n"
-                vinst = "|rREMOVE|n" if instruction == 'REMOVE' else "|y{}|n".format(instruction)
-                texts.append("   |c[{num}] {inst}|W:|n {old} |W->|n{sep} {new}".format(
-                    inst=vinst, num=optnum, old=vold, sep=vsep, new=vnew))
-                options.append({"key": str(optnum),
-                                "desc": "|gKEEP|n ({}) {}".format(
-                                    rootname, _visualize(old, args[-1], get_name=True)),
-                                "goto": (_keep_diff, dict((("path",  args),
-                                                           ("diff", diff)), **kwargs))})
+                vinst = "|rREMOVE|n" if instruction == "REMOVE" else "|y{}|n".format(instruction)
+                texts.append(
+                    "   |c[{num}] {inst}|W:|n {old} |W->|n{sep} {new}".format(
+                        inst=vinst, num=optnum, old=vold, sep=vsep, new=vnew
+                    )
+                )
+                options.append(
+                    {
+                        "key": str(optnum),
+                        "desc": "|gKEEP|n ({}) {}".format(
+                            rootname, _visualize(old, args[-1], get_name=True)
+                        ),
+                        "goto": (_keep_diff, dict((("path", args), ("diff", diff)), **kwargs)),
+                    }
+                )
                 optnum += 1
         else:
             for key in sorted(list(diffpart.keys())):
                 subdiffpart = diffpart[key]
-                text, option, optnum = _parse_diffpart(
-                        subdiffpart, optnum, *(args + (key, )))
+                text, option, optnum = _parse_diffpart(subdiffpart, optnum, *(args + (key,)))
                 texts.extend(text)
                 options.extend(option)
         return texts, options, optnum
@@ -2055,11 +2220,21 @@ def node_apply_diff(caller, **kwargs):
 
     def _keep_option(keyname, prototype, base_obj, obj_prototype, diff, objects, back_node):
         """helper returning an option dict"""
-        options = {"desc": "Keep {} as-is".format(keyname),
-                   "goto": (_keep_diff,
-                            {"key": keyname, "prototype": prototype,
-                             "base_obj": base_obj, "obj_prototype": obj_prototype,
-                             "diff": diff, "objects": objects, "back_node": back_node})}
+        options = {
+            "desc": "Keep {} as-is".format(keyname),
+            "goto": (
+                _keep_diff,
+                {
+                    "key": keyname,
+                    "prototype": prototype,
+                    "base_obj": base_obj,
+                    "obj_prototype": obj_prototype,
+                    "diff": diff,
+                    "objects": objects,
+                    "back_node": back_node,
+                },
+            ),
+        }
         return options
 
     prototype = kwargs.get("prototype", None)
@@ -2072,8 +2247,7 @@ def _keep_option(keyname, prototype, base_obj, obj_prototype, diff, objects, bac
 
     if not update_objects:
         text = "There are no existing objects to update."
-        options = {"key": "_default",
-                   "goto": back_node}
+        options = {"key": "_default", "goto": back_node}
         return text, options
 
     if not diff:
@@ -2103,24 +2277,45 @@ def _keep_option(keyname, prototype, base_obj, obj_prototype, diff, objects, bac
     txt, options = _format_diff_text_and_options(diff, objects=update_objects, base_obj=base_obj)
 
     if options:
-        text = ["Suggested changes to {} objects. ".format(len(update_objects)),
-                "Showing random example obj to change: {name} ({dbref}))\n".format(
-                    name=base_obj.key, dbref=base_obj.dbref)] + txt
+        text = [
+            "Suggested changes to {} objects. ".format(len(update_objects)),
+            "Showing random example obj to change: {name} ({dbref}))\n".format(
+                name=base_obj.key, dbref=base_obj.dbref
+            ),
+        ] + txt
         options.extend(
-            [{"key": ("|wu|Wpdate {} objects".format(len(update_objects)), "update", "u"),
-              "desc": "Update {} objects".format(len(update_objects)),
-              "goto": (_apply_diff, {"prototype": prototype, "objects": update_objects,
-                       "back_node": back_node, "diff": diff, "base_obj": base_obj})},
-             {"key": ("|wr|Weset changes", "reset", "r"),
-              "goto": ("node_apply_diff", {"prototype": prototype, "back_node": back_node,
-                                           "objects": update_objects})}])
+            [
+                {
+                    "key": ("|wu|Wpdate {} objects".format(len(update_objects)), "update", "u"),
+                    "desc": "Update {} objects".format(len(update_objects)),
+                    "goto": (
+                        _apply_diff,
+                        {
+                            "prototype": prototype,
+                            "objects": update_objects,
+                            "back_node": back_node,
+                            "diff": diff,
+                            "base_obj": base_obj,
+                        },
+                    ),
+                },
+                {
+                    "key": ("|wr|Weset changes", "reset", "r"),
+                    "goto": (
+                        "node_apply_diff",
+                        {"prototype": prototype, "back_node": back_node, "objects": update_objects},
+                    ),
+                },
+            ]
+        )
     else:
-        text = ["Analyzed a random sample object (out of {}) - "
-                "found no changes to apply.".format(len(update_objects))]
+        text = [
+            "Analyzed a random sample object (out of {}) - "
+            "found no changes to apply.".format(len(update_objects))
+        ]
 
     options.extend(_wizard_options("update_objects", back_node[5:], None))
-    options.append({"key": "_default",
-                    "goto": back_node})
+    options.append({"key": "_default", "goto": back_node})
 
     text = "\n".join(text)
     text = (text, helptext)
@@ -2146,8 +2341,7 @@ def node_prototype_save(caller, **kwargs):
             protlib.save_prototype(prototype)
         except Exception as exc:
             text = "|rCould not save:|n {}\n(press Return to continue)".format(exc)
-            options = {"key": "_default",
-                       "goto": "node_index"}
+            options = {"key": "_default", "goto": "node_index"}
             return text, options
 
         spawned_objects = protlib.search_objects_with_prototype(prototype_key)
@@ -2156,23 +2350,30 @@ def node_prototype_save(caller, **kwargs):
         text = ["|gPrototype saved.|n"]
 
         if nspawned:
-            text.append("\nDo you want to update {} object(s) "
-                        "already using this prototype?".format(nspawned))
+            text.append(
+                "\nDo you want to update {} object(s) "
+                "already using this prototype?".format(nspawned)
+            )
             options = (
-                {"key": ("|wY|Wes|n", "yes", "y"),
-                 "desc": "Go to updating screen",
-                 "goto": ("node_apply_diff",
-                          {"accept_update": True, "objects": spawned_objects,
-                           "prototype": prototype, "back_node": "node_prototype_save"})},
-                {"key": ("[|wN|Wo|n]", "n"),
-                 "desc": "Return to index",
-                 "goto": "node_index"},
-                {"key": "_default",
-                 "goto": "node_index"})
+                {
+                    "key": ("|wY|Wes|n", "yes", "y"),
+                    "desc": "Go to updating screen",
+                    "goto": (
+                        "node_apply_diff",
+                        {
+                            "accept_update": True,
+                            "objects": spawned_objects,
+                            "prototype": prototype,
+                            "back_node": "node_prototype_save",
+                        },
+                    ),
+                },
+                {"key": ("[|wN|Wo|n]", "n"), "desc": "Return to index", "goto": "node_index"},
+                {"key": "_default", "goto": "node_index"},
+            )
         else:
             text.append("(press Return to continue)")
-            options = {"key": "_default",
-                       "goto": "node_index"}
+            options = {"key": "_default", "goto": "node_index"}
 
         text = "\n".join(text)
 
@@ -2198,16 +2399,19 @@ def node_prototype_save(caller, **kwargs):
         # abort save
         text.append(
             "\n|yValidation errors were found. They need to be corrected before this prototype "
-            "can be saved (or used to spawn).|n")
+            "can be saved (or used to spawn).|n"
+        )
         options = _wizard_options("prototype_save", "index", None)
-        options.append({"key": "_default",
-                        "goto": "node_index"})
-        return "\n".join(text),  options
+        options.append({"key": "_default", "goto": "node_index"})
+        return "\n".join(text), options
 
-    prototype_key = prototype['prototype_key']
+    prototype_key = prototype["prototype_key"]
     if protlib.search_prototype(prototype_key):
-        text.append("\nDo you want to save/overwrite the existing prototype '{name}'?".format(
-            name=prototype_key))
+        text.append(
+            "\nDo you want to save/overwrite the existing prototype '{name}'?".format(
+                name=prototype_key
+            )
+        )
     else:
         text.append("\nDo you want to save the prototype as '{name}'?".format(name=prototype_key))
 
@@ -2224,18 +2428,19 @@ def node_prototype_save(caller, **kwargs):
     text = (text, helptext)
 
     options = (
-        {"key": ("[|wY|Wes|n]", "yes", "y"),
-         "desc": "Save prototype",
-         "goto": ("node_prototype_save",
-                  {"accept_save": True, "prototype": prototype})},
-        {"key": ("|wN|Wo|n", "n"),
-         "desc": "Abort and return to Index",
-         "goto": "node_index"},
-        {"key": "_default",
-         "goto": ("node_prototype_save",
-                  {"accept_save": True, "prototype": prototype})})
+        {
+            "key": ("[|wY|Wes|n]", "yes", "y"),
+            "desc": "Save prototype",
+            "goto": ("node_prototype_save", {"accept_save": True, "prototype": prototype}),
+        },
+        {"key": ("|wN|Wo|n", "n"), "desc": "Abort and return to Index", "goto": "node_index"},
+        {
+            "key": "_default",
+            "goto": ("node_prototype_save", {"accept_save": True, "prototype": prototype}),
+        },
+    )
 
-    return text,  options
+    return text, options
 
 
 # spawning node
@@ -2244,17 +2449,18 @@ def node_prototype_save(caller, **kwargs):
 def _spawn(caller, **kwargs):
     """Spawn prototype"""
     prototype = kwargs["prototype"].copy()
-    new_location = kwargs.get('location', None)
+    new_location = kwargs.get("location", None)
     if new_location:
-        prototype['location'] = new_location
-    if not prototype.get('location'):
-        prototype['location'] = caller
+        prototype["location"] = new_location
+    if not prototype.get("location"):
+        prototype["location"] = caller
 
     obj = spawner.spawn(prototype)
     if obj:
         obj = obj[0]
         text = "|gNew instance|n {key} ({dbref}) |gspawned at location |n{loc}|n|g.|n".format(
-                    key=obj.key, dbref=obj.dbref, loc=prototype['location'])
+            key=obj.key, dbref=obj.dbref, loc=prototype["location"]
+        )
     else:
         text = "|rError: Spawner did not return a new instance.|n"
     return "node_examine_entity", {"text": text, "back": "prototype_spawn"}
@@ -2291,39 +2497,55 @@ def node_prototype_spawn(caller, **kwargs):
 
     # show spawn submenu options
     options = []
-    prototype_key = prototype['prototype_key']
-    location = prototype.get('location', None)
+    prototype_key = prototype["prototype_key"]
+    location = prototype.get("location", None)
 
     if location:
         options.append(
-            {"desc": "Spawn in prototype's defined location ({loc})".format(loc=location),
-             "goto": (_spawn,
-                      dict(prototype=prototype, location=location, custom_location=True))})
+            {
+                "desc": "Spawn in prototype's defined location ({loc})".format(loc=location),
+                "goto": (
+                    _spawn,
+                    dict(prototype=prototype, location=location, custom_location=True),
+                ),
+            }
+        )
     caller_loc = caller.location
     if location != caller_loc:
         options.append(
-            {"desc": "Spawn in {caller}'s location ({loc})".format(
-                caller=caller, loc=caller_loc),
-             "goto": (_spawn,
-                      dict(prototype=prototype, location=caller_loc))})
+            {
+                "desc": "Spawn in {caller}'s location ({loc})".format(
+                    caller=caller, loc=caller_loc
+                ),
+                "goto": (_spawn, dict(prototype=prototype, location=caller_loc)),
+            }
+        )
     if location != caller_loc != caller:
         options.append(
-            {"desc": "Spawn in {caller}'s inventory".format(caller=caller),
-             "goto": (_spawn,
-                      dict(prototype=prototype, location=caller))})
+            {
+                "desc": "Spawn in {caller}'s inventory".format(caller=caller),
+                "goto": (_spawn, dict(prototype=prototype, location=caller)),
+            }
+        )
 
     spawned_objects = protlib.search_objects_with_prototype(prototype_key)
     nspawned = spawned_objects.count()
     if spawned_objects:
         options.append(
-           {"desc": "Update {num} existing objects with this prototype".format(num=nspawned),
-            "goto": ("node_apply_diff",
-                     {"objects": list(spawned_objects),
-                      "prototype": prototype,
-                      "back_node": "node_prototype_spawn"})})
+            {
+                "desc": "Update {num} existing objects with this prototype".format(num=nspawned),
+                "goto": (
+                    "node_apply_diff",
+                    {
+                        "objects": list(spawned_objects),
+                        "prototype": prototype,
+                        "back_node": "node_prototype_spawn",
+                    },
+                ),
+            }
+        )
     options.extend(_wizard_options("prototype_spawn", "index", None))
-    options.append({"key": "_default",
-                    "goto": "node_index"})
+    options.append({"key": "_default", "goto": "node_index"})
 
     return text, options
 
@@ -2336,9 +2558,13 @@ def _prototype_load_select(caller, prototype_key):
     if matches:
         prototype = matches[0]
         _set_menu_prototype(caller, prototype)
-        return "node_examine_entity", \
-            {"text": "|gLoaded prototype {}.|n".format(prototype['prototype_key']),
-             "back": "index"}
+        return (
+            "node_examine_entity",
+            {
+                "text": "|gLoaded prototype {}.|n".format(prototype["prototype_key"]),
+                "back": "index",
+            },
+        )
     else:
         caller.msg("|rFailed to load prototype '{}'.".format(prototype_key))
         return None
@@ -2348,17 +2574,18 @@ def _prototype_load_actions(caller, raw_inp, **kwargs):
     """Parse the default Convert prototype to a string representation for closer inspection"""
     choices = kwargs.get("available_choices", [])
     prototype, action = _default_parse(
-        raw_inp, choices, ("examine", "e", "l"), ("delete", "del", "d"))
+        raw_inp, choices, ("examine", "e", "l"), ("delete", "del", "d")
+    )
 
     if prototype:
 
         # which action to apply on the selection
-        if action == 'examine':
+        if action == "examine":
             # examine the prototype
             prototype = protlib.search_prototype(key=prototype)[0]
             txt = protlib.prototype_to_str(prototype)
-            return "node_examine_entity", {"text": txt, "back": 'prototype_load'}
-        elif action == 'delete':
+            return "node_examine_entity", {"text": txt, "back": "prototype_load"}
+        elif action == "delete":
             # delete prototype from disk
             try:
                 protlib.delete_prototype(prototype, caller=caller)
@@ -2368,7 +2595,7 @@ def _prototype_load_actions(caller, raw_inp, **kwargs):
                 txt = "|gPrototype {} was deleted.|n".format(prototype)
             return "node_examine_entity", {"text": txt, "back": "prototype_load"}
 
-    return 'node_prototype_load'
+    return "node_prototype_load"
 
 
 @list_node(_all_prototype_parents, _prototype_load_select)
@@ -2388,8 +2615,7 @@ def node_prototype_load(caller, **kwargs):
     text = (text, helptext)
 
     options = _wizard_options("prototype_load", "index", None)
-    options.append({"key": "_default",
-                    "goto": _prototype_load_actions})
+    options.append({"key": "_default", "goto": _prototype_load_actions})
 
     return text, options
 
@@ -2402,6 +2628,7 @@ class OLCMenu(EvMenu):
     A custom EvMenu with a different formatting for the options.
 
     """
+
     def nodetext_formatter(self, nodetext):
         """
         Format the node text itself.
@@ -2414,10 +2641,20 @@ def options_formatter(self, optionlist):
         Split the options into two blocks - olc options and normal options
 
         """
-        olc_keys = ("index", "forward", "back", "previous", "next", "validate prototype",
-                    "save prototype", "load prototype", "spawn prototype", "search objects")
-        actioninfo = self.actioninfo + "\n" if hasattr(self, 'actioninfo') else ''
-        self.actioninfo = ''  # important, or this could bleed over to other nodes
+        olc_keys = (
+            "index",
+            "forward",
+            "back",
+            "previous",
+            "next",
+            "validate prototype",
+            "save prototype",
+            "load prototype",
+            "spawn prototype",
+            "search objects",
+        )
+        actioninfo = self.actioninfo + "\n" if hasattr(self, "actioninfo") else ""
+        self.actioninfo = ""  # important, or this could bleed over to other nodes
         olc_options = []
         other_options = []
         for key, desc in optionlist:
@@ -2428,8 +2665,11 @@ def options_formatter(self, optionlist):
             else:
                 other_options.append((key, desc))
 
-        olc_options = actioninfo + \
-            " |W|||n ".join(olc_options) + " |W|||n " + "|wQ|Wuit" if olc_options else ""
+        olc_options = (
+            actioninfo + " |W|||n ".join(olc_options) + " |W|||n " + "|wQ|Wuit"
+            if olc_options
+            else ""
+        )
         other_options = super(OLCMenu, self).options_formatter(other_options)
         sep = "\n\n" if olc_options and other_options else ""
 
@@ -2442,7 +2682,7 @@ def helptext_formatter(self, helptext):
         return "|c --- Help ---|n\n" + utils.dedent(helptext)
 
     def display_helptext(self):
-        evmore.msg(self.caller, self.helptext, session=self._session, exit_cmd='look')
+        evmore.msg(self.caller, self.helptext, session=self._session, exit_cmd="look")
 
 
 def start_olc(caller, session=None, prototype=None):
@@ -2456,29 +2696,36 @@ def start_olc(caller, session=None, prototype=None):
             prototype rather than creating a new one.
 
     """
-    menudata = {"node_index": node_index,
-                "node_validate_prototype": node_validate_prototype,
-                "node_examine_entity": node_examine_entity,
-                "node_search_object": node_search_object,
-                "node_prototype_key": node_prototype_key,
-                "node_prototype_parent": node_prototype_parent,
-                "node_typeclass": node_typeclass,
-                "node_key": node_key,
-                "node_aliases": node_aliases,
-                "node_attrs": node_attrs,
-                "node_tags": node_tags,
-                "node_locks": node_locks,
-                "node_permissions": node_permissions,
-                "node_location": node_location,
-                "node_home": node_home,
-                "node_destination": node_destination,
-                "node_apply_diff": node_apply_diff,
-                "node_prototype_desc": node_prototype_desc,
-                "node_prototype_tags": node_prototype_tags,
-                "node_prototype_locks": node_prototype_locks,
-                "node_prototype_load": node_prototype_load,
-                "node_prototype_save": node_prototype_save,
-                "node_prototype_spawn": node_prototype_spawn
-                }
-    OLCMenu(caller, menudata, startnode='node_index', session=session,
-            olc_prototype=prototype, debug=True)
+    menudata = {
+        "node_index": node_index,
+        "node_validate_prototype": node_validate_prototype,
+        "node_examine_entity": node_examine_entity,
+        "node_search_object": node_search_object,
+        "node_prototype_key": node_prototype_key,
+        "node_prototype_parent": node_prototype_parent,
+        "node_typeclass": node_typeclass,
+        "node_key": node_key,
+        "node_aliases": node_aliases,
+        "node_attrs": node_attrs,
+        "node_tags": node_tags,
+        "node_locks": node_locks,
+        "node_permissions": node_permissions,
+        "node_location": node_location,
+        "node_home": node_home,
+        "node_destination": node_destination,
+        "node_apply_diff": node_apply_diff,
+        "node_prototype_desc": node_prototype_desc,
+        "node_prototype_tags": node_prototype_tags,
+        "node_prototype_locks": node_prototype_locks,
+        "node_prototype_load": node_prototype_load,
+        "node_prototype_save": node_prototype_save,
+        "node_prototype_spawn": node_prototype_spawn,
+    }
+    OLCMenu(
+        caller,
+        menudata,
+        startnode="node_index",
+        session=session,
+        olc_prototype=prototype,
+        debug=True,
+    )
diff --git a/evennia/prototypes/protfuncs.py b/evennia/prototypes/protfuncs.py
index 4290bf6bdf0..e22fd5a46a3 100644
--- a/evennia/prototypes/protfuncs.py
+++ b/evennia/prototypes/protfuncs.py
@@ -49,6 +49,7 @@ def funcname (*args, **kwargs)
 
 # default protfuncs
 
+
 def random(*args, **kwargs):
     """
     Usage: $random()
@@ -77,7 +78,7 @@ def left_justify(*args, **kwargs):
 
     """
     if args:
-        return base_justify(args[0], align='l')
+        return base_justify(args[0], align="l")
     return ""
 
 
@@ -88,7 +89,7 @@ def right_justify(*args, **kwargs):
 
     """
     if args:
-        return base_justify(args[0], align='r')
+        return base_justify(args[0], align="r")
     return ""
 
 
@@ -100,7 +101,7 @@ def center_justify(*args, **kwargs):
 
     """
     if args:
-        return base_justify(args[0], align='c')
+        return base_justify(args[0], align="c")
     return ""
 
 
@@ -122,7 +123,7 @@ def full_justify(*args, **kwargs):
 
     """
     if args:
-        return base_justify(args[0], align='f')
+        return base_justify(args[0], align="f")
     return ""
 
 
@@ -134,7 +135,7 @@ def protkey(*args, **kwargs):
 
     """
     if args:
-        prototype = kwargs['prototype']
+        prototype = kwargs["prototype"]
         return prototype[args[0].strip()]
 
 
@@ -287,7 +288,7 @@ def _obj_search(*args, **kwargs):
         retlist = []
         if account:
             for target in targets:
-                if target.access(account, target, 'control'):
+                if target.access(account, target, "control"):
                     retlist.append(target)
         else:
             retlist = targets
@@ -297,15 +298,19 @@ def _obj_search(*args, **kwargs):
         if not targets:
             raise ValueError("$obj: Query '{}' gave no matches.".format(query))
         if len(targets) > 1:
-            raise ValueError("$obj: Query '{query}' gave {nmatches} matches. Limit your "
-                             "query or use $objlist instead.".format(
-                                 query=query, nmatches=len(targets)))
+            raise ValueError(
+                "$obj: Query '{query}' gave {nmatches} matches. Limit your "
+                "query or use $objlist instead.".format(query=query, nmatches=len(targets))
+            )
         target = targets[0]
         if account:
-            if not target.access(account, target, 'control'):
-                raise ValueError("$obj: Obj {target}(#{dbref} cannot be added - "
-                                 "Account {account} does not have 'control' access.".format(
-                                    target=target.key, dbref=target.id, account=account))
+            if not target.access(account, target, "control"):
+                raise ValueError(
+                    "$obj: Obj {target}(#{dbref} cannot be added - "
+                    "Account {account} does not have 'control' access.".format(
+                        target=target.key, dbref=target.id, account=account
+                    )
+                )
         return target
 
 
@@ -336,6 +341,6 @@ def dbref(*args, **kwargs):
     Validate that a #dbref input is valid.
     """
     if not args or len(args) < 1 or _RE_DBREF.match(args[0]) is None:
-        raise ValueError('$dbref requires a valid #dbref argument.')
+        raise ValueError("$dbref requires a valid #dbref argument.")
 
     return obj(args[0])
diff --git a/evennia/prototypes/prototypes.py b/evennia/prototypes/prototypes.py
index 26713824138..94a3e04eb04 100644
--- a/evennia/prototypes/prototypes.py
+++ b/evennia/prototypes/prototypes.py
@@ -13,8 +13,17 @@
 from evennia.objects.models import ObjectDB
 from evennia.utils.create import create_script
 from evennia.utils.utils import (
-    all_from_module, make_iter, is_iter, dbid_to_obj, callables_from_module,
-    get_all_typeclasses, to_str, dbref, justify, class_from_module)
+    all_from_module,
+    make_iter,
+    is_iter,
+    dbid_to_obj,
+    callables_from_module,
+    get_all_typeclasses,
+    to_str,
+    dbref,
+    justify,
+    class_from_module,
+)
 from evennia.locks.lockhandler import validate_lockstring, check_lockstring
 from evennia.utils import logger
 from evennia.utils import inlinefuncs, dbserialize
@@ -24,10 +33,25 @@
 _MODULE_PROTOTYPE_MODULES = {}
 _MODULE_PROTOTYPES = {}
 _PROTOTYPE_META_NAMES = (
-    "prototype_key", "prototype_desc", "prototype_tags", "prototype_locks", "prototype_parent")
+    "prototype_key",
+    "prototype_desc",
+    "prototype_tags",
+    "prototype_locks",
+    "prototype_parent",
+)
 _PROTOTYPE_RESERVED_KEYS = _PROTOTYPE_META_NAMES + (
-    "key", "aliases", "typeclass", "location", "home", "destination",
-    "permissions", "locks", "exec", "tags", "attrs")
+    "key",
+    "aliases",
+    "typeclass",
+    "location",
+    "home",
+    "destination",
+    "permissions",
+    "locks",
+    "exec",
+    "tags",
+    "attrs",
+)
 _PROTOTYPE_TAG_CATEGORY = "from_prototype"
 _PROTOTYPE_TAG_META_CATEGORY = "db_prototype"
 PROT_FUNCS = {}
@@ -41,6 +65,7 @@ class ValidationError(RuntimeError):
     """
     Raised on prototype validation errors
     """
+
     pass
 
 
@@ -61,14 +86,14 @@ def homogenize_prototype(prototype, custom_keys=None):
     """
     reserved = _PROTOTYPE_RESERVED_KEYS + (custom_keys or ())
 
-    attrs = list(prototype.get('attrs', []))  # break reference
-    tags = make_iter(prototype.get('tags', []))
+    attrs = list(prototype.get("attrs", []))  # break reference
+    tags = make_iter(prototype.get("tags", []))
     homogenized_tags = []
 
     homogenized = {}
     for key, val in prototype.items():
         if key in reserved:
-            if key == 'tags':
+            if key == "tags":
                 for tag in tags:
                     if not is_iter(tag):
                         homogenized_tags.append((tag, None, None))
@@ -78,18 +103,19 @@ def homogenize_prototype(prototype, custom_keys=None):
                 homogenized[key] = val
         else:
             # unassigned keys -> attrs
-            attrs.append((key, val, None, ''))
+            attrs.append((key, val, None, ""))
     if attrs:
-        homogenized['attrs'] = attrs
+        homogenized["attrs"] = attrs
     if homogenized_tags:
-        homogenized['tags'] = homogenized_tags
+        homogenized["tags"] = homogenized_tags
 
     # add required missing parts that had defaults before
 
     if "prototype_key" not in prototype:
         # assign a random hash as key
         homogenized["prototype_key"] = "prototype-{}".format(
-            hashlib.md5(bytes(str(time.time()), 'utf-8')).hexdigest()[:7])
+            hashlib.md5(bytes(str(time.time()), "utf-8")).hexdigest()[:7]
+        )
 
     if "typeclass" not in prototype and "prototype_parent" not in prototype:
         homogenized["typeclass"] = settings.BASE_OBJECT_TYPECLASS
@@ -106,19 +132,25 @@ def homogenize_prototype(prototype, custom_keys=None):
     for variable_name, prot in all_from_module(mod).items():
         if isinstance(prot, dict):
             if "prototype_key" not in prot:
-                prot['prototype_key'] = variable_name.lower()
-            prots.append((prot['prototype_key'], homogenize_prototype(prot)))
+                prot["prototype_key"] = variable_name.lower()
+            prots.append((prot["prototype_key"], homogenize_prototype(prot)))
     # assign module path to each prototype_key for easy reference
     _MODULE_PROTOTYPE_MODULES.update({prototype_key.lower(): mod for prototype_key, _ in prots})
     # make sure the prototype contains all meta info
     for prototype_key, prot in prots:
-        actual_prot_key = prot.get('prototype_key', prototype_key).lower()
-        prot.update({
-          "prototype_key": actual_prot_key,
-          "prototype_desc": prot['prototype_desc'] if 'prototype_desc' in prot else mod,
-          "prototype_locks": (prot['prototype_locks']
-                              if 'prototype_locks' in prot else "use:all();edit:false()"),
-          "prototype_tags": list(set(make_iter(prot.get('prototype_tags', [])) + ["module"]))})
+        actual_prot_key = prot.get("prototype_key", prototype_key).lower()
+        prot.update(
+            {
+                "prototype_key": actual_prot_key,
+                "prototype_desc": prot["prototype_desc"] if "prototype_desc" in prot else mod,
+                "prototype_locks": (
+                    prot["prototype_locks"]
+                    if "prototype_locks" in prot
+                    else "use:all();edit:false()"
+                ),
+                "prototype_tags": list(set(make_iter(prot.get("prototype_tags", [])) + ["module"])),
+            }
+        )
         _MODULE_PROTOTYPES[actual_prot_key] = prot
 
 
@@ -129,19 +161,20 @@ class DbPrototype(DefaultScript):
     """
     This stores a single prototype, in an Attribute `prototype`.
     """
+
     def at_script_creation(self):
         self.key = "empty prototype"  # prototype_key
-        self.desc = "A prototype"     # prototype_desc (.tags are used for prototype_tags)
-        self.db.prototype = {}        # actual prototype
+        self.desc = "A prototype"  # prototype_desc (.tags are used for prototype_tags)
+        self.db.prototype = {}  # actual prototype
 
     @property
     def prototype(self):
         "Make sure to decouple from db!"
-        return dbserialize.deserialize(self.attributes.get('prototype', {}))
+        return dbserialize.deserialize(self.attributes.get("prototype", {}))
 
     @prototype.setter
     def prototype(self, prototype):
-        self.attributes.add('prototype', prototype)
+        self.attributes.add("prototype", prototype)
 
 
 # Prototype manager functions
@@ -174,7 +207,7 @@ def _to_batchtuple(inp, *args):
         if is_iter(inp):
             # already a tuple/list, use as-is
             return inp
-        return (inp, ) + args
+        return (inp,) + args
 
     prototype_key = in_prototype.get("prototype_key")
     if not prototype_key:
@@ -185,25 +218,31 @@ def _to_batchtuple(inp, *args):
     # we can't edit a prototype defined in a module
     if prototype_key in _MODULE_PROTOTYPES:
         mod = _MODULE_PROTOTYPE_MODULES.get(prototype_key, "N/A")
-        raise PermissionError("{} is a read-only prototype "
-                              "(defined as code in {}).".format(prototype_key, mod))
+        raise PermissionError(
+            "{} is a read-only prototype " "(defined as code in {}).".format(prototype_key, mod)
+        )
 
     # make sure meta properties are included with defaults
     stored_prototype = DbPrototype.objects.filter(db_key=prototype_key)
     prototype = stored_prototype[0].prototype if stored_prototype else {}
 
-    in_prototype['prototype_desc'] = in_prototype.get("prototype_desc", prototype.get("prototype_desc", ""))
+    in_prototype["prototype_desc"] = in_prototype.get(
+        "prototype_desc", prototype.get("prototype_desc", "")
+    )
     prototype_locks = in_prototype.get(
-        "prototype_locks", prototype.get('prototype_locks', "spawn:all();edit:perm(Admin)"))
+        "prototype_locks", prototype.get("prototype_locks", "spawn:all();edit:perm(Admin)")
+    )
     is_valid, err = validate_lockstring(prototype_locks)
     if not is_valid:
         raise ValidationError("Lock error: {}".format(err))
-    in_prototype['prototype_locks'] = prototype_locks
+    in_prototype["prototype_locks"] = prototype_locks
 
     prototype_tags = [
         _to_batchtuple(tag, _PROTOTYPE_TAG_META_CATEGORY)
-        for tag in make_iter(in_prototype.get("prototype_tags",
-                             prototype.get('prototype_tags', [])))]
+        for tag in make_iter(
+            in_prototype.get("prototype_tags", prototype.get("prototype_tags", []))
+        )
+    ]
     in_prototype["prototype_tags"] = prototype_tags
 
     prototype.update(in_prototype)
@@ -211,21 +250,27 @@ def _to_batchtuple(inp, *args):
     if stored_prototype:
         # edit existing prototype
         stored_prototype = stored_prototype[0]
-        stored_prototype.desc = prototype['prototype_desc']
+        stored_prototype.desc = prototype["prototype_desc"]
         if prototype_tags:
             stored_prototype.tags.clear(category=_PROTOTYPE_TAG_CATEGORY)
-            stored_prototype.tags.batch_add(*prototype['prototype_tags'])
-        stored_prototype.locks.add(prototype['prototype_locks'])
-        stored_prototype.attributes.add('prototype', prototype)
+            stored_prototype.tags.batch_add(*prototype["prototype_tags"])
+        stored_prototype.locks.add(prototype["prototype_locks"])
+        stored_prototype.attributes.add("prototype", prototype)
     else:
         # create a new prototype
         stored_prototype = create_script(
-            DbPrototype, key=prototype_key, desc=prototype['prototype_desc'], persistent=True,
-            locks=prototype_locks, tags=prototype['prototype_tags'],
-            attributes=[("prototype", prototype)])
+            DbPrototype,
+            key=prototype_key,
+            desc=prototype["prototype_desc"],
+            persistent=True,
+            locks=prototype_locks,
+            tags=prototype["prototype_tags"],
+            attributes=[("prototype", prototype)],
+        )
     return stored_prototype.prototype
 
-create_prototype = save_prototype   # alias
+
+create_prototype = save_prototype  # alias
 
 
 def delete_prototype(prototype_key, caller=None):
@@ -244,8 +289,9 @@ def delete_prototype(prototype_key, caller=None):
     """
     if prototype_key in _MODULE_PROTOTYPES:
         mod = _MODULE_PROTOTYPE_MODULES.get(prototype_key.lower(), "N/A")
-        raise PermissionError("{} is a read-only prototype "
-                              "(defined as code in {}).".format(prototype_key, mod))
+        raise PermissionError(
+            "{} is a read-only prototype " "(defined as code in {}).".format(prototype_key, mod)
+        )
 
     stored_prototype = DbPrototype.objects.filter(db_key__iexact=prototype_key)
 
@@ -254,9 +300,11 @@ def delete_prototype(prototype_key, caller=None):
 
     stored_prototype = stored_prototype[0]
     if caller:
-        if not stored_prototype.access(caller, 'edit'):
-            raise PermissionError("{} needs explicit 'edit' permissions to "
-                                  "delete prototype {}.".format(caller, prototype_key))
+        if not stored_prototype.access(caller, "edit"):
+            raise PermissionError(
+                "{} needs explicit 'edit' permissions to "
+                "delete prototype {}.".format(caller, prototype_key)
+            )
     stored_prototype.delete()
     return True
 
@@ -294,9 +342,11 @@ def search_prototype(key=None, tags=None, require_single=False):
     if tags:
         # use tags to limit selection
         tagset = set(tags)
-        mod_matches = {prototype_key: prototype
-                       for prototype_key, prototype in _MODULE_PROTOTYPES.items()
-                       if tagset.intersection(prototype.get("prototype_tags", []))}
+        mod_matches = {
+            prototype_key: prototype
+            for prototype_key, prototype in _MODULE_PROTOTYPES.items()
+            if tagset.intersection(prototype.get("prototype_tags", []))
+        }
     else:
         mod_matches = _MODULE_PROTOTYPES
 
@@ -306,8 +356,11 @@ def search_prototype(key=None, tags=None, require_single=False):
             module_prototypes = [mod_matches[key]]
         else:
             # fuzzy matching
-            module_prototypes = [prototype for prototype_key, prototype in mod_matches.items()
-                                 if key in prototype_key]
+            module_prototypes = [
+                prototype
+                for prototype_key, prototype in mod_matches.items()
+                if key in prototype_key
+            ]
     else:
         module_prototypes = [match for match in mod_matches.values()]
 
@@ -322,8 +375,9 @@ def search_prototype(key=None, tags=None, require_single=False):
         db_matches = DbPrototype.objects.all().order_by("id")
     if key:
         # exact or partial match on key
-        db_matches = (db_matches.filter(db_key=key) or
-                      db_matches.filter(db_key__icontains=key)).order_by("id")
+        db_matches = (
+            db_matches.filter(db_key=key) or db_matches.filter(db_key__icontains=key)
+        ).order_by("id")
         # return prototype
     db_prototypes = [dbprot.prototype for dbprot in db_matches]
 
@@ -332,8 +386,9 @@ def search_prototype(key=None, tags=None, require_single=False):
     if nmatches > 1 and key:
         key = key.lower()
         # avoid duplicates if an exact match exist between the two types
-        filter_matches = [mta for mta in matches
-                          if mta.get('prototype_key') and mta['prototype_key'] == key]
+        filter_matches = [
+            mta for mta in matches if mta.get("prototype_key") and mta["prototype_key"] == key
+        ]
         if filter_matches and len(filter_matches) < nmatches:
             matches = filter_matches
 
@@ -381,20 +436,22 @@ def list_prototypes(caller, key=None, tags=None, show_non_use=False, show_non_ed
 
     # get use-permissions of readonly attributes (edit is always False)
     display_tuples = []
-    for prototype in sorted(prototypes, key=lambda d: d.get('prototype_key', '')):
+    for prototype in sorted(prototypes, key=lambda d: d.get("prototype_key", "")):
         lock_use = caller.locks.check_lockstring(
-            caller, prototype.get('prototype_locks', ''), access_type='spawn', default=True)
+            caller, prototype.get("prototype_locks", ""), access_type="spawn", default=True
+        )
         if not show_non_use and not lock_use:
             continue
-        if prototype.get('prototype_key', '') in _MODULE_PROTOTYPES:
+        if prototype.get("prototype_key", "") in _MODULE_PROTOTYPES:
             lock_edit = False
         else:
             lock_edit = caller.locks.check_lockstring(
-                caller, prototype.get('prototype_locks', ''), access_type='edit', default=True)
+                caller, prototype.get("prototype_locks", ""), access_type="edit", default=True
+            )
         if not show_non_edit and not lock_edit:
             continue
         ptags = []
-        for ptag in prototype.get('prototype_tags', []):
+        for ptag in prototype.get("prototype_tags", []):
             if is_iter(ptag):
                 if len(ptag) > 1:
                     ptags.append("{} (category: {}".format(ptag[0], ptag[1]))
@@ -404,10 +461,13 @@ def list_prototypes(caller, key=None, tags=None, show_non_use=False, show_non_ed
                 ptags.append(str(ptag))
 
         display_tuples.append(
-            (prototype.get('prototype_key', '<unset>'),
-             prototype.get('prototype_desc', '<unset>'),
-             "{}/{}".format('Y' if lock_use else 'N', 'Y' if lock_edit else 'N'),
-             ",".join(ptags)))
+            (
+                prototype.get("prototype_key", "<unset>"),
+                prototype.get("prototype_desc", "<unset>"),
+                "{}/{}".format("Y" if lock_use else "N", "Y" if lock_edit else "N"),
+                ",".join(ptags),
+            )
+        )
 
     if not display_tuples:
         return ""
@@ -419,13 +479,14 @@ def list_prototypes(caller, key=None, tags=None, show_non_use=False, show_non_ed
     table = EvTable("Key", "Desc", "Spawn/Edit", "Tags", table=table, crop=True, width=width)
     table.reformat_column(0, width=22)
     table.reformat_column(1, width=29)
-    table.reformat_column(2, width=11, align='c')
+    table.reformat_column(2, width=11, align="c")
     table.reformat_column(3, width=16)
     return table
 
 
-def validate_prototype(prototype, protkey=None, protparents=None,
-                       is_prototype_base=True, strict=True, _flags=None):
+def validate_prototype(
+    prototype, protkey=None, protparents=None, is_prototype_base=True, strict=True, _flags=None
+):
     """
     Run validation on a prototype, checking for inifinite regress.
 
@@ -453,83 +514,97 @@ def validate_prototype(prototype, protkey=None, protparents=None,
         _flags = {"visited": [], "depth": 0, "typeclass": False, "errors": [], "warnings": []}
 
     if not protparents:
-        protparents = {prototype.get('prototype_key', "").lower(): prototype
-                       for prototype in search_prototype()}
+        protparents = {
+            prototype.get("prototype_key", "").lower(): prototype
+            for prototype in search_prototype()
+        }
 
-    protkey = protkey and protkey.lower() or prototype.get('prototype_key', None)
+    protkey = protkey and protkey.lower() or prototype.get("prototype_key", None)
 
     if strict and not bool(protkey):
-        _flags['errors'].append("Prototype lacks a `prototype_key`.")
+        _flags["errors"].append("Prototype lacks a `prototype_key`.")
         protkey = "[UNSET]"
 
-    typeclass = prototype.get('typeclass')
-    prototype_parent = prototype.get('prototype_parent', [])
+    typeclass = prototype.get("typeclass")
+    prototype_parent = prototype.get("prototype_parent", [])
 
     if strict and not (typeclass or prototype_parent):
         if is_prototype_base:
-            _flags['errors'].append("Prototype {} requires `typeclass` "
-                                    "or 'prototype_parent'.".format(protkey))
+            _flags["errors"].append(
+                "Prototype {} requires `typeclass` " "or 'prototype_parent'.".format(protkey)
+            )
         else:
-            _flags['warnings'].append("Prototype {} can only be used as a mixin since it lacks "
-                                      "a typeclass or a prototype_parent.".format(protkey))
+            _flags["warnings"].append(
+                "Prototype {} can only be used as a mixin since it lacks "
+                "a typeclass or a prototype_parent.".format(protkey)
+            )
 
     if strict and typeclass:
         try:
             class_from_module(typeclass)
         except ImportError as err:
-            _flags['errors'].append(
+            _flags["errors"].append(
                 "{}: Prototype {} is based on typeclass {}, which could not be imported!".format(
-                    err, protkey, typeclass))
+                    err, protkey, typeclass
+                )
+            )
 
     # recursively traverese prototype_parent chain
 
     for protstring in make_iter(prototype_parent):
         protstring = protstring.lower()
         if protkey is not None and protstring == protkey:
-            _flags['errors'].append("Prototype {} tries to parent itself.".format(protkey))
+            _flags["errors"].append("Prototype {} tries to parent itself.".format(protkey))
         protparent = protparents.get(protstring)
         if not protparent:
-            _flags['errors'].append("Prototype {}'s prototype_parent '{}' was not found.".format(
-                (protkey, protstring)))
-        if id(prototype) in _flags['visited']:
-            _flags['errors'].append(
-                "{} has infinite nesting of prototypes.".format(protkey or prototype))
-
-        if _flags['errors']:
-            raise RuntimeError("Error: " + "\nError: ".join(_flags['errors']))
-        _flags['visited'].append(id(prototype))
-        _flags['depth'] += 1
-        validate_prototype(protparent, protstring, protparents,
-                           is_prototype_base=is_prototype_base, _flags=_flags)
-        _flags['visited'].pop()
-        _flags['depth'] -= 1
-
-    if typeclass and not _flags['typeclass']:
-        _flags['typeclass'] = typeclass
+            _flags["errors"].append(
+                "Prototype {}'s prototype_parent '{}' was not found.".format((protkey, protstring))
+            )
+        if id(prototype) in _flags["visited"]:
+            _flags["errors"].append(
+                "{} has infinite nesting of prototypes.".format(protkey or prototype)
+            )
+
+        if _flags["errors"]:
+            raise RuntimeError("Error: " + "\nError: ".join(_flags["errors"]))
+        _flags["visited"].append(id(prototype))
+        _flags["depth"] += 1
+        validate_prototype(
+            protparent, protstring, protparents, is_prototype_base=is_prototype_base, _flags=_flags
+        )
+        _flags["visited"].pop()
+        _flags["depth"] -= 1
+
+    if typeclass and not _flags["typeclass"]:
+        _flags["typeclass"] = typeclass
 
     # if we get back to the current level without a typeclass it's an error.
-    if strict and is_prototype_base and _flags['depth'] <= 0 and not _flags['typeclass']:
-        _flags['errors'].append("Prototype {} has no `typeclass` defined anywhere in its parent\n "
-                                "chain. Add `typeclass`, or a `prototype_parent` pointing to a "
-                                "prototype with a typeclass.".format(protkey))
-
-    if _flags['depth'] <= 0:
-        if _flags['errors']:
-            raise RuntimeError("Error: " + "\nError: ".join(_flags['errors']))
-        if _flags['warnings']:
-            raise RuntimeWarning("Warning: " + "\nWarning: ".join(_flags['warnings']))
+    if strict and is_prototype_base and _flags["depth"] <= 0 and not _flags["typeclass"]:
+        _flags["errors"].append(
+            "Prototype {} has no `typeclass` defined anywhere in its parent\n "
+            "chain. Add `typeclass`, or a `prototype_parent` pointing to a "
+            "prototype with a typeclass.".format(protkey)
+        )
+
+    if _flags["depth"] <= 0:
+        if _flags["errors"]:
+            raise RuntimeError("Error: " + "\nError: ".join(_flags["errors"]))
+        if _flags["warnings"]:
+            raise RuntimeWarning("Warning: " + "\nWarning: ".join(_flags["warnings"]))
 
     # make sure prototype_locks are set to defaults
-    prototype_locks = [lstring.split(":", 1)
-                       for lstring in prototype.get("prototype_locks", "").split(';')
-                       if ":" in lstring]
+    prototype_locks = [
+        lstring.split(":", 1)
+        for lstring in prototype.get("prototype_locks", "").split(";")
+        if ":" in lstring
+    ]
     locktypes = [tup[0].strip() for tup in prototype_locks]
     if "spawn" not in locktypes:
         prototype_locks.append(("spawn", "all()"))
     if "edit" not in locktypes:
         prototype_locks.append(("edit", "all()"))
     prototype_locks = ";".join(":".join(tup) for tup in prototype_locks)
-    prototype['prototype_locks'] = prototype_locks
+    prototype["prototype_locks"] = prototype_locks
 
 
 # Protfunc parsing (in-prototype functions)
@@ -582,8 +657,8 @@ def protfunc_parser(value, available_functions=None, testing=False, stacktrace=F
     available_functions = PROT_FUNCS if available_functions is None else available_functions
 
     result = inlinefuncs.parse_inlinefunc(
-        value, available_funcs=available_functions,
-        stacktrace=stacktrace, testing=testing, **kwargs)
+        value, available_funcs=available_functions, stacktrace=stacktrace, testing=testing, **kwargs
+    )
 
     err = None
     try:
@@ -599,6 +674,7 @@ def protfunc_parser(value, available_functions=None, testing=False, stacktrace=F
 
 # Various prototype utilities
 
+
 def format_available_protfuncs():
     """
     Get all protfuncs in a pretty-formatted form.
@@ -608,8 +684,11 @@ def format_available_protfuncs():
     """
     out = []
     for protfunc_name, protfunc in PROT_FUNCS.items():
-        out.append("- |c${name}|n - |W{docs}".format(
-            name=protfunc_name, docs=protfunc.__doc__.strip().replace("\n", "")))
+        out.append(
+            "- |c${name}|n - |W{docs}".format(
+                name=protfunc_name, docs=protfunc.__doc__.strip().replace("\n", "")
+            )
+        )
     return justify("\n".join(out), indent=8)
 
 
@@ -628,61 +707,70 @@ def prototype_to_str(prototype):
 |c-desc|n: {prototype_desc}
 |cprototype-parent:|n {prototype_parent}
     \n""".format(
-            prototype_key=prototype.get('prototype_key', '|r[UNSET](required)|n'),
-            prototype_tags=prototype.get('prototype_tags', '|wNone|n'),
-            prototype_locks=prototype.get('prototype_locks', '|wNone|n'),
-            prototype_desc=prototype.get('prototype_desc', '|wNone|n'),
-            prototype_parent=prototype.get('prototype_parent', '|wNone|n'))
-
-    key = prototype.get('key', '')
+        prototype_key=prototype.get("prototype_key", "|r[UNSET](required)|n"),
+        prototype_tags=prototype.get("prototype_tags", "|wNone|n"),
+        prototype_locks=prototype.get("prototype_locks", "|wNone|n"),
+        prototype_desc=prototype.get("prototype_desc", "|wNone|n"),
+        prototype_parent=prototype.get("prototype_parent", "|wNone|n"),
+    )
+
+    key = prototype.get("key", "")
     if key:
         key = "|ckey:|n {key}".format(key=key)
-    aliases = prototype.get("aliases", '')
+    aliases = prototype.get("aliases", "")
     if aliases:
-        aliases = "|caliases:|n {aliases}".format(
-            aliases=", ".join(aliases))
-    attrs = prototype.get("attrs", '')
+        aliases = "|caliases:|n {aliases}".format(aliases=", ".join(aliases))
+    attrs = prototype.get("attrs", "")
     if attrs:
         out = []
         for (attrkey, value, category, locks) in attrs:
             locks = ", ".join(lock for lock in locks if lock)
-            category = "|ccategory:|n {}".format(category) if category else ''
+            category = "|ccategory:|n {}".format(category) if category else ""
             cat_locks = ""
             if category or locks:
                 cat_locks = " (|ccategory:|n {category}, ".format(
-                    category=category if category else "|wNone|n")
+                    category=category if category else "|wNone|n"
+                )
             out.append(
                 "{attrkey}{cat_locks} |c=|n {value}".format(
-                       attrkey=attrkey,
-                       cat_locks=cat_locks,
-                       locks=locks if locks else "|wNone|n",
-                       value=value))
+                    attrkey=attrkey,
+                    cat_locks=cat_locks,
+                    locks=locks if locks else "|wNone|n",
+                    value=value,
+                )
+            )
         attrs = "|cattrs:|n\n {attrs}".format(attrs="\n ".join(out))
-    tags = prototype.get('tags', '')
+    tags = prototype.get("tags", "")
     if tags:
         out = []
         for (tagkey, category, data) in tags:
-            out.append("{tagkey} (category: {category}{dat})".format(
-                tagkey=tagkey, category=category, dat=", data: {}".format(data) if data else ""))
+            out.append(
+                "{tagkey} (category: {category}{dat})".format(
+                    tagkey=tagkey, category=category, dat=", data: {}".format(data) if data else ""
+                )
+            )
         tags = "|ctags:|n\n {tags}".format(tags=", ".join(out))
-    locks = prototype.get('locks', '')
+    locks = prototype.get("locks", "")
     if locks:
         locks = "|clocks:|n\n {locks}".format(locks=locks)
-    permissions = prototype.get("permissions", '')
+    permissions = prototype.get("permissions", "")
     if permissions:
         permissions = "|cpermissions:|n {perms}".format(perms=", ".join(permissions))
-    location = prototype.get("location", '')
+    location = prototype.get("location", "")
     if location:
         location = "|clocation:|n {location}".format(location=location)
-    home = prototype.get("home", '')
+    home = prototype.get("home", "")
     if home:
         home = "|chome:|n {home}".format(home=home)
-    destination = prototype.get("destination", '')
+    destination = prototype.get("destination", "")
     if destination:
         destination = "|cdestination:|n {destination}".format(destination=destination)
 
-    body = "\n".join(part for part in (key, aliases, attrs, tags, locks, permissions,
-                     location, home, destination) if part)
+    body = "\n".join(
+        part
+        for part in (key, aliases, attrs, tags, locks, permissions, location, home, destination)
+        if part
+    )
 
     return header.lstrip() + body.strip()
 
@@ -700,11 +788,12 @@ def check_permission(prototype_key, action, default=True):
         passes (bool): If permission for action is granted or not.
 
     """
-    if action == 'edit':
+    if action == "edit":
         if prototype_key in _MODULE_PROTOTYPES:
             mod = _MODULE_PROTOTYPE_MODULES.get(prototype_key, "N/A")
-            logger.log_err("{} is a read-only prototype "
-                           "(defined as code in {}).".format(prototype_key, mod))
+            logger.log_err(
+                "{} is a read-only prototype " "(defined as code in {}).".format(prototype_key, mod)
+            )
             return False
 
     prototype = search_prototype(key=prototype_key)
@@ -715,8 +804,7 @@ def check_permission(prototype_key, action, default=True):
     lockstring = prototype.get("prototype_locks")
 
     if lockstring:
-        return check_lockstring(None, lockstring,
-                                default=default, access_type=action)
+        return check_lockstring(None, lockstring, default=default, access_type=action)
     return default
 
 
@@ -753,8 +841,9 @@ def value_to_obj_or_any(value):
     stype = type(value)
     if is_iter(value):
         if stype == dict:
-            return {value_to_obj_or_any(key):
-                    value_to_obj_or_any(val) for key, val in value.items()}
+            return {
+                value_to_obj_or_any(key): value_to_obj_or_any(val) for key, val in value.items()
+            }
         else:
             return stype([value_to_obj_or_any(val) for val in value])
     obj = dbid_to_obj(value, ObjectDB)
diff --git a/evennia/prototypes/spawner.py b/evennia/prototypes/spawner.py
index fdd241c45fc..fab4d2cfdc6 100644
--- a/evennia/prototypes/spawner.py
+++ b/evennia/prototypes/spawner.py
@@ -141,18 +141,33 @@
 from evennia.utils.utils import make_iter, is_iter
 from evennia.prototypes import prototypes as protlib
 from evennia.prototypes.prototypes import (
-    value_to_obj, value_to_obj_or_any, init_spawn_value, _PROTOTYPE_TAG_CATEGORY)
+    value_to_obj,
+    value_to_obj_or_any,
+    init_spawn_value,
+    _PROTOTYPE_TAG_CATEGORY,
+)
 
 
 _CREATE_OBJECT_KWARGS = ("key", "location", "home", "destination")
 _PROTOTYPE_META_NAMES = ("prototype_key", "prototype_desc", "prototype_tags", "prototype_locks")
-_PROTOTYPE_ROOT_NAMES = ('typeclass', 'key', 'aliases', 'attrs', 'tags', 'locks', 'permissions',
-                         'location', 'home', 'destination')
+_PROTOTYPE_ROOT_NAMES = (
+    "typeclass",
+    "key",
+    "aliases",
+    "attrs",
+    "tags",
+    "locks",
+    "permissions",
+    "location",
+    "home",
+    "destination",
+)
 _NON_CREATE_KWARGS = _CREATE_OBJECT_KWARGS + _PROTOTYPE_META_NAMES
 
 
 # Helper
 
+
 def _get_prototype(inprot, protparents, uninherited=None, _workprot=None):
     """
     Recursively traverse a prototype dictionary, including multiple
@@ -170,6 +185,7 @@ def _get_prototype(inprot, protparents, uninherited=None, _workprot=None):
             `prototype_parent` key is removed).
 
     """
+
     def _inherit_tags(old_tags, new_tags):
         old = {(tup[0], tup[1]): tup for tup in old_tags}
         new = {(tup[0], tup[1]): tup for tup in new_tags}
@@ -187,22 +203,21 @@ def _inherit_attrs(old_attrs, new_attrs):
         # move backwards through the inheritance
         for prototype in make_iter(inprot["prototype_parent"]):
             # Build the prot dictionary in reverse order, overloading
-            new_prot = _get_prototype(protparents.get(prototype.lower(), {}),
-                                      protparents, _workprot=_workprot)
+            new_prot = _get_prototype(
+                protparents.get(prototype.lower(), {}), protparents, _workprot=_workprot
+            )
 
             # attrs, tags have internal structure that should be inherited separately
-            new_prot['attrs'] = _inherit_attrs(
-                _workprot.get("attrs", {}), new_prot.get("attrs", {}))
-            new_prot['tags'] = _inherit_tags(
-                _workprot.get("tags", {}), new_prot.get("tags", {}))
+            new_prot["attrs"] = _inherit_attrs(
+                _workprot.get("attrs", {}), new_prot.get("attrs", {})
+            )
+            new_prot["tags"] = _inherit_tags(_workprot.get("tags", {}), new_prot.get("tags", {}))
 
             _workprot.update(new_prot)
     # the inprot represents a higher level (a child prot), which should override parents
 
-    inprot['attrs'] = _inherit_attrs(
-        _workprot.get("attrs", {}), inprot.get("attrs", {}))
-    inprot['tags'] = _inherit_tags(
-        _workprot.get("tags", {}), inprot.get("tags", {}))
+    inprot["attrs"] = _inherit_attrs(_workprot.get("attrs", {}), inprot.get("attrs", {}))
+    inprot["tags"] = _inherit_tags(_workprot.get("tags", {}), inprot.get("tags", {}))
     _workprot.update(inprot)
     if uninherited:
         # put back the parts that should not be inherited
@@ -227,16 +242,19 @@ def flatten_prototype(prototype, validate=False):
 
     if prototype:
         prototype = protlib.homogenize_prototype(prototype)
-        protparents = {prot['prototype_key'].lower(): prot for prot in protlib.search_prototype()}
-        protlib.validate_prototype(prototype, None, protparents,
-                                   is_prototype_base=validate, strict=validate)
-        return _get_prototype(prototype, protparents,
-                              uninherited={"prototype_key": prototype.get("prototype_key")})
+        protparents = {prot["prototype_key"].lower(): prot for prot in protlib.search_prototype()}
+        protlib.validate_prototype(
+            prototype, None, protparents, is_prototype_base=validate, strict=validate
+        )
+        return _get_prototype(
+            prototype, protparents, uninherited={"prototype_key": prototype.get("prototype_key")}
+        )
     return {}
 
 
 # obj-related prototype functions
 
+
 def prototype_from_object(obj):
     """
     Guess a minimal prototype from an existing object.
@@ -257,43 +275,49 @@ def prototype_from_object(obj):
     if not prot or len(prot) > 1:
         # no unambiguous prototype found - build new prototype
         prot = {}
-        prot['prototype_key'] = "From-Object-{}-{}".format(
-                obj.key, hashlib.md5(bytes(str(time.time()), 'utf-8')).hexdigest()[:7])
-        prot['prototype_desc'] = "Built from {}".format(str(obj))
-        prot['prototype_locks'] = "spawn:all();edit:all()"
-        prot['prototype_tags'] = []
+        prot["prototype_key"] = "From-Object-{}-{}".format(
+            obj.key, hashlib.md5(bytes(str(time.time()), "utf-8")).hexdigest()[:7]
+        )
+        prot["prototype_desc"] = "Built from {}".format(str(obj))
+        prot["prototype_locks"] = "spawn:all();edit:all()"
+        prot["prototype_tags"] = []
     else:
         prot = prot[0]
 
-    prot['key'] = obj.db_key or hashlib.md5(bytes(str(time.time()), 'utf-8')).hexdigest()[:6]
-    prot['typeclass'] = obj.db_typeclass_path
+    prot["key"] = obj.db_key or hashlib.md5(bytes(str(time.time()), "utf-8")).hexdigest()[:6]
+    prot["typeclass"] = obj.db_typeclass_path
 
     location = obj.db_location
     if location:
-        prot['location'] = location.dbref
+        prot["location"] = location.dbref
     home = obj.db_home
     if home:
-        prot['home'] = home.dbref
+        prot["home"] = home.dbref
     destination = obj.db_destination
     if destination:
-        prot['destination'] = destination.dbref
+        prot["destination"] = destination.dbref
     locks = obj.locks.all()
     if locks:
-        prot['locks'] = ";".join(locks)
+        prot["locks"] = ";".join(locks)
     perms = obj.permissions.get(return_list=True)
     if perms:
-        prot['permissions'] = make_iter(perms)
+        prot["permissions"] = make_iter(perms)
     aliases = obj.aliases.get(return_list=True)
     if aliases:
-        prot['aliases'] = aliases
-    tags = sorted([(tag.db_key, tag.db_category, tag.db_data)
-                  for tag in obj.tags.all(return_objs=True)])
+        prot["aliases"] = aliases
+    tags = sorted(
+        [(tag.db_key, tag.db_category, tag.db_data) for tag in obj.tags.all(return_objs=True)]
+    )
     if tags:
-        prot['tags'] = tags
-    attrs = sorted([(attr.key, attr.value, attr.category, ';'.join(attr.locks.all()))
-                    for attr in obj.attributes.all()])
+        prot["tags"] = tags
+    attrs = sorted(
+        [
+            (attr.key, attr.value, attr.category, ";".join(attr.locks.all()))
+            for attr in obj.attributes.all()
+        ]
+    )
     if attrs:
-        prot['attrs'] = attrs
+        prot["attrs"] = attrs
 
     return prot
 
@@ -320,6 +344,7 @@ def prototype_diff(prototype1, prototype2, maxdepth=2):
             instruction can be one of "REMOVE", "ADD", "UPDATE" or "KEEP".
 
     """
+
     def _recursive_diff(old, new, depth=0):
 
         old_type = type(old)
@@ -330,8 +355,9 @@ def _recursive_diff(old, new, depth=0):
                 if depth < maxdepth and old_type == dict:
                     return {key: (part, None, "REMOVE") for key, part in old.items()}
                 elif depth < maxdepth and is_iter(old):
-                    return {part[0] if is_iter(part) else part:
-                            (part, None, "REMOVE") for part in old}
+                    return {
+                        part[0] if is_iter(part) else part: (part, None, "REMOVE") for part in old
+                    }
                 return (old, new, "REMOVE")
             elif not old and new:
                 if depth < maxdepth and new_type == dict:
@@ -344,14 +370,18 @@ def _recursive_diff(old, new, depth=0):
                 return (old, new, "UPDATE")
         elif depth < maxdepth and new_type == dict:
             all_keys = set(list(old.keys()) + list(new.keys()))
-            return {key: _recursive_diff(old.get(key), new.get(key), depth=depth + 1)
-                    for key in all_keys}
+            return {
+                key: _recursive_diff(old.get(key), new.get(key), depth=depth + 1)
+                for key in all_keys
+            }
         elif depth < maxdepth and is_iter(new):
             old_map = {part[0] if is_iter(part) else part: part for part in old}
             new_map = {part[0] if is_iter(part) else part: part for part in new}
             all_keys = set(list(old_map.keys()) + list(new_map.keys()))
-            return {key: _recursive_diff(old_map.get(key), new_map.get(key), depth=depth + 1)
-                    for key in all_keys}
+            return {
+                key: _recursive_diff(old_map.get(key), new_map.get(key), depth=depth + 1)
+                for key in all_keys
+            }
         elif old != new:
             return (old, new, "UPDATE")
         else:
@@ -390,7 +420,7 @@ def flatten_diff(diff):
             - Mix REMOVE, KEEP, UPDATE, ADD -> REPLACE
     """
 
-    valid_instructions = ('KEEP', 'REMOVE', 'ADD', 'UPDATE')
+    valid_instructions = ("KEEP", "REMOVE", "ADD", "UPDATE")
 
     def _get_all_nested_diff_instructions(diffpart):
         "Started for each root key, returns all instructions nested under it"
@@ -403,8 +433,10 @@ def _get_all_nested_diff_instructions(diffpart):
             for val in diffpart.values():
                 out.extend(_get_all_nested_diff_instructions(val))
         else:
-            raise RuntimeError("Diff contains non-dicts that are not on the "
-                               "form (old, new, inst): {}".format(diffpart))
+            raise RuntimeError(
+                "Diff contains non-dicts that are not on the "
+                "form (old, new, inst): {}".format(diffpart)
+            )
         return out
 
     flat_diff = {}
@@ -480,7 +512,7 @@ def batch_update_objects_with_prototype(prototype, diff=None, objects=None):
     else:
         new_prototype = prototype
 
-    prototype_key = new_prototype['prototype_key']
+    prototype_key = new_prototype["prototype_key"]
 
     if not objects:
         objects = ObjectDB.objects.get_by_tag(prototype_key, category=_PROTOTYPE_TAG_CATEGORY)
@@ -504,7 +536,7 @@ def batch_update_objects_with_prototype(prototype, diff=None, objects=None):
             obj.tags.add(prototype_key, category=_PROTOTYPE_TAG_CATEGORY)
 
         for key, directive in diff.items():
-            if directive in ('UPDATE', 'REPLACE'):
+            if directive in ("UPDATE", "REPLACE"):
 
                 if key in _PROTOTYPE_META_NAMES:
                     # prototype meta keys are not stored on-object
@@ -513,72 +545,80 @@ def batch_update_objects_with_prototype(prototype, diff=None, objects=None):
                 val = new_prototype[key]
                 do_save = True
 
-                if key == 'key':
+                if key == "key":
                     obj.db_key = init_spawn_value(val, str)
-                elif key == 'typeclass':
+                elif key == "typeclass":
                     obj.db_typeclass_path = init_spawn_value(val, str)
-                elif key == 'location':
+                elif key == "location":
                     obj.db_location = init_spawn_value(val, value_to_obj)
-                elif key == 'home':
+                elif key == "home":
                     obj.db_home = init_spawn_value(val, value_to_obj)
-                elif key == 'destination':
+                elif key == "destination":
                     obj.db_destination = init_spawn_value(val, value_to_obj)
-                elif key == 'locks':
-                    if directive == 'REPLACE':
+                elif key == "locks":
+                    if directive == "REPLACE":
                         obj.locks.clear()
                     obj.locks.add(init_spawn_value(val, str))
-                elif key == 'permissions':
-                    if directive == 'REPLACE':
+                elif key == "permissions":
+                    if directive == "REPLACE":
                         obj.permissions.clear()
                     obj.permissions.batch_add(*(init_spawn_value(perm, str) for perm in val))
-                elif key == 'aliases':
-                    if directive == 'REPLACE':
+                elif key == "aliases":
+                    if directive == "REPLACE":
                         obj.aliases.clear()
                     obj.aliases.batch_add(*(init_spawn_value(alias, str) for alias in val))
-                elif key == 'tags':
-                    if directive == 'REPLACE':
+                elif key == "tags":
+                    if directive == "REPLACE":
                         obj.tags.clear()
-                    obj.tags.batch_add(*(
-                        (init_spawn_value(ttag, str), tcategory, tdata)
-                        for ttag, tcategory, tdata in val))
-                elif key == 'attrs':
-                    if directive == 'REPLACE':
+                    obj.tags.batch_add(
+                        *(
+                            (init_spawn_value(ttag, str), tcategory, tdata)
+                            for ttag, tcategory, tdata in val
+                        )
+                    )
+                elif key == "attrs":
+                    if directive == "REPLACE":
                         obj.attributes.clear()
-                    obj.attributes.batch_add(*(
-                        (init_spawn_value(akey, str),
-                         init_spawn_value(aval, value_to_obj),
-                         acategory,
-                         alocks)
-                        for akey, aval, acategory, alocks in val))
-                elif key == 'exec':
+                    obj.attributes.batch_add(
+                        *(
+                            (
+                                init_spawn_value(akey, str),
+                                init_spawn_value(aval, value_to_obj),
+                                acategory,
+                                alocks,
+                            )
+                            for akey, aval, acategory, alocks in val
+                        )
+                    )
+                elif key == "exec":
                     # we don't auto-rerun exec statements, it would be huge security risk!
                     pass
                 else:
                     obj.attributes.add(key, init_spawn_value(val, value_to_obj))
-            elif directive == 'REMOVE':
+            elif directive == "REMOVE":
                 do_save = True
-                if key == 'key':
-                    obj.db_key = ''
-                elif key == 'typeclass':
+                if key == "key":
+                    obj.db_key = ""
+                elif key == "typeclass":
                     # fall back to default
                     obj.db_typeclass_path = settings.BASE_OBJECT_TYPECLASS
-                elif key == 'location':
+                elif key == "location":
                     obj.db_location = None
-                elif key == 'home':
+                elif key == "home":
                     obj.db_home = None
-                elif key == 'destination':
+                elif key == "destination":
                     obj.db_destination = None
-                elif key == 'locks':
+                elif key == "locks":
                     obj.locks.clear()
-                elif key == 'permissions':
+                elif key == "permissions":
                     obj.permissions.clear()
-                elif key == 'aliases':
+                elif key == "aliases":
                     obj.aliases.clear()
-                elif key == 'tags':
+                elif key == "tags":
                     obj.tags.clear()
-                elif key == 'attrs':
+                elif key == "attrs":
                     obj.attributes.clear()
-                elif key == 'exec':
+                elif key == "exec":
                     # we don't auto-rerun exec statements, it would be huge security risk!
                     pass
                 else:
@@ -639,12 +679,14 @@ def batch_create_object(*objparams):
         obj = ObjectDB(**objparam[0])
 
         # setup
-        obj._createdict = {"permissions": make_iter(objparam[1]),
-                           "locks": objparam[2],
-                           "aliases": make_iter(objparam[3]),
-                           "nattributes": objparam[4],
-                           "attributes": objparam[5],
-                           "tags": make_iter(objparam[6])}
+        obj._createdict = {
+            "permissions": make_iter(objparam[1]),
+            "locks": objparam[2],
+            "aliases": make_iter(objparam[3]),
+            "nattributes": objparam[4],
+            "attributes": objparam[5],
+            "tags": make_iter(objparam[6]),
+        }
         # this triggers all hooks
         obj.save()
         # run eventual extra code
@@ -657,6 +699,7 @@ def batch_create_object(*objparams):
 
 # Spawner mechanism
 
+
 def spawn(*prototypes, **kwargs):
     """
     Spawn a number of prototyped objects.
@@ -688,12 +731,13 @@ def spawn(*prototypes, **kwargs):
 
     """
     # search string (=prototype_key) from input
-    prototypes = [protlib.search_prototype(prot, require_single=True)[0] 
-                  if isinstance(prot, str) else prot 
-                  for prot in prototypes]
+    prototypes = [
+        protlib.search_prototype(prot, require_single=True)[0] if isinstance(prot, str) else prot
+        for prot in prototypes
+    ]
 
     # get available protparents
-    protparents = {prot['prototype_key'].lower(): prot for prot in protlib.search_prototype()}
+    protparents = {prot["prototype_key"].lower(): prot for prot in protlib.search_prototype()}
 
     if not kwargs.get("only_validate"):
         # homogenization to be more lenient about prototype format when entering the prototype manually
@@ -704,7 +748,7 @@ def spawn(*prototypes, **kwargs):
     # prototype imports. We need to insert prototype_key in this case
     for key, protparent in kwargs.get("prototype_parents", {}).items():
         key = str(key).lower()
-        protparent['prototype_key'] = str(protparent.get("prototype_key", key)).lower()
+        protparent["prototype_key"] = str(protparent.get("prototype_key", key)).lower()
         protparents[key] = protparent
 
     if "return_parents" in kwargs:
@@ -715,8 +759,9 @@ def spawn(*prototypes, **kwargs):
     for prototype in prototypes:
 
         protlib.validate_prototype(prototype, None, protparents, is_prototype_base=True)
-        prot = _get_prototype(prototype, protparents,
-                              uninherited={"prototype_key": prototype.get("prototype_key")})
+        prot = _get_prototype(
+            prototype, protparents, uninherited={"prototype_key": prototype.get("prototype_key")}
+        )
         if not prot:
             continue
 
@@ -725,8 +770,10 @@ def spawn(*prototypes, **kwargs):
         create_kwargs = {}
         # we must always add a key, so if not given we use a shortened md5 hash. There is a (small)
         # chance this is not unique but it should usually not be a problem.
-        val = prot.pop("key", "Spawned-{}".format(
-            hashlib.md5(bytes(str(time.time()), 'utf-8')).hexdigest()[:6]))
+        val = prot.pop(
+            "key",
+            "Spawned-{}".format(hashlib.md5(bytes(str(time.time()), "utf-8")).hexdigest()[:6]),
+        )
         create_kwargs["db_key"] = init_spawn_value(val, str)
 
         val = prot.pop("location", None)
@@ -754,7 +801,7 @@ def spawn(*prototypes, **kwargs):
         for (tag, category, data) in val:
             tags.append((init_spawn_value(tag, str), category, data))
 
-        prototype_key = prototype.get('prototype_key', None)
+        prototype_key = prototype.get("prototype_key", None)
         if prototype_key:
             # we make sure to add a tag identifying which prototype created this object
             tags.append((prototype_key, _PROTOTYPE_TAG_CATEGORY))
@@ -763,8 +810,11 @@ def spawn(*prototypes, **kwargs):
         execs = init_spawn_value(val, make_iter)
 
         # extract ndb assignments
-        nattributes = dict((key.split("_", 1)[1], init_spawn_value(val, value_to_obj))
-                           for key, val in prot.items() if key.startswith("ndb_"))
+        nattributes = dict(
+            (key.split("_", 1)[1], init_spawn_value(val, value_to_obj))
+            for key, val in prot.items()
+            if key.startswith("ndb_")
+        )
 
         # the rest are attribute tuples (attrname, value, category, locks)
         val = make_iter(prot.pop("attrs", []))
@@ -773,21 +823,33 @@ def spawn(*prototypes, **kwargs):
             attributes.append((attrname, init_spawn_value(value), category, locks))
 
         simple_attributes = []
-        for key, value in ((key, value) for key, value in prot.items()
-                           if not (key.startswith("ndb_"))):
+        for key, value in (
+            (key, value) for key, value in prot.items() if not (key.startswith("ndb_"))
+        ):
             # we don't support categories, nor locks for simple attributes
             if key in _PROTOTYPE_META_NAMES:
                 continue
             else:
                 simple_attributes.append(
-                    (key, init_spawn_value(value, value_to_obj_or_any), None, None))
+                    (key, init_spawn_value(value, value_to_obj_or_any), None, None)
+                )
 
         attributes = attributes + simple_attributes
         attributes = [tup for tup in attributes if not tup[0] in _NON_CREATE_KWARGS]
 
         # pack for call into _batch_create_object
-        objsparams.append((create_kwargs, permission_string, lock_string,
-                           alias_string, nattributes, attributes, tags, execs))
+        objsparams.append(
+            (
+                create_kwargs,
+                permission_string,
+                lock_string,
+                alias_string,
+                nattributes,
+                attributes,
+                tags,
+                execs,
+            )
+        )
 
     if kwargs.get("only_validate"):
         return objsparams
diff --git a/evennia/prototypes/tests.py b/evennia/prototypes/tests.py
index 45b452452fa..107e2a127f4 100644
--- a/evennia/prototypes/tests.py
+++ b/evennia/prototypes/tests.py
@@ -24,102 +24,123 @@
         "health": lambda: randint(1, 1),
         "resists": ["cold", "poison"],
         "attacks": ["fists"],
-        "weaknesses": ["fire", "light"]
+        "weaknesses": ["fire", "light"],
     },
     "GOBLIN_WIZARD": {
         "prototype_parent": "GOBLIN",
         "key": "goblin wizard",
-        "spells": ["fire ball", "lighting bolt"]
+        "spells": ["fire ball", "lighting bolt"],
     },
     "GOBLIN_ARCHER": {
         "prototype_parent": "GOBLIN",
         "key": "goblin archer",
-        "attacks": ["short bow"]
-    },
-    "ARCHWIZARD": {
-        "prototype_parent": "GOBLIN",
-        "attacks": ["archwizard staff"],
+        "attacks": ["short bow"],
     },
+    "ARCHWIZARD": {"prototype_parent": "GOBLIN", "attacks": ["archwizard staff"]},
     "GOBLIN_ARCHWIZARD": {
         "key": "goblin archwizard",
-        "prototype_parent": ("GOBLIN_WIZARD", "ARCHWIZARD")
-    }
+        "prototype_parent": ("GOBLIN_WIZARD", "ARCHWIZARD"),
+    },
 }
 
 
 class TestSpawner(EvenniaTest):
-
     def setUp(self):
         super(TestSpawner, self).setUp()
-        self.prot1 = {"prototype_key": "testprototype",
-                      "typeclass": "evennia.objects.objects.DefaultObject"}
+        self.prot1 = {
+            "prototype_key": "testprototype",
+            "typeclass": "evennia.objects.objects.DefaultObject",
+        }
 
     def test_spawn_from_prot(self):
         obj1 = spawner.spawn(self.prot1)
         # check spawned objects have the right tag
         self.assertEqual(list(protlib.search_objects_with_prototype("testprototype")), obj1)
-        self.assertEqual([o.key for o in spawner.spawn(
-                          _PROTPARENTS["GOBLIN"], _PROTPARENTS["GOBLIN_ARCHWIZARD"],
-                          prototype_parents=_PROTPARENTS)], ['goblin grunt', 'goblin archwizard'])
+        self.assertEqual(
+            [
+                o.key
+                for o in spawner.spawn(
+                    _PROTPARENTS["GOBLIN"],
+                    _PROTPARENTS["GOBLIN_ARCHWIZARD"],
+                    prototype_parents=_PROTPARENTS,
+                )
+            ],
+            ["goblin grunt", "goblin archwizard"],
+        )
 
     def test_spawn_from_str(self):
         protlib.save_prototype(self.prot1)
-        obj1 = spawner.spawn(self.prot1['prototype_key'])
+        obj1 = spawner.spawn(self.prot1["prototype_key"])
         self.assertEqual(list(protlib.search_objects_with_prototype("testprototype")), obj1)
-        self.assertEqual([o.key for o in spawner.spawn(
-                          _PROTPARENTS["GOBLIN"], _PROTPARENTS["GOBLIN_ARCHWIZARD"],
-                          prototype_parents=_PROTPARENTS)], ['goblin grunt', 'goblin archwizard'])
+        self.assertEqual(
+            [
+                o.key
+                for o in spawner.spawn(
+                    _PROTPARENTS["GOBLIN"],
+                    _PROTPARENTS["GOBLIN_ARCHWIZARD"],
+                    prototype_parents=_PROTPARENTS,
+                )
+            ],
+            ["goblin grunt", "goblin archwizard"],
+        )
 
 
 class TestUtils(EvenniaTest):
-
     def test_prototype_from_object(self):
         self.maxDiff = None
         self.obj1.attributes.add("test", "testval")
-        self.obj1.tags.add('foo')
+        self.obj1.tags.add("foo")
         new_prot = spawner.prototype_from_object(self.obj1)
         self.assertEqual(
-            {'attrs': [('test', 'testval', None, '')],
-             'home': Something,
-             'key': 'Obj',
-             'location': Something,
-             'locks': ";".join([
-                       'call:true()',
-                       'control:perm(Developer)',
-                       'delete:perm(Admin)',
-                       'edit:perm(Admin)',
-                       'examine:perm(Builder)',
-                       'get:all()',
-                       'puppet:pperm(Developer)',
-                       'tell:perm(Admin)',
-                       'view:all()']),
-             'prototype_desc': 'Built from Obj',
-             'prototype_key': Something,
-             'prototype_locks': 'spawn:all();edit:all()',
-             'prototype_tags': [],
-             'tags': [('foo', None, None)],
-             'typeclass': 'evennia.objects.objects.DefaultObject'}, new_prot)
+            {
+                "attrs": [("test", "testval", None, "")],
+                "home": Something,
+                "key": "Obj",
+                "location": Something,
+                "locks": ";".join(
+                    [
+                        "call:true()",
+                        "control:perm(Developer)",
+                        "delete:perm(Admin)",
+                        "drop:holds()",
+                        "edit:perm(Admin)",
+                        "examine:perm(Builder)",
+                        "get:all()",
+                        "puppet:pperm(Developer)",
+                        "tell:perm(Admin)",
+                        "view:all()",
+                    ]
+                ),
+                "prototype_desc": "Built from Obj",
+                "prototype_key": Something,
+                "prototype_locks": "spawn:all();edit:all()",
+                "prototype_tags": [],
+                "tags": [("foo", None, None)],
+                "typeclass": "evennia.objects.objects.DefaultObject",
+            },
+            new_prot,
+        )
 
     def test_update_objects_from_prototypes(self):
 
         self.maxDiff = None
-        self.obj1.attributes.add('oldtest', 'to_keep')
+        self.obj1.attributes.add("oldtest", "to_keep")
 
         old_prot = spawner.prototype_from_object(self.obj1)
 
         # modify object away from prototype
-        self.obj1.attributes.add('test', 'testval')
-        self.obj1.attributes.add('desc', 'changed desc')
-        self.obj1.aliases.add('foo')
-        self.obj1.tags.add('footag', 'foocategory')
+        self.obj1.attributes.add("test", "testval")
+        self.obj1.attributes.add("desc", "changed desc")
+        self.obj1.aliases.add("foo")
+        self.obj1.tags.add("footag", "foocategory")
 
         # modify prototype
-        old_prot['new'] = 'new_val'
-        old_prot['test'] = 'testval_changed'
-        old_prot['permissions'] = ['Builder']
+        old_prot["new"] = "new_val"
+        old_prot["test"] = "testval_changed"
+        old_prot["permissions"] = ["Builder"]
         # this will not update, since we don't update the prototype on-disk
-        old_prot['prototype_desc'] = 'New version of prototype'
-        old_prot['attrs'] += (("fooattr", "fooattrval", None, ''),)
+        old_prot["prototype_desc"] = "New version of prototype"
+        old_prot["attrs"] += (("fooattr", "fooattrval", None, ""),)
 
         # diff obj/prototype
         old_prot_copy = old_prot.copy()
@@ -128,132 +149,166 @@ def test_update_objects_from_prototypes(self):
 
         self.assertEqual(old_prot_copy, old_prot)
 
-        self.assertEqual(obj_prototype,
-                         {'aliases': ['foo'],
-                          'attrs': [('desc', 'changed desc', None, ''),
-                                    ('oldtest', 'to_keep', None, ''),
-                                    ('test', 'testval', None, '')],
-                          'key': 'Obj',
-                          'home': Something,
-                          'location': Something,
-                          'locks': 'call:true();control:perm(Developer);delete:perm(Admin);'
-                                   'edit:perm(Admin);examine:perm(Builder);get:all();'
-                                   'puppet:pperm(Developer);tell:perm(Admin);view:all()',
-                          'prototype_desc': 'Built from Obj',
-                          'prototype_key': Something,
-                          'prototype_locks': 'spawn:all();edit:all()',
-                          'prototype_tags': [],
-                          'tags': [('footag', 'foocategory', None)],
-                          'typeclass': 'evennia.objects.objects.DefaultObject'})
-
-        self.assertEqual(old_prot,
-                         {'attrs': [('oldtest', 'to_keep', None, ''),
-                                    ('fooattr', 'fooattrval', None, '')],
-                          'home': Something,
-                          'key': 'Obj',
-                          'location': Something,
-                          'locks': 'call:true();control:perm(Developer);delete:perm(Admin);'
-                                   'edit:perm(Admin);examine:perm(Builder);get:all();'
-                                   'puppet:pperm(Developer);tell:perm(Admin);view:all()',
-                          'new': 'new_val',
-                          'permissions': ['Builder'],
-                          'prototype_desc': 'New version of prototype',
-                          'prototype_key': Something,
-                          'prototype_locks': 'spawn:all();edit:all()',
-                          'prototype_tags': [],
-                          'test': 'testval_changed',
-                          'typeclass': 'evennia.objects.objects.DefaultObject'})
-
-        self.assertEqual(
-             pdiff,
-             {'home': (Something, Something, 'KEEP'),
-              'prototype_locks': ('spawn:all();edit:all()',
-                                  'spawn:all();edit:all()', 'KEEP'),
-              'prototype_key': (Something, Something, 'UPDATE'),
-              'location': (Something, Something, 'KEEP'),
-              'locks': ('call:true();control:perm(Developer);delete:perm(Admin);'
-                        'edit:perm(Admin);examine:perm(Builder);get:all();'
-                        'puppet:pperm(Developer);tell:perm(Admin);view:all()',
-                        'call:true();control:perm(Developer);delete:perm(Admin);'
-                        'edit:perm(Admin);examine:perm(Builder);get:all();'
-                        'puppet:pperm(Developer);tell:perm(Admin);view:all()', 'KEEP'),
-              'prototype_tags': {},
-              'attrs': {'oldtest': (('oldtest', 'to_keep', None, ''),
-                                    ('oldtest', 'to_keep', None, ''), 'KEEP'),
-                        'test': (('test', 'testval', None, ''),
-                                 None, 'REMOVE'),
-                        'desc': (('desc', 'changed desc', None, ''),
-                                 None, 'REMOVE'),
-                        'fooattr': (None, ('fooattr', 'fooattrval', None, ''), 'ADD'),
-                        'test': (('test', 'testval', None, ''),
-                                 ('test', 'testval_changed', None, ''), 'UPDATE'),
-                        'new':  (None, ('new', 'new_val', None, ''), 'ADD')},
-              'key': ('Obj', 'Obj', 'KEEP'),
-              'typeclass': ('evennia.objects.objects.DefaultObject',
-                            'evennia.objects.objects.DefaultObject', 'KEEP'),
-              'aliases': {'foo': ('foo', None, 'REMOVE')},
-              'tags': {'footag': (('footag', 'foocategory', None), None, 'REMOVE')},
-              'prototype_desc': ('Built from Obj',
-                                 'New version of prototype', 'UPDATE'),
-              'permissions': {"Builder": (None, 'Builder', 'ADD')}
-              })
-
-        self.assertEqual(
-           spawner.flatten_diff(pdiff),
-           {'aliases': 'REMOVE',
-            'attrs': 'REPLACE',
-            'home': 'KEEP',
-            'key': 'KEEP',
-            'location': 'KEEP',
-            'locks': 'KEEP',
-            'permissions': 'UPDATE',
-            'prototype_desc': 'UPDATE',
-            'prototype_key': 'UPDATE',
-            'prototype_locks': 'KEEP',
-            'prototype_tags': 'KEEP',
-            'tags': 'REMOVE',
-            'typeclass': 'KEEP'}
-            )
+        self.assertEqual(
+            obj_prototype,
+            {
+                "aliases": ["foo"],
+                "attrs": [
+                    ("desc", "changed desc", None, ""),
+                    ("oldtest", "to_keep", None, ""),
+                    ("test", "testval", None, ""),
+                ],
+                "key": "Obj",
+                "home": Something,
+                "location": Something,
+                "locks": "call:true();control:perm(Developer);delete:perm(Admin);"
+                "drop:holds();"
+                "edit:perm(Admin);examine:perm(Builder);get:all();"
+                "puppet:pperm(Developer);tell:perm(Admin);view:all()",
+                "prototype_desc": "Built from Obj",
+                "prototype_key": Something,
+                "prototype_locks": "spawn:all();edit:all()",
+                "prototype_tags": [],
+                "tags": [("footag", "foocategory", None)],
+                "typeclass": "evennia.objects.objects.DefaultObject",
+            },
+        )
+
+        self.assertEqual(
+            old_prot,
+            {
+                "attrs": [("oldtest", "to_keep", None, ""), ("fooattr", "fooattrval", None, "")],
+                "home": Something,
+                "key": "Obj",
+                "location": Something,
+                "locks": "call:true();control:perm(Developer);delete:perm(Admin);"
+                "drop:holds();"
+                "edit:perm(Admin);examine:perm(Builder);get:all();"
+                "puppet:pperm(Developer);tell:perm(Admin);view:all()",
+                "new": "new_val",
+                "permissions": ["Builder"],
+                "prototype_desc": "New version of prototype",
+                "prototype_key": Something,
+                "prototype_locks": "spawn:all();edit:all()",
+                "prototype_tags": [],
+                "test": "testval_changed",
+                "typeclass": "evennia.objects.objects.DefaultObject",
+            },
+        )
+
+        self.assertEqual(
+            pdiff,
+            {
+                "home": (Something, Something, "KEEP"),
+                "prototype_locks": ("spawn:all();edit:all()", "spawn:all();edit:all()", "KEEP"),
+                "prototype_key": (Something, Something, "UPDATE"),
+                "location": (Something, Something, "KEEP"),
+                "locks": (
+                    "call:true();control:perm(Developer);delete:perm(Admin);"
+                    "drop:holds();edit:perm(Admin);examine:perm(Builder);"
+                    "get:all();puppet:pperm(Developer);tell:perm(Admin);view:all()",
+                    "call:true();control:perm(Developer);delete:perm(Admin);drop:holds();"
+                    "edit:perm(Admin);examine:perm(Builder);get:all();"
+                    "puppet:pperm(Developer);tell:perm(Admin);view:all()",
+                    "KEEP",
+                ),
+                "prototype_tags": {},
+                "attrs": {
+                    "oldtest": (
+                        ("oldtest", "to_keep", None, ""),
+                        ("oldtest", "to_keep", None, ""),
+                        "KEEP",
+                    ),
+                    "test": (("test", "testval", None, ""), None, "REMOVE"),
+                    "desc": (("desc", "changed desc", None, ""), None, "REMOVE"),
+                    "fooattr": (None, ("fooattr", "fooattrval", None, ""), "ADD"),
+                    "test": (
+                        ("test", "testval", None, ""),
+                        ("test", "testval_changed", None, ""),
+                        "UPDATE",
+                    ),
+                    "new": (None, ("new", "new_val", None, ""), "ADD"),
+                },
+                "key": ("Obj", "Obj", "KEEP"),
+                "typeclass": (
+                    "evennia.objects.objects.DefaultObject",
+                    "evennia.objects.objects.DefaultObject",
+                    "KEEP",
+                ),
+                "aliases": {"foo": ("foo", None, "REMOVE")},
+                "tags": {"footag": (("footag", "foocategory", None), None, "REMOVE")},
+                "prototype_desc": ("Built from Obj", "New version of prototype", "UPDATE"),
+                "permissions": {"Builder": (None, "Builder", "ADD")},
+            },
+        )
+
+        self.assertEqual(
+            spawner.flatten_diff(pdiff),
+            {
+                "aliases": "REMOVE",
+                "attrs": "REPLACE",
+                "home": "KEEP",
+                "key": "KEEP",
+                "location": "KEEP",
+                "locks": "KEEP",
+                "permissions": "UPDATE",
+                "prototype_desc": "UPDATE",
+                "prototype_key": "UPDATE",
+                "prototype_locks": "KEEP",
+                "prototype_tags": "KEEP",
+                "tags": "REMOVE",
+                "typeclass": "KEEP",
+            },
+        )
 
         # apply diff
         count = spawner.batch_update_objects_with_prototype(
-            old_prot, diff=pdiff, objects=[self.obj1])
+            old_prot, diff=pdiff, objects=[self.obj1]
+        )
         self.assertEqual(count, 1)
 
         new_prot = spawner.prototype_from_object(self.obj1)
-        self.assertEqual({'attrs': [('fooattr', 'fooattrval', None, ''),
-                                    ('new', 'new_val', None, ''),
-                                    ('oldtest', 'to_keep', None, ''),
-                                    ('test', 'testval_changed', None, '')],
-                          'home': Something,
-                          'key': 'Obj',
-                          'location': Something,
-                          'locks': ";".join([
-                                    'call:true()',
-                                    'control:perm(Developer)',
-                                    'delete:perm(Admin)',
-                                    'edit:perm(Admin)',
-                                    'examine:perm(Builder)',
-                                    'get:all()',
-                                    'puppet:pperm(Developer)',
-                                    'tell:perm(Admin)',
-                                    'view:all()']),
-                          'permissions': ['builder'],
-                          'prototype_desc': 'Built from Obj',
-                          'prototype_key': Something,
-                          'prototype_locks': 'spawn:all();edit:all()',
-                          'prototype_tags': [],
-                          'typeclass': 'evennia.objects.objects.DefaultObject'},
-                         new_prot)
+        self.assertEqual(
+            {
+                "attrs": [
+                    ("fooattr", "fooattrval", None, ""),
+                    ("new", "new_val", None, ""),
+                    ("oldtest", "to_keep", None, ""),
+                    ("test", "testval_changed", None, ""),
+                ],
+                "home": Something,
+                "key": "Obj",
+                "location": Something,
+                "locks": ";".join(
+                    [
+                        "call:true()",
+                        "control:perm(Developer)",
+                        "delete:perm(Admin)",
+                        "drop:holds()",
+                        "edit:perm(Admin)",
+                        "examine:perm(Builder)",
+                        "get:all()",
+                        "puppet:pperm(Developer)",
+                        "tell:perm(Admin)",
+                        "view:all()",
+                    ]
+                ),
+                "permissions": ["builder"],
+                "prototype_desc": "Built from Obj",
+                "prototype_key": Something,
+                "prototype_locks": "spawn:all();edit:all()",
+                "prototype_tags": [],
+                "typeclass": "evennia.objects.objects.DefaultObject",
+            },
+            new_prot,
+        )
 
 
 class TestProtLib(EvenniaTest):
-
     def setUp(self):
         super(TestProtLib, self).setUp()
         self.obj1.attributes.add("testattr", "testval")
         self.prot = spawner.prototype_from_object(self.obj1)
-        
 
     def test_prototype_to_str(self):
         prstr = protlib.prototype_to_str(self.prot)
@@ -266,7 +321,7 @@ def test_save_prototype(self):
         result = protlib.save_prototype(self.prot)
         self.assertEqual(result, self.prot)
         # faulty
-        self.prot['prototype_key'] = None
+        self.prot["prototype_key"] = None
         self.assertRaises(protlib.ValidationError, protlib.save_prototype, self.prot)
 
     def test_search_prototype(self):
@@ -275,18 +330,19 @@ def test_search_prototype(self):
         self.assertFalse(match)
         match = protlib.search_prototype()
         self.assertTrue(match)
-        match = protlib.search_prototype(self.prot['prototype_key'])
+        match = protlib.search_prototype(self.prot["prototype_key"])
         self.assertEqual(match, [self.prot])
 
 
-@override_settings(PROT_FUNC_MODULES=['evennia.prototypes.protfuncs'], CLIENT_DEFAULT_WIDTH=20)
+@override_settings(PROT_FUNC_MODULES=["evennia.prototypes.protfuncs"], CLIENT_DEFAULT_WIDTH=20)
 class TestProtFuncs(EvenniaTest):
-
     def setUp(self):
         super(TestProtFuncs, self).setUp()
-        self.prot = {"prototype_key": "test_prototype",
-                     "prototype_desc": "testing prot",
-                     "key": "ExampleObj"}
+        self.prot = {
+            "prototype_key": "test_prototype",
+            "prototype_desc": "testing prot",
+            "key": "ExampleObj",
+        }
 
     @mock.patch("evennia.prototypes.protfuncs.base_random", new=mock.MagicMock(return_value=0.5))
     @mock.patch("evennia.prototypes.protfuncs.base_randint", new=mock.MagicMock(return_value=5))
@@ -296,24 +352,29 @@ def test_protfuncs(self):
         self.assertEqual(protlib.protfunc_parser("$left_justify(  foo  )"), "foo                 ")
         self.assertEqual(protlib.protfunc_parser("$right_justify( foo  )"), "                 foo")
         self.assertEqual(protlib.protfunc_parser("$center_justify(foo  )"), "        foo         ")
-        self.assertEqual(protlib.protfunc_parser(
-            "$full_justify(foo bar moo too)"), 'foo   bar   moo  too')
+        self.assertEqual(
+            protlib.protfunc_parser("$full_justify(foo bar moo too)"), "foo   bar   moo  too"
+        )
         self.assertEqual(
             protlib.protfunc_parser("$right_justify( foo  )", testing=True),
-            ('unexpected indent (<unknown>, line 1)', '                 foo'))
+            ("unexpected indent (<unknown>, line 1)", "                 foo"),
+        )
 
-        test_prot = {"key1": "value1",
-                     "key2": 2}
+        test_prot = {"key1": "value1", "key2": 2}
 
-        self.assertEqual(protlib.protfunc_parser(
-            "$protkey(key1)", testing=True, prototype=test_prot), (None, "value1"))
-        self.assertEqual(protlib.protfunc_parser(
-            "$protkey(key2)", testing=True, prototype=test_prot), (None, 2))
+        self.assertEqual(
+            protlib.protfunc_parser("$protkey(key1)", testing=True, prototype=test_prot),
+            (None, "value1"),
+        )
+        self.assertEqual(
+            protlib.protfunc_parser("$protkey(key2)", testing=True, prototype=test_prot), (None, 2)
+        )
 
         self.assertEqual(protlib.protfunc_parser("$add(1, 2)"), 3)
         self.assertEqual(protlib.protfunc_parser("$add(10, 25)"), 35)
-        self.assertEqual(protlib.protfunc_parser(
-            "$add('''[1,2,3]''', '''[4,5,6]''')"), [1, 2, 3, 4, 5, 6])
+        self.assertEqual(
+            protlib.protfunc_parser("$add('''[1,2,3]''', '''[4,5,6]''')"), [1, 2, 3, 4, 5, 6]
+        )
         self.assertEqual(protlib.protfunc_parser("$add(foo, bar)"), "foo bar")
 
         self.assertEqual(protlib.protfunc_parser("$sub(5, 2)"), 3)
@@ -331,123 +392,187 @@ def test_protfuncs(self):
         self.assertEqual(protlib.protfunc_parser("$toint($div(5, 2))"), 2)
         self.assertEqual(protlib.protfunc_parser("$sub($add(5, 3), $add(10, 2))"), -4)
 
-        self.assertEqual(protlib.protfunc_parser("$eval('2')"), '2')
-
-        self.assertEqual(protlib.protfunc_parser(
-            "$eval(['test', 1, '2', 3.5, \"foo\"])"), ['test', 1, '2', 3.5, 'foo'])
-        self.assertEqual(protlib.protfunc_parser(
-            "$eval({'test': '1', 2:3, 3: $toint(3.5)})"), {'test': '1', 2: 3, 3: 3})
+        self.assertEqual(protlib.protfunc_parser("$eval('2')"), "2")
 
+        self.assertEqual(
+            protlib.protfunc_parser("$eval(['test', 1, '2', 3.5, \"foo\"])"),
+            ["test", 1, "2", 3.5, "foo"],
+        )
+        self.assertEqual(
+            protlib.protfunc_parser("$eval({'test': '1', 2:3, 3: $toint(3.5)})"),
+            {"test": "1", 2: 3, 3: 3},
+        )
 
         # no object search
         odbref = self.obj1.dbref
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("obj({})".format(odbref), session=self.session), 'obj({})'.format(odbref))
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("obj({})".format(odbref), session=self.session),
+                "obj({})".format(odbref),
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("dbref({})".format(odbref), session=self.session), 'dbref({})'.format(odbref))
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("dbref({})".format(odbref), session=self.session),
+                "dbref({})".format(odbref),
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("stone(#12345)", session=self.session), 'stone(#12345)')
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("stone(#12345)", session=self.session), "stone(#12345)"
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
             self.assertEqual(protlib.protfunc_parser(odbref, session=self.session), odbref)
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("#12345", session=self.session), '#12345')
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(protlib.protfunc_parser("#12345", session=self.session), "#12345")
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("nothing({})".format(odbref), session=self.session), 'nothing({})'.format(odbref))
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("nothing({})".format(odbref), session=self.session),
+                "nothing({})".format(odbref),
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("(#12345)", session=self.session), '(#12345)')
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(protlib.protfunc_parser("(#12345)", session=self.session), "(#12345)")
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("obj(Char)", session=self.session), 'obj(Char)')
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("obj(Char)", session=self.session), "obj(Char)"
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("objlist({})".format(odbref), session=self.session), 'objlist({})'.format(odbref))
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("objlist({})".format(odbref), session=self.session),
+                "objlist({})".format(odbref),
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("dbref(Char)", session=self.session), 'dbref(Char)')
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("dbref(Char)", session=self.session), "dbref(Char)"
+            )
             mocked__obj_search.assert_not_called()
 
-
         # obj search happens
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("$objlist({})".format(odbref), session=self.session), [odbref])
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("$objlist({})".format(odbref), session=self.session),
+                [odbref],
+            )
             mocked__obj_search.assert_called_once()
             assert (odbref,) == mocked__obj_search.call_args[0]
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("$obj({})".format(odbref), session=self.session), odbref)
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("$obj({})".format(odbref), session=self.session), odbref
+            )
             mocked__obj_search.assert_called_once()
             assert (odbref,) == mocked__obj_search.call_args[0]
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("$dbref({})".format(odbref), session=self.session), odbref)
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("$dbref({})".format(odbref), session=self.session), odbref
+            )
             mocked__obj_search.assert_called_once()
             assert (odbref,) == mocked__obj_search.call_args[0]
 
         cdbref = self.char1.dbref
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
             self.assertEqual(protlib.protfunc_parser("$obj(Char)", session=self.session), cdbref)
             mocked__obj_search.assert_called_once()
-            assert ('Char',) == mocked__obj_search.call_args[0]
-
+            assert ("Char",) == mocked__obj_search.call_args[0]
 
         # bad invocation
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
-            self.assertEqual(protlib.protfunc_parser("$badfunc(#112345)", session=self.session), '<UNKNOWN>')
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
+            self.assertEqual(
+                protlib.protfunc_parser("$badfunc(#112345)", session=self.session), "<UNKNOWN>"
+            )
             mocked__obj_search.assert_not_called()
 
-        with mock.patch("evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search) as mocked__obj_search:
+        with mock.patch(
+            "evennia.prototypes.protfuncs._obj_search", wraps=protofuncs._obj_search
+        ) as mocked__obj_search:
             self.assertRaises(ValueError, protlib.protfunc_parser, "$dbref(Char)")
             mocked__obj_search.assert_not_called()
 
-
-        self.assertEqual(protlib.value_to_obj(
-            protlib.protfunc_parser(cdbref, session=self.session)), self.char1)
-        self.assertEqual(protlib.value_to_obj_or_any(
-            protlib.protfunc_parser(cdbref, session=self.session)), self.char1)
-        self.assertEqual(protlib.value_to_obj_or_any(
-            protlib.protfunc_parser("[1,2,3,'{}',5]".format(cdbref), session=self.session)),
-                [1, 2, 3, self.char1, 5])
+        self.assertEqual(
+            protlib.value_to_obj(protlib.protfunc_parser(cdbref, session=self.session)), self.char1
+        )
+        self.assertEqual(
+            protlib.value_to_obj_or_any(protlib.protfunc_parser(cdbref, session=self.session)),
+            self.char1,
+        )
+        self.assertEqual(
+            protlib.value_to_obj_or_any(
+                protlib.protfunc_parser("[1,2,3,'{}',5]".format(cdbref), session=self.session)
+            ),
+            [1, 2, 3, self.char1, 5],
+        )
 
 
 class TestPrototypeStorage(EvenniaTest):
-
     def setUp(self):
         super(TestPrototypeStorage, self).setUp()
         self.maxDiff = None
 
         self.prot1 = spawner.prototype_from_object(self.obj1)
-        self.prot1['prototype_key'] = 'testprototype1'
-        self.prot1['prototype_desc'] = 'testdesc1'
-        self.prot1['prototype_tags'] = [('foo1', _PROTOTYPE_TAG_META_CATEGORY)]
+        self.prot1["prototype_key"] = "testprototype1"
+        self.prot1["prototype_desc"] = "testdesc1"
+        self.prot1["prototype_tags"] = [("foo1", _PROTOTYPE_TAG_META_CATEGORY)]
 
         self.prot2 = self.prot1.copy()
-        self.prot2['prototype_key'] = 'testprototype2'
-        self.prot2['prototype_desc'] = 'testdesc2'
-        self.prot2['prototype_tags'] = [('foo1', _PROTOTYPE_TAG_META_CATEGORY)]
+        self.prot2["prototype_key"] = "testprototype2"
+        self.prot2["prototype_desc"] = "testdesc2"
+        self.prot2["prototype_tags"] = [("foo1", _PROTOTYPE_TAG_META_CATEGORY)]
 
         self.prot3 = self.prot2.copy()
-        self.prot3['prototype_key'] = 'testprototype3'
-        self.prot3['prototype_desc'] = 'testdesc3'
-        self.prot3['prototype_tags'] = [('foo1', _PROTOTYPE_TAG_META_CATEGORY)]
+        self.prot3["prototype_key"] = "testprototype3"
+        self.prot3["prototype_desc"] = "testdesc3"
+        self.prot3["prototype_tags"] = [("foo1", _PROTOTYPE_TAG_META_CATEGORY)]
 
     def test_prototype_storage(self):
 
@@ -457,29 +582,41 @@ def test_prototype_storage(self):
         self.assertTrue(bool(prot1))
         self.assertEqual(prot1, self.prot1)
 
-        self.assertEqual(prot1['prototype_desc'], "testdesc1")
+        self.assertEqual(prot1["prototype_desc"], "testdesc1")
 
-        self.assertEqual(prot1['prototype_tags'], [("foo1", _PROTOTYPE_TAG_META_CATEGORY)])
+        self.assertEqual(prot1["prototype_tags"], [("foo1", _PROTOTYPE_TAG_META_CATEGORY)])
         self.assertEqual(
-            protlib.DbPrototype.objects.get_by_tag(
-                "foo1", _PROTOTYPE_TAG_META_CATEGORY)[0].db.prototype, prot1)
+            protlib.DbPrototype.objects.get_by_tag("foo1", _PROTOTYPE_TAG_META_CATEGORY)[
+                0
+            ].db.prototype,
+            prot1,
+        )
 
         prot2 = protlib.create_prototype(self.prot2)
         self.assertEqual(
-            [pobj.db.prototype
-             for pobj in protlib.DbPrototype.objects.get_by_tag(
-                 "foo1", _PROTOTYPE_TAG_META_CATEGORY)],
-            [prot1, prot2])
+            [
+                pobj.db.prototype
+                for pobj in protlib.DbPrototype.objects.get_by_tag(
+                    "foo1", _PROTOTYPE_TAG_META_CATEGORY
+                )
+            ],
+            [prot1, prot2],
+        )
 
         # add to existing prototype
         prot1b = protlib.create_prototype(
-            {"prototype_key": 'testprototype1', "foo": 'bar', "prototype_tags": ['foo2']})
+            {"prototype_key": "testprototype1", "foo": "bar", "prototype_tags": ["foo2"]}
+        )
 
         self.assertEqual(
-            [pobj.db.prototype
-             for pobj in protlib.DbPrototype.objects.get_by_tag(
-                 "foo2", _PROTOTYPE_TAG_META_CATEGORY)],
-            [prot1b])
+            [
+                pobj.db.prototype
+                for pobj in protlib.DbPrototype.objects.get_by_tag(
+                    "foo2", _PROTOTYPE_TAG_META_CATEGORY
+                )
+            ],
+            [prot1b],
+        )
 
         self.assertEqual(list(protlib.search_prototype("testprototype2")), [prot2])
         self.assertNotEqual(list(protlib.search_prototype("testprototype1")), [prot1])
@@ -511,9 +648,11 @@ def setUp(self):
         menutree = _MockMenu()
         self.caller.ndb._menutree = menutree
 
-        self.test_prot = {"prototype_key": "test_prot",
-                          "typeclass": "evennia.objects.objects.DefaultObject",
-                          "prototype_locks": "edit:all();spawn:all()"}
+        self.test_prot = {
+            "prototype_key": "test_prot",
+            "typeclass": "evennia.objects.objects.DefaultObject",
+            "prototype_locks": "edit:all();spawn:all()",
+        }
 
     def test_helpers(self):
 
@@ -527,113 +666,157 @@ def test_helpers(self):
         self.assertEqual(olc_menus._set_menu_prototype(caller, {}), {})
 
         self.assertEqual(
-            olc_menus._set_prototype_value(caller, "key", "TestKey"), {"key": "TestKey"})
+            olc_menus._set_prototype_value(caller, "key", "TestKey"), {"key": "TestKey"}
+        )
         self.assertEqual(olc_menus._get_menu_prototype(caller), {"key": "TestKey"})
 
-        self.assertEqual(olc_menus._format_option_value(
-            "key", required=True, prototype=olc_menus._get_menu_prototype(caller)), " (TestKey|n)")
-        self.assertEqual(olc_menus._format_option_value(
-            [1, 2, 3, "foo"], required=True), ' (1, 2, 3, foo|n)')
+        self.assertEqual(
+            olc_menus._format_option_value(
+                "key", required=True, prototype=olc_menus._get_menu_prototype(caller)
+            ),
+            " (TestKey|n)",
+        )
+        self.assertEqual(
+            olc_menus._format_option_value([1, 2, 3, "foo"], required=True), " (1, 2, 3, foo|n)"
+        )
 
-        self.assertEqual(olc_menus._set_property(
-            caller, "ChangedKey", prop="key", processor=str, next_node="foo"), "foo")
+        self.assertEqual(
+            olc_menus._set_property(
+                caller, "ChangedKey", prop="key", processor=str, next_node="foo"
+            ),
+            "foo",
+        )
         self.assertEqual(olc_menus._get_menu_prototype(caller), {"key": "ChangedKey"})
 
-        self.assertEqual(olc_menus._wizard_options(
-            "ThisNode", "PrevNode", "NextNode"),
-            [{'goto': 'node_PrevNode', 'key': ('|wB|Wack', 'b'), 'desc': '|W(PrevNode)|n'},
-             {'goto': 'node_NextNode', 'key': ('|wF|Worward', 'f'), 'desc': '|W(NextNode)|n'},
-             {'goto': 'node_index', 'key': ('|wI|Wndex', 'i')},
-             {'goto': ('node_validate_prototype', {'back': 'ThisNode'}),
-                 'key': ('|wV|Walidate prototype', 'validate', 'v')}])
+        self.assertEqual(
+            olc_menus._wizard_options("ThisNode", "PrevNode", "NextNode"),
+            [
+                {"goto": "node_PrevNode", "key": ("|wB|Wack", "b"), "desc": "|W(PrevNode)|n"},
+                {"goto": "node_NextNode", "key": ("|wF|Worward", "f"), "desc": "|W(NextNode)|n"},
+                {"goto": "node_index", "key": ("|wI|Wndex", "i")},
+                {
+                    "goto": ("node_validate_prototype", {"back": "ThisNode"}),
+                    "key": ("|wV|Walidate prototype", "validate", "v"),
+                },
+            ],
+        )
 
         self.assertEqual(olc_menus._validate_prototype(self.test_prot), (False, Something))
-        self.assertEqual(olc_menus._validate_prototype(
-            {"prototype_key": "testthing", "key": "mytest"}),
-            (True, Something))
+        self.assertEqual(
+            olc_menus._validate_prototype({"prototype_key": "testthing", "key": "mytest"}),
+            (True, Something),
+        )
 
         choices = ["test1", "test2", "test3", "test4"]
         actions = (("examine", "e", "l"), ("add", "a"), ("foo", "f"))
-        self.assertEqual(olc_menus._default_parse("l4", choices, *actions), ('test4', 'examine'))
-        self.assertEqual(olc_menus._default_parse("add 2", choices, *actions), ('test2', 'add'))
-        self.assertEqual(olc_menus._default_parse("foo3", choices, *actions), ('test3', 'foo'))
-        self.assertEqual(olc_menus._default_parse("f3", choices, *actions), ('test3', 'foo'))
+        self.assertEqual(olc_menus._default_parse("l4", choices, *actions), ("test4", "examine"))
+        self.assertEqual(olc_menus._default_parse("add 2", choices, *actions), ("test2", "add"))
+        self.assertEqual(olc_menus._default_parse("foo3", choices, *actions), ("test3", "foo"))
+        self.assertEqual(olc_menus._default_parse("f3", choices, *actions), ("test3", "foo"))
         self.assertEqual(olc_menus._default_parse("f5", choices, *actions), (None, None))
 
     def test_node_helpers(self):
 
         caller = self.caller
 
-        with mock.patch("evennia.prototypes.menus.protlib.search_prototype",
-                        new=mock.MagicMock(return_value=[self.test_prot])):
+        with mock.patch(
+            "evennia.prototypes.menus.protlib.search_prototype",
+            new=mock.MagicMock(return_value=[self.test_prot]),
+        ):
             # prototype_key helpers
             self.assertEqual(olc_menus._check_prototype_key(caller, "test_prot"), None)
             caller.ndb._menutree.olc_new = True
             self.assertEqual(olc_menus._check_prototype_key(caller, "test_prot"), "node_index")
 
             # prototype_parent helpers
-            self.assertEqual(olc_menus._all_prototype_parents(caller), ['test_prot'])
+            self.assertEqual(olc_menus._all_prototype_parents(caller), ["test_prot"])
             # self.assertEqual(olc_menus._prototype_parent_parse(
             #     caller, 'test_prot'),
             #     "|cprototype key:|n test_prot, |ctags:|n None, |clocks:|n edit:all();spawn:all() "
             #     "\n|cdesc:|n None \n|cprototype:|n "
             #     "{\n  'typeclass': 'evennia.objects.objects.DefaultObject', \n}")
 
-        with mock.patch("evennia.prototypes.menus.protlib.search_prototype",
-                        new=mock.MagicMock(return_value=[_PROTPARENTS['GOBLIN']])):
-            self.assertEqual(olc_menus._prototype_parent_select(caller, "goblin"), "node_prototype_parent")
+        with mock.patch(
+            "evennia.prototypes.menus.protlib.search_prototype",
+            new=mock.MagicMock(return_value=[_PROTPARENTS["GOBLIN"]]),
+        ):
+            self.assertEqual(
+                olc_menus._prototype_parent_select(caller, "goblin"), "node_prototype_parent"
+            )
 
-        self.assertEqual(olc_menus._get_menu_prototype(caller),
-                         {'prototype_key': 'test_prot',
-                          'prototype_locks': 'edit:all();spawn:all()',
-                          'prototype_parent': 'goblin',
-                          'typeclass': 'evennia.objects.objects.DefaultObject'})
+        self.assertEqual(
+            olc_menus._get_menu_prototype(caller),
+            {
+                "prototype_key": "test_prot",
+                "prototype_locks": "edit:all();spawn:all()",
+                "prototype_parent": "goblin",
+                "typeclass": "evennia.objects.objects.DefaultObject",
+            },
+        )
 
         # typeclass helpers
-        with mock.patch("evennia.utils.utils.get_all_typeclasses",
-                        new=mock.MagicMock(return_value={"foo": None, "bar": None})):
-            self.assertEqual(olc_menus._all_typeclasses(caller),  ["bar", "foo"])
+        with mock.patch(
+            "evennia.utils.utils.get_all_typeclasses",
+            new=mock.MagicMock(return_value={"foo": None, "bar": None}),
+        ):
+            self.assertEqual(olc_menus._all_typeclasses(caller), ["bar", "foo"])
 
-        self.assertEqual(olc_menus._typeclass_select(
-            caller, "evennia.objects.objects.DefaultObject"), None)
+        self.assertEqual(
+            olc_menus._typeclass_select(caller, "evennia.objects.objects.DefaultObject"), None
+        )
         # prototype_parent should be popped off here
-        self.assertEqual(olc_menus._get_menu_prototype(caller),
-                         {'prototype_key': 'test_prot',
-                          'prototype_locks': 'edit:all();spawn:all()',
-                          'prototype_parent': 'goblin',
-                          'typeclass': 'evennia.objects.objects.DefaultObject'})
+        self.assertEqual(
+            olc_menus._get_menu_prototype(caller),
+            {
+                "prototype_key": "test_prot",
+                "prototype_locks": "edit:all();spawn:all()",
+                "prototype_parent": "goblin",
+                "typeclass": "evennia.objects.objects.DefaultObject",
+            },
+        )
 
         # attr helpers
         self.assertEqual(olc_menus._caller_attrs(caller), [])
         self.assertEqual(olc_menus._add_attr(caller, "test1=foo1"), Something)
         self.assertEqual(olc_menus._add_attr(caller, "test2;cat1=foo2"), Something)
         self.assertEqual(olc_menus._add_attr(caller, "test3;cat2;edit:false()=foo3"), Something)
-        self.assertEqual(olc_menus._add_attr(caller, "test4;cat3;set:true();edit:false()=foo4"), Something)
-        self.assertEqual(olc_menus._add_attr(caller, "test5;cat4;set:true();edit:false()=123"), Something)
+        self.assertEqual(
+            olc_menus._add_attr(caller, "test4;cat3;set:true();edit:false()=foo4"), Something
+        )
+        self.assertEqual(
+            olc_menus._add_attr(caller, "test5;cat4;set:true();edit:false()=123"), Something
+        )
         self.assertEqual(olc_menus._add_attr(caller, "test1=foo1_changed"), Something)
-        self.assertEqual(olc_menus._get_menu_prototype(caller)['attrs'],
-            [("test1", "foo1_changed", None, ''),
-             ("test2", "foo2", "cat1", ''),
-             ("test3", "foo3", "cat2", "edit:false()"),
-             ("test4", "foo4", "cat3", "set:true();edit:false()"),
-             ("test5", '123', "cat4", "set:true();edit:false()")])
+        self.assertEqual(
+            olc_menus._get_menu_prototype(caller)["attrs"],
+            [
+                ("test1", "foo1_changed", None, ""),
+                ("test2", "foo2", "cat1", ""),
+                ("test3", "foo3", "cat2", "edit:false()"),
+                ("test4", "foo4", "cat3", "set:true();edit:false()"),
+                ("test5", "123", "cat4", "set:true();edit:false()"),
+            ],
+        )
 
         # tag helpers
         self.assertEqual(olc_menus._caller_tags(caller), [])
         self.assertEqual(olc_menus._add_tag(caller, "foo1"), Something)
         self.assertEqual(olc_menus._add_tag(caller, "foo2;cat1"), Something)
         self.assertEqual(olc_menus._add_tag(caller, "foo3;cat2;dat1"), Something)
-        self.assertEqual(olc_menus._caller_tags(caller), ['foo1', 'foo2', 'foo3'])
-        self.assertEqual(olc_menus._get_menu_prototype(caller)['tags'],
-            [('foo1', None, ""),
-             ('foo2', 'cat1', ""),
-             ('foo3', 'cat2', "dat1")])
+        self.assertEqual(olc_menus._caller_tags(caller), ["foo1", "foo2", "foo3"])
+        self.assertEqual(
+            olc_menus._get_menu_prototype(caller)["tags"],
+            [("foo1", None, ""), ("foo2", "cat1", ""), ("foo3", "cat2", "dat1")],
+        )
         self.assertEqual(olc_menus._add_tag(caller, "foo1", delete=True), "Removed Tag 'foo1'.")
-        self.assertEqual(olc_menus._get_menu_prototype(caller)['tags'],
-            [('foo2', 'cat1', ""),
-             ('foo3', 'cat2', "dat1")])
+        self.assertEqual(
+            olc_menus._get_menu_prototype(caller)["tags"],
+            [("foo2", "cat1", ""), ("foo3", "cat2", "dat1")],
+        )
 
-        self.assertEqual(olc_menus._display_tag(olc_menus._get_menu_prototype(caller)['tags'][0]), Something)
+        self.assertEqual(
+            olc_menus._display_tag(olc_menus._get_menu_prototype(caller)["tags"][0]), Something
+        )
         self.assertEqual(olc_menus._caller_tags(caller), ["foo2", "foo3"])
 
         protlib.save_prototype(self.test_prot)
@@ -641,7 +824,9 @@ def test_node_helpers(self):
         # locks helpers
         self.assertEqual(olc_menus._lock_add(caller, "foo:false()"), "Added lock 'foo:false()'.")
         self.assertEqual(olc_menus._lock_add(caller, "foo2:false()"), "Added lock 'foo2:false()'.")
-        self.assertEqual(olc_menus._lock_add(caller, "foo2:true()"), "Lock with locktype 'foo2' updated.")
+        self.assertEqual(
+            olc_menus._lock_add(caller, "foo2:true()"), "Lock with locktype 'foo2' updated."
+        )
         self.assertEqual(olc_menus._get_menu_prototype(caller)["locks"], "foo:false();foo2:true()")
 
         # perm helpers
@@ -651,96 +836,126 @@ def test_node_helpers(self):
 
         # prototype_tags helpers
         self.assertEqual(olc_menus._add_prototype_tag(caller, "foo"), "Added Prototype-Tag 'foo'.")
-        self.assertEqual(olc_menus._add_prototype_tag(caller, "foo2"), "Added Prototype-Tag 'foo2'.")
+        self.assertEqual(
+            olc_menus._add_prototype_tag(caller, "foo2"), "Added Prototype-Tag 'foo2'."
+        )
         self.assertEqual(olc_menus._get_menu_prototype(caller)["prototype_tags"], ["foo", "foo2"])
 
         # spawn helpers
-        with mock.patch("evennia.prototypes.menus.protlib.search_prototype",
-                        new=mock.MagicMock(return_value=[_PROTPARENTS['GOBLIN']])):
+        with mock.patch(
+            "evennia.prototypes.menus.protlib.search_prototype",
+            new=mock.MagicMock(return_value=[_PROTPARENTS["GOBLIN"]]),
+        ):
             self.assertEqual(olc_menus._spawn(caller, prototype=self.test_prot), Something)
         obj = caller.contents[0]
 
         self.assertEqual(obj.typeclass_path, "evennia.objects.objects.DefaultObject")
-        self.assertEqual(obj.tags.get(category=spawner._PROTOTYPE_TAG_CATEGORY), self.test_prot['prototype_key'])
+        self.assertEqual(
+            obj.tags.get(category=spawner._PROTOTYPE_TAG_CATEGORY), self.test_prot["prototype_key"]
+        )
 
         # update helpers
-        self.assertEqual(olc_menus._apply_diff(
-            caller, prototype=self.test_prot, back_node="foo", objects=[obj]), 'foo')  # no changes to apply
-        self.test_prot['key'] = "updated key"  # change prototype
-        self.assertEqual(olc_menus._apply_diff(
-            caller, prototype=self.test_prot, objects=[obj], back_node='foo'), 'foo')  # apply change to the one obj
+        self.assertEqual(
+            olc_menus._apply_diff(caller, prototype=self.test_prot, back_node="foo", objects=[obj]),
+            "foo",
+        )  # no changes to apply
+        self.test_prot["key"] = "updated key"  # change prototype
+        self.assertEqual(
+            olc_menus._apply_diff(caller, prototype=self.test_prot, objects=[obj], back_node="foo"),
+            "foo",
+        )  # apply change to the one obj
 
         # load helpers
-        self.assertEqual(olc_menus._prototype_load_select(caller, self.test_prot['prototype_key']),
-                         ('node_examine_entity', {'text': '|gLoaded prototype test_prot.|n', 'back': 'index'}) )
+        self.assertEqual(
+            olc_menus._prototype_load_select(caller, self.test_prot["prototype_key"]),
+            ("node_examine_entity", {"text": "|gLoaded prototype test_prot.|n", "back": "index"}),
+        )
 
         # diff helpers
         obj_diff = {
-            'attrs': {
-                'desc': (('desc', 'This is User #1.', None, ''),
-                          ('desc', 'This is User #1.', None, ''),
-                          'KEEP'),
-                'foo': (None,
-                         ('foo', 'bar', None, ''),
-                         'ADD'),
-                'prelogout_location': (('prelogout_location', "#2", None, ''),
-                                        ('prelogout_location', "#2", None, ''),
-                                        'KEEP')},
-            'home': ('#2', '#2', 'KEEP'),
-            'key': ('TestChar', 'TestChar', 'KEEP'),
-            'locks': ('boot:false();call:false();control:perm(Developer);delete:false();'
-                      'edit:false();examine:perm(Developer);get:false();msg:all();'
-                      'puppet:false();tell:perm(Admin);view:all()',
-                      'boot:false();call:false();control:perm(Developer);delete:false();'
-                      'edit:false();examine:perm(Developer);get:false();msg:all();'
-                      'puppet:false();tell:perm(Admin);view:all()',
-                      'KEEP'),
-            'permissions': {'developer': ('developer', 'developer', 'KEEP')},
-            'prototype_desc': ('Testobject build', None, 'REMOVE'),
-            'prototype_key': ('TestDiffKey', 'TestDiffKey', 'KEEP'),
-            'prototype_locks': ('spawn:all();edit:all()', 'spawn:all();edit:all()', 'KEEP'),
-            'prototype_tags': {},
-            'tags': {'foo': (None, ('foo', None, ''), 'ADD')},
-            'typeclass': ('typeclasses.characters.Character',
-                          'typeclasses.characters.Character', 'KEEP')}
+            "attrs": {
+                "desc": (
+                    ("desc", "This is User #1.", None, ""),
+                    ("desc", "This is User #1.", None, ""),
+                    "KEEP",
+                ),
+                "foo": (None, ("foo", "bar", None, ""), "ADD"),
+                "prelogout_location": (
+                    ("prelogout_location", "#2", None, ""),
+                    ("prelogout_location", "#2", None, ""),
+                    "KEEP",
+                ),
+            },
+            "home": ("#2", "#2", "KEEP"),
+            "key": ("TestChar", "TestChar", "KEEP"),
+            "locks": (
+                "boot:false();call:false();control:perm(Developer);delete:false();"
+                "edit:false();examine:perm(Developer);get:false();msg:all();"
+                "puppet:false();tell:perm(Admin);view:all()",
+                "boot:false();call:false();control:perm(Developer);delete:false();"
+                "edit:false();examine:perm(Developer);get:false();msg:all();"
+                "puppet:false();tell:perm(Admin);view:all()",
+                "KEEP",
+            ),
+            "permissions": {"developer": ("developer", "developer", "KEEP")},
+            "prototype_desc": ("Testobject build", None, "REMOVE"),
+            "prototype_key": ("TestDiffKey", "TestDiffKey", "KEEP"),
+            "prototype_locks": ("spawn:all();edit:all()", "spawn:all();edit:all()", "KEEP"),
+            "prototype_tags": {},
+            "tags": {"foo": (None, ("foo", None, ""), "ADD")},
+            "typeclass": (
+                "typeclasses.characters.Character",
+                "typeclasses.characters.Character",
+                "KEEP",
+            ),
+        }
 
         texts, options = olc_menus._format_diff_text_and_options(obj_diff)
         self.assertEqual(
             "\n".join(texts),
-            '- |wattrs:|n \n'
-            '   |gKEEP|W:|n desc |W=|n This is User #1. |W(category:|n None|W, locks:|n |W)|n\n'
-            '   |c[1] |yADD|n|W:|n None |W->|n foo |W=|n bar |W(category:|n None|W, locks:|n |W)|n\n'
-            '   |gKEEP|W:|n prelogout_location |W=|n #2 |W(category:|n None|W, locks:|n |W)|n\n'
-            '- |whome:|n    |gKEEP|W:|n #2\n'
-            '- |wkey:|n    |gKEEP|W:|n TestChar\n'
-            '- |wlocks:|n    |gKEEP|W:|n boot:false();call:false();control:perm(Developer);delete:false();edit:false();examine:perm(Developer);get:false();msg:all();puppet:false();tell:perm(Admin);view:all()\n'
-            '- |wpermissions:|n \n'
-            '   |gKEEP|W:|n developer\n'
-            '- |wprototype_desc:|n    |c[2] |rREMOVE|n|W:|n Testobject build |W->|n None\n'
-            '- |wprototype_key:|n    |gKEEP|W:|n TestDiffKey\n'
-            '- |wprototype_locks:|n    |gKEEP|W:|n spawn:all();edit:all()\n'
-            '- |wprototype_tags:|n \n'
-            '- |wtags:|n \n'
-            '   |c[3] |yADD|n|W:|n None |W->|n foo |W(category:|n None|W)|n\n'
-            '- |wtypeclass:|n    |gKEEP|W:|n typeclasses.characters.Character')
+            "- |wattrs:|n \n"
+            "   |gKEEP|W:|n desc |W=|n This is User #1. |W(category:|n None|W, locks:|n |W)|n\n"
+            "   |c[1] |yADD|n|W:|n None |W->|n foo |W=|n bar |W(category:|n None|W, locks:|n |W)|n\n"
+            "   |gKEEP|W:|n prelogout_location |W=|n #2 |W(category:|n None|W, locks:|n |W)|n\n"
+            "- |whome:|n    |gKEEP|W:|n #2\n"
+            "- |wkey:|n    |gKEEP|W:|n TestChar\n"
+            "- |wlocks:|n    |gKEEP|W:|n boot:false();call:false();control:perm(Developer);delete:false();edit:false();examine:perm(Developer);get:false();msg:all();puppet:false();tell:perm(Admin);view:all()\n"
+            "- |wpermissions:|n \n"
+            "   |gKEEP|W:|n developer\n"
+            "- |wprototype_desc:|n    |c[2] |rREMOVE|n|W:|n Testobject build |W->|n None\n"
+            "- |wprototype_key:|n    |gKEEP|W:|n TestDiffKey\n"
+            "- |wprototype_locks:|n    |gKEEP|W:|n spawn:all();edit:all()\n"
+            "- |wprototype_tags:|n \n"
+            "- |wtags:|n \n"
+            "   |c[3] |yADD|n|W:|n None |W->|n foo |W(category:|n None|W)|n\n"
+            "- |wtypeclass:|n    |gKEEP|W:|n typeclasses.characters.Character",
+        )
         self.assertEqual(
             options,
-            [{'goto': (Something, Something),
-              'key': '1',
-              'desc': '|gKEEP|n (attrs) None'},
-             {'goto': (Something, Something),
-              'key': '2',
-              'desc': '|gKEEP|n (prototype_desc) Testobject build'},
-             {'goto': (Something, Something),
-              'key': '3',
-              'desc': '|gKEEP|n (tags) None'}])
-
-
-@mock.patch("evennia.prototypes.menus.protlib.search_prototype", new=mock.MagicMock(
-   return_value=[{"prototype_key": "TestPrototype",
-                  "typeclass": "TypeClassTest", "key": "TestObj"}]))
-@mock.patch("evennia.utils.utils.get_all_typeclasses", new=mock.MagicMock(
-   return_value={"TypeclassTest": None}))
+            [
+                {"goto": (Something, Something), "key": "1", "desc": "|gKEEP|n (attrs) None"},
+                {
+                    "goto": (Something, Something),
+                    "key": "2",
+                    "desc": "|gKEEP|n (prototype_desc) Testobject build",
+                },
+                {"goto": (Something, Something), "key": "3", "desc": "|gKEEP|n (tags) None"},
+            ],
+        )
+
+
+@mock.patch(
+    "evennia.prototypes.menus.protlib.search_prototype",
+    new=mock.MagicMock(
+        return_value=[
+            {"prototype_key": "TestPrototype", "typeclass": "TypeClassTest", "key": "TestObj"}
+        ]
+    ),
+)
+@mock.patch(
+    "evennia.utils.utils.get_all_typeclasses",
+    new=mock.MagicMock(return_value={"TypeclassTest": None}),
+)
 class TestOLCMenu(TestEvMenu):
 
     maxDiff = None
@@ -750,35 +965,113 @@ class TestOLCMenu(TestEvMenu):
     # debug_output = True
     expect_all_nodes = True
 
-    expected_node_texts = {
-        "node_index": "|c --- Prototype wizard --- |n"
-    }
-
-    expected_tree = ['node_index', ['node_prototype_key', ['node_index', 'node_index', 'node_index',
-        'node_validate_prototype', ['node_index', 'node_index', 'node_index'], 'node_index'],
-        'node_prototype_parent', ['node_prototype_parent', 'node_prototype_key',
-            'node_prototype_parent', 'node_index', 'node_validate_prototype', 'node_index'],
-        'node_typeclass', ['node_typeclass', 'node_prototype_parent', 'node_typeclass',
-            'node_index', 'node_validate_prototype', 'node_index'], 'node_key', ['node_typeclass',
-                'node_key', 'node_index', 'node_validate_prototype', 'node_index'], 'node_aliases',
-            ['node_key', 'node_aliases', 'node_index', 'node_validate_prototype', 'node_index'],
-            'node_attrs', ['node_aliases', 'node_attrs', 'node_index', 'node_validate_prototype',
-                'node_index'], 'node_tags', ['node_attrs', 'node_tags', 'node_index',
-                    'node_validate_prototype', 'node_index'], 'node_locks', ['node_tags',
-                        'node_locks', 'node_index', 'node_validate_prototype', 'node_index'],
-                    'node_permissions', ['node_locks', 'node_permissions', 'node_index',
-                        'node_validate_prototype', 'node_index'], 'node_location',
-                    ['node_permissions', 'node_location', 'node_index', 'node_validate_prototype',
-                        'node_index', 'node_index'], 'node_home', ['node_location', 'node_home',
-                            'node_index', 'node_validate_prototype', 'node_index', 'node_index'],
-                        'node_destination', ['node_home', 'node_destination', 'node_index',
-                            'node_validate_prototype', 'node_index', 'node_index'],
-                        'node_prototype_desc', ['node_prototype_key', 'node_prototype_parent',
-                            'node_index', 'node_validate_prototype', 'node_index'],
-                        'node_prototype_tags', ['node_prototype_desc', 'node_prototype_tags',
-                            'node_index', 'node_validate_prototype', 'node_index'],
-                        'node_prototype_locks', ['node_prototype_tags', 'node_prototype_locks',
-                            'node_index', 'node_validate_prototype', 'node_index'],
-                        'node_validate_prototype', 'node_index', 'node_prototype_spawn',
-                        ['node_index', 'node_index', 'node_validate_prototype'], 'node_index',
-                        'node_search_object', ['node_index', 'node_index', 'node_index']]]
+    expected_node_texts = {"node_index": "|c --- Prototype wizard --- |n"}
+
+    expected_tree = [
+        "node_index",
+        [
+            "node_prototype_key",
+            [
+                "node_index",
+                "node_index",
+                "node_index",
+                "node_validate_prototype",
+                ["node_index", "node_index", "node_index"],
+                "node_index",
+            ],
+            "node_prototype_parent",
+            [
+                "node_prototype_parent",
+                "node_prototype_key",
+                "node_prototype_parent",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+            ],
+            "node_typeclass",
+            [
+                "node_typeclass",
+                "node_prototype_parent",
+                "node_typeclass",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+            ],
+            "node_key",
+            ["node_typeclass", "node_key", "node_index", "node_validate_prototype", "node_index"],
+            "node_aliases",
+            ["node_key", "node_aliases", "node_index", "node_validate_prototype", "node_index"],
+            "node_attrs",
+            ["node_aliases", "node_attrs", "node_index", "node_validate_prototype", "node_index"],
+            "node_tags",
+            ["node_attrs", "node_tags", "node_index", "node_validate_prototype", "node_index"],
+            "node_locks",
+            ["node_tags", "node_locks", "node_index", "node_validate_prototype", "node_index"],
+            "node_permissions",
+            [
+                "node_locks",
+                "node_permissions",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+            ],
+            "node_location",
+            [
+                "node_permissions",
+                "node_location",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+                "node_index",
+            ],
+            "node_home",
+            [
+                "node_location",
+                "node_home",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+                "node_index",
+            ],
+            "node_destination",
+            [
+                "node_home",
+                "node_destination",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+                "node_index",
+            ],
+            "node_prototype_desc",
+            [
+                "node_prototype_key",
+                "node_prototype_parent",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+            ],
+            "node_prototype_tags",
+            [
+                "node_prototype_desc",
+                "node_prototype_tags",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+            ],
+            "node_prototype_locks",
+            [
+                "node_prototype_tags",
+                "node_prototype_locks",
+                "node_index",
+                "node_validate_prototype",
+                "node_index",
+            ],
+            "node_validate_prototype",
+            "node_index",
+            "node_prototype_spawn",
+            ["node_index", "node_index", "node_validate_prototype"],
+            "node_index",
+            "node_search_object",
+            ["node_index", "node_index", "node_index"],
+        ],
+    ]
diff --git a/evennia/scripts/admin.py b/evennia/scripts/admin.py
index 230fbf6e310..3991fbc0d5d 100644
--- a/evennia/scripts/admin.py
+++ b/evennia/scripts/admin.py
@@ -15,6 +15,7 @@ class ScriptTagInline(TagInline):
     Inline script tags.
 
     """
+
     model = ScriptDB.db_tags.through
     related_field = "scriptdb"
 
@@ -24,6 +25,7 @@ class ScriptAttributeInline(AttributeInline):
     Inline attribute tags.
 
     """
+
     model = ScriptDB.db_attributes.through
     related_field = "scriptdb"
 
@@ -34,21 +36,37 @@ class ScriptDBAdmin(admin.ModelAdmin):
 
     """
 
-    list_display = ('id', 'db_key', 'db_typeclass_path',
-                    'db_obj', 'db_interval', 'db_repeats', 'db_persistent')
-    list_display_links = ('id', 'db_key')
-    ordering = ['db_obj', 'db_typeclass_path']
-    search_fields = ['^db_key', 'db_typeclass_path']
+    list_display = (
+        "id",
+        "db_key",
+        "db_typeclass_path",
+        "db_obj",
+        "db_interval",
+        "db_repeats",
+        "db_persistent",
+    )
+    list_display_links = ("id", "db_key")
+    ordering = ["db_obj", "db_typeclass_path"]
+    search_fields = ["^db_key", "db_typeclass_path"]
     save_as = True
     save_on_top = True
     list_select_related = True
-    raw_id_fields = ('db_obj',)
+    raw_id_fields = ("db_obj",)
 
     fieldsets = (
-        (None, {
-            'fields': (('db_key', 'db_typeclass_path'), 'db_interval',
-                       'db_repeats', 'db_start_delay', 'db_persistent',
-                       'db_obj')}),
+        (
+            None,
+            {
+                "fields": (
+                    ("db_key", "db_typeclass_path"),
+                    "db_interval",
+                    "db_repeats",
+                    "db_start_delay",
+                    "db_persistent",
+                    "db_obj",
+                )
+            },
+        ),
     )
     inlines = [ScriptTagInline, ScriptAttributeInline]
 
diff --git a/evennia/scripts/manager.py b/evennia/scripts/manager.py
index 8d67b6f966c..3080c561627 100644
--- a/evennia/scripts/manager.py
+++ b/evennia/scripts/manager.py
@@ -5,6 +5,7 @@
 from django.db.models import Q
 from evennia.typeclasses.managers import TypedObjectManager, TypeclassManager
 from evennia.utils.utils import make_iter
+
 __all__ = ("ScriptManager",)
 _GA = object.__getattribute__
 
@@ -130,8 +131,7 @@ def remove_non_persistent(self, obj=None):
             script.delete()
         return nr_deleted
 
-    def validate(self, scripts=None, obj=None, key=None, dbref=None,
-                 init_mode=None):
+    def validate(self, scripts=None, obj=None, key=None, dbref=None, init_mode=None):
         """
         This will step through the script database and make sure
         all objects run scripts that are still valid in the context
@@ -182,7 +182,7 @@ def validate(self, scripts=None, obj=None, key=None, dbref=None,
         nr_stopped = 0
 
         if init_mode:
-            if init_mode == 'reset':
+            if init_mode == "reset":
                 # special mode when server starts or object logs in.
                 # This deletes all non-persistent scripts from database
                 nr_stopped += self.remove_non_persistent(obj=obj)
@@ -234,8 +234,9 @@ def search_script(self, ostring, obj=None, only_timed=False, typeclass=None):
         if dbref or dbref == 0:
             # this is a dbref, try to find the script directly
             dbref_match = self.dbref_search(dbref)
-            if dbref_match and not ((obj and obj != dbref_match.obj) or
-                                    (only_timed and dbref_match.interval)):
+            if dbref_match and not (
+                (obj and obj != dbref_match.obj) or (only_timed and dbref_match.interval)
+            ):
                 return [dbref_match]
 
         if typeclass:
@@ -248,8 +249,11 @@ def search_script(self, ostring, obj=None, only_timed=False, typeclass=None):
         obj_restriction = obj and Q(db_obj=obj) or Q()
         timed_restriction = only_timed and Q(db_interval__gt=0) or Q()
         typeclass_restriction = typeclass and Q(db_typeclass_path=typeclass) or Q()
-        scripts = self.filter(timed_restriction & obj_restriction & typeclass_restriction & Q(db_key__iexact=ostring))
+        scripts = self.filter(
+            timed_restriction & obj_restriction & typeclass_restriction & Q(db_key__iexact=ostring)
+        )
         return scripts
+
     # back-compatibility alias
     script_search = search_script
 
@@ -274,8 +278,10 @@ def copy_script(self, original_script, new_key=None, new_obj=None, new_locks=Non
         new_locks = new_locks if new_locks is not None else original_script.db_lock_storage
 
         from evennia.utils import create
-        new_script = create.create_script(typeclass, key=new_key, obj=new_obj,
-                                          locks=new_locks, autostart=True)
+
+        new_script = create.create_script(
+            typeclass, key=new_key, obj=new_obj, locks=new_locks, autostart=True
+        )
         return new_script
 
 
diff --git a/evennia/scripts/migrations/0001_initial.py b/evennia/scripts/migrations/0001_initial.py
index 3986e79813c..fd07a931713 100644
--- a/evennia/scripts/migrations/0001_initial.py
+++ b/evennia/scripts/migrations/0001_initial.py
@@ -8,34 +8,111 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('objects', '0001_initial'),
+        ("objects", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('typeclasses', '0001_initial'),
+        ("typeclasses", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='ScriptDB',
+            name="ScriptDB",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(max_length=255, verbose_name='key', db_index=True)),
-                ('db_typeclass_path', models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass')),
-                ('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name='creation date')),
-                ('db_lock_storage', models.TextField(help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks', blank=True)),
-                ('db_desc', models.CharField(max_length=255, verbose_name='desc', blank=True)),
-                ('db_interval', models.IntegerField(default=-1, help_text='how often to repeat script, in seconds. -1 means off.', verbose_name='interval')),
-                ('db_start_delay', models.BooleanField(default=False, help_text='pause interval seconds before starting.', verbose_name='start delay')),
-                ('db_repeats', models.IntegerField(default=0, help_text='0 means off.', verbose_name='number of repeats')),
-                ('db_persistent', models.BooleanField(default=False, verbose_name='survive server reboot')),
-                ('db_is_active', models.BooleanField(default=False, verbose_name='script active')),
-                ('db_attributes', models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute', null=True)),
-                ('db_obj', models.ForeignKey(blank=True, to='objects.ObjectDB', on_delete=models.CASCADE, help_text='the object to store this script on, if not a global script.', null=True, verbose_name='scripted object')),
-                ('db_account', models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE, help_text='the account to store this script on (should not be set if obj is set)', null=True, verbose_name='scripted account')),
-                ('db_tags', models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag', null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                ("db_key", models.CharField(max_length=255, verbose_name="key", db_index=True)),
+                (
+                    "db_typeclass_path",
+                    models.CharField(
+                        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                        max_length=255,
+                        null=True,
+                        verbose_name="typeclass",
+                    ),
+                ),
+                (
+                    "db_date_created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                        verbose_name="locks",
+                        blank=True,
+                    ),
+                ),
+                ("db_desc", models.CharField(max_length=255, verbose_name="desc", blank=True)),
+                (
+                    "db_interval",
+                    models.IntegerField(
+                        default=-1,
+                        help_text="how often to repeat script, in seconds. -1 means off.",
+                        verbose_name="interval",
+                    ),
+                ),
+                (
+                    "db_start_delay",
+                    models.BooleanField(
+                        default=False,
+                        help_text="pause interval seconds before starting.",
+                        verbose_name="start delay",
+                    ),
+                ),
+                (
+                    "db_repeats",
+                    models.IntegerField(
+                        default=0, help_text="0 means off.", verbose_name="number of repeats"
+                    ),
+                ),
+                (
+                    "db_persistent",
+                    models.BooleanField(default=False, verbose_name="survive server reboot"),
+                ),
+                ("db_is_active", models.BooleanField(default=False, verbose_name="script active")),
+                (
+                    "db_attributes",
+                    models.ManyToManyField(
+                        help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                        to="typeclasses.Attribute",
+                        null=True,
+                    ),
+                ),
+                (
+                    "db_obj",
+                    models.ForeignKey(
+                        blank=True,
+                        to="objects.ObjectDB",
+                        on_delete=models.CASCADE,
+                        help_text="the object to store this script on, if not a global script.",
+                        null=True,
+                        verbose_name="scripted object",
+                    ),
+                ),
+                (
+                    "db_account",
+                    models.ForeignKey(
+                        blank=True,
+                        to=settings.AUTH_USER_MODEL,
+                        on_delete=models.CASCADE,
+                        help_text="the account to store this script on (should not be set if obj is set)",
+                        null=True,
+                        verbose_name="scripted account",
+                    ),
+                ),
+                (
+                    "db_tags",
+                    models.ManyToManyField(
+                        help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                        to="typeclasses.Tag",
+                        null=True,
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Script',
-            },
+            options={"verbose_name": "Script"},
             bases=(models.Model,),
-        ),
+        )
     ]
diff --git a/evennia/scripts/migrations/0002_auto_20150118_1625.py b/evennia/scripts/migrations/0002_auto_20150118_1625.py
index 0022111e2be..0c9889148e2 100644
--- a/evennia/scripts/migrations/0002_auto_20150118_1625.py
+++ b/evennia/scripts/migrations/0002_auto_20150118_1625.py
@@ -16,10 +16,6 @@ def convert_defaults(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0001_initial'),
-    ]
+    dependencies = [("scripts", "0001_initial")]
 
-    operations = [
-        migrations.RunPython(convert_defaults),
-    ]
+    operations = [migrations.RunPython(convert_defaults)]
diff --git a/evennia/scripts/migrations/0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_.py b/evennia/scripts/migrations/0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_.py
index 3d80e569854..49c791ad4ab 100644
--- a/evennia/scripts/migrations/0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_.py
+++ b/evennia/scripts/migrations/0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_.py
@@ -6,81 +6,43 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0002_auto_20150118_1625'),
-    ]
+    dependencies = [("scripts", "0002_auto_20150118_1625")]
 
     operations = [
         migrations.CreateModel(
-            name='ScriptBase',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.scriptdb',),
+            name="ScriptBase", fields=[], options={"proxy": True}, bases=("scripts.scriptdb",)
         ),
         migrations.CreateModel(
-            name='DefaultScript',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.scriptbase',),
+            name="DefaultScript", fields=[], options={"proxy": True}, bases=("scripts.scriptbase",)
         ),
         migrations.CreateModel(
-            name='DoNothing',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.defaultscript',),
+            name="DoNothing", fields=[], options={"proxy": True}, bases=("scripts.defaultscript",)
         ),
         migrations.CreateModel(
-            name='CheckSessions',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.defaultscript',),
+            name="CheckSessions",
+            fields=[],
+            options={"proxy": True},
+            bases=("scripts.defaultscript",),
         ),
         migrations.CreateModel(
-            name='Store',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.defaultscript',),
+            name="Store", fields=[], options={"proxy": True}, bases=("scripts.defaultscript",)
         ),
         migrations.CreateModel(
-            name='ValidateChannelHandler',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.defaultscript',),
+            name="ValidateChannelHandler",
+            fields=[],
+            options={"proxy": True},
+            bases=("scripts.defaultscript",),
         ),
         migrations.CreateModel(
-            name='ValidateIdmapperCache',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.defaultscript',),
+            name="ValidateIdmapperCache",
+            fields=[],
+            options={"proxy": True},
+            bases=("scripts.defaultscript",),
         ),
         migrations.CreateModel(
-            name='ValidateScripts',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.defaultscript',),
+            name="ValidateScripts",
+            fields=[],
+            options={"proxy": True},
+            bases=("scripts.defaultscript",),
         ),
     ]
diff --git a/evennia/scripts/migrations/0004_auto_20150306_1354.py b/evennia/scripts/migrations/0004_auto_20150306_1354.py
index 0c4310ee3d5..fad0ad151f4 100644
--- a/evennia/scripts/migrations/0004_auto_20150306_1354.py
+++ b/evennia/scripts/migrations/0004_auto_20150306_1354.py
@@ -6,20 +6,25 @@
 
 def remove_manage_scripts(apps, schema_editor):
     ScriptDB = apps.get_model("scripts", "ScriptDB")
-    for script in ScriptDB.objects.filter(db_typeclass_path__in=('evennia.scripts.scripts.CheckSessions',
-                                                                 'evennia.scripts.scripts.ValidateScripts',
-                                                                 'evennia.scripts.scripts.ValidateChannelHandler',
-                                                                 'evennia.scripts.scripts.ValidateIdmapperCache',
-                                                                 'evennia.utils.gametime.GameTime')):
+    for script in ScriptDB.objects.filter(
+        db_typeclass_path__in=(
+            "evennia.scripts.scripts.CheckSessions",
+            "evennia.scripts.scripts.ValidateScripts",
+            "evennia.scripts.scripts.ValidateChannelHandler",
+            "evennia.scripts.scripts.ValidateIdmapperCache",
+            "evennia.utils.gametime.GameTime",
+        )
+    ):
         script.delete()
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('scripts', '0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_'),
+        (
+            "scripts",
+            "0003_checksessions_defaultscript_donothing_scriptbase_store_validatechannelhandler_validateidmappercache_",
+        )
     ]
 
-    operations = [
-        migrations.RunPython(remove_manage_scripts),
-    ]
+    operations = [migrations.RunPython(remove_manage_scripts)]
diff --git a/evennia/scripts/migrations/0005_auto_20150306_1441.py b/evennia/scripts/migrations/0005_auto_20150306_1441.py
index b800c805534..243ba29d3e6 100644
--- a/evennia/scripts/migrations/0005_auto_20150306_1441.py
+++ b/evennia/scripts/migrations/0005_auto_20150306_1441.py
@@ -6,21 +6,11 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0004_auto_20150306_1354'),
-    ]
+    dependencies = [("scripts", "0004_auto_20150306_1354")]
 
     operations = [
-        migrations.DeleteModel(
-            name='CheckSessions',
-        ),
-        migrations.DeleteModel(
-            name='ValidateChannelHandler',
-        ),
-        migrations.DeleteModel(
-            name='ValidateIdmapperCache',
-        ),
-        migrations.DeleteModel(
-            name='ValidateScripts',
-        ),
+        migrations.DeleteModel(name="CheckSessions"),
+        migrations.DeleteModel(name="ValidateChannelHandler"),
+        migrations.DeleteModel(name="ValidateIdmapperCache"),
+        migrations.DeleteModel(name="ValidateScripts"),
     ]
diff --git a/evennia/scripts/migrations/0006_auto_20150310_2249.py b/evennia/scripts/migrations/0006_auto_20150310_2249.py
index 80cc25bee01..9295741a4ea 100644
--- a/evennia/scripts/migrations/0006_auto_20150310_2249.py
+++ b/evennia/scripts/migrations/0006_auto_20150310_2249.py
@@ -6,20 +6,20 @@
 
 def remove_manage_scripts(apps, schema_editor):
     ScriptDB = apps.get_model("scripts", "ScriptDB")
-    for script in ScriptDB.objects.filter(db_typeclass_path__in=('src.scripts.scripts.CheckSessions',
-                                                                 'src.scripts.scripts.ValidateScripts',
-                                                                 'src.scripts.scripts.ValidateChannelHandler',
-                                                                 'src.scripts.scripts.ValidateIdmapperCache',
-                                                                 'src.utils.gametime.GameTime')):
+    for script in ScriptDB.objects.filter(
+        db_typeclass_path__in=(
+            "src.scripts.scripts.CheckSessions",
+            "src.scripts.scripts.ValidateScripts",
+            "src.scripts.scripts.ValidateChannelHandler",
+            "src.scripts.scripts.ValidateIdmapperCache",
+            "src.utils.gametime.GameTime",
+        )
+    ):
         script.delete()
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0005_auto_20150306_1441'),
-    ]
+    dependencies = [("scripts", "0005_auto_20150306_1441")]
 
-    operations = [
-        migrations.RunPython(remove_manage_scripts),
-    ]
+    operations = [migrations.RunPython(remove_manage_scripts)]
diff --git a/evennia/scripts/migrations/0007_auto_20150403_2339.py b/evennia/scripts/migrations/0007_auto_20150403_2339.py
index 530a93ebb95..9c4318280ae 100644
--- a/evennia/scripts/migrations/0007_auto_20150403_2339.py
+++ b/evennia/scripts/migrations/0007_auto_20150403_2339.py
@@ -6,21 +6,11 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0006_auto_20150310_2249'),
-    ]
+    dependencies = [("scripts", "0006_auto_20150310_2249")]
 
     operations = [
-        migrations.DeleteModel(
-            name='DefaultScript',
-        ),
-        migrations.DeleteModel(
-            name='DoNothing',
-        ),
-        migrations.DeleteModel(
-            name='ScriptBase',
-        ),
-        migrations.DeleteModel(
-            name='Store',
-        ),
+        migrations.DeleteModel(name="DefaultScript"),
+        migrations.DeleteModel(name="DoNothing"),
+        migrations.DeleteModel(name="ScriptBase"),
+        migrations.DeleteModel(name="Store"),
     ]
diff --git a/evennia/scripts/migrations/0008_auto_20170606_1731.py b/evennia/scripts/migrations/0008_auto_20170606_1731.py
index c8b4a84e5f0..90d1efa159f 100644
--- a/evennia/scripts/migrations/0008_auto_20170606_1731.py
+++ b/evennia/scripts/migrations/0008_auto_20170606_1731.py
@@ -7,19 +7,23 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0007_auto_20150403_2339'),
-    ]
+    dependencies = [("scripts", "0007_auto_20150403_2339")]
 
     operations = [
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="scriptdb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="scriptdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
     ]
diff --git a/evennia/scripts/migrations/0009_scriptdb_db_account.py b/evennia/scripts/migrations/0009_scriptdb_db_account.py
index 1d15b69fc02..c4b8aeb3d4c 100644
--- a/evennia/scripts/migrations/0009_scriptdb_db_account.py
+++ b/evennia/scripts/migrations/0009_scriptdb_db_account.py
@@ -14,8 +14,8 @@ def _table_exists(db_cursor, tablename):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('accounts', '0007_copy_player_to_account'),
-        ('scripts', '0008_auto_20170606_1731'),
+        ("accounts", "0007_copy_player_to_account"),
+        ("scripts", "0008_auto_20170606_1731"),
     ]
 
     db_cursor = connection.cursor()
@@ -25,8 +25,15 @@ class Migration(migrations.Migration):
         # here we are not starting from scratch.
         operations = [
             migrations.AddField(
-                model_name='scriptdb',
-                name='db_account',
-                field=models.ForeignKey(blank=True, help_text='the account to store this script on (should not be set if db_obj is set)', null=True, on_delete=django.db.models.deletion.CASCADE, to='accounts.AccountDB', verbose_name='scripted account'),
-            ),
+                model_name="scriptdb",
+                name="db_account",
+                field=models.ForeignKey(
+                    blank=True,
+                    help_text="the account to store this script on (should not be set if db_obj is set)",
+                    null=True,
+                    on_delete=django.db.models.deletion.CASCADE,
+                    to="accounts.AccountDB",
+                    verbose_name="scripted account",
+                ),
+            )
         ]
diff --git a/evennia/scripts/migrations/0010_auto_20170705_1736.py b/evennia/scripts/migrations/0010_auto_20170705_1736.py
index c3fbddcafb5..8cc7fc5b94d 100644
--- a/evennia/scripts/migrations/0010_auto_20170705_1736.py
+++ b/evennia/scripts/migrations/0010_auto_20170705_1736.py
@@ -8,26 +8,22 @@
 def forwards(apps, schema_editor):
 
     try:
-        apps.get_model('accounts', 'AccountDB')
+        apps.get_model("accounts", "AccountDB")
     except LookupError:
         return
-    AccountDB = apps.get_model('accounts', 'AccountDB')
-    ScriptDB = apps.get_model('scripts', 'ScriptDB')
+    AccountDB = apps.get_model("accounts", "AccountDB")
+    ScriptDB = apps.get_model("scripts", "ScriptDB")
 
     for script in ScriptDB.objects.all():
         account = script.db_account
         if account:
             account = AccountDB.objects.get(id=account.id)
             script.db_account = account
-            script.save(update_fields=['db_account'])
+            script.save(update_fields=["db_account"])
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0009_scriptdb_db_account'),
-    ]
+    dependencies = [("scripts", "0009_scriptdb_db_account")]
 
-    operations = [
-        migrations.RunPython(forwards)
-    ]
+    operations = [migrations.RunPython(forwards)]
diff --git a/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py b/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py
index e5ed4bc9152..84980fa2563 100644
--- a/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py
+++ b/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py
@@ -12,18 +12,11 @@ def _table_exists(db_cursor, tablename):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0010_auto_20170705_1736'),
-    ]
+    dependencies = [("scripts", "0010_auto_20170705_1736")]
 
     db_cursor = connection.cursor()
 
-    if not _table_exists(db_cursor, 'scripts_scriptdb_db_player'):
+    if not _table_exists(db_cursor, "scripts_scriptdb_db_player"):
         operations = []
     else:
-        operations = [
-            migrations.RemoveField(
-                model_name='scriptdb',
-                name='db_player',
-            ),
-        ]
+        operations = [migrations.RemoveField(model_name="scriptdb", name="db_player")]
diff --git a/evennia/scripts/migrations/0012_auto_20190128_1820.py b/evennia/scripts/migrations/0012_auto_20190128_1820.py
index 6b1f71b159e..2918131e656 100644
--- a/evennia/scripts/migrations/0012_auto_20190128_1820.py
+++ b/evennia/scripts/migrations/0012_auto_20190128_1820.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 18:20
-from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models
@@ -9,79 +8,116 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('scripts', '0011_remove_scriptdb_db_player'),
-    ]
+    dependencies = [("scripts", "0011_remove_scriptdb_db_player")]
 
     operations = [
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_account',
-            field=models.ForeignKey(blank=True, help_text='the account to store this script on (should not be set if db_obj is set)', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='scripted account'),
+            model_name="scriptdb",
+            name="db_account",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="the account to store this script on (should not be set if db_obj is set)",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="scripted account",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_attributes',
-            field=models.ManyToManyField(help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).', to='typeclasses.Attribute'),
+            model_name="scriptdb",
+            name="db_attributes",
+            field=models.ManyToManyField(
+                help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+                to="typeclasses.Attribute",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='creation date'),
+            model_name="scriptdb",
+            name="db_date_created",
+            field=models.DateTimeField(auto_now_add=True, verbose_name="creation date"),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_desc',
-            field=models.CharField(blank=True, max_length=255, verbose_name='desc'),
+            model_name="scriptdb",
+            name="db_desc",
+            field=models.CharField(blank=True, max_length=255, verbose_name="desc"),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_interval',
-            field=models.IntegerField(default=-1, help_text='how often to repeat script, in seconds. -1 means off.', verbose_name='interval'),
+            model_name="scriptdb",
+            name="db_interval",
+            field=models.IntegerField(
+                default=-1,
+                help_text="how often to repeat script, in seconds. -1 means off.",
+                verbose_name="interval",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_is_active',
-            field=models.BooleanField(default=False, verbose_name='script active'),
+            model_name="scriptdb",
+            name="db_is_active",
+            field=models.BooleanField(default=False, verbose_name="script active"),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_key',
-            field=models.CharField(db_index=True, max_length=255, verbose_name='key'),
+            model_name="scriptdb",
+            name="db_key",
+            field=models.CharField(db_index=True, max_length=255, verbose_name="key"),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.", verbose_name='locks'),
+            model_name="scriptdb",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True,
+                help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+                verbose_name="locks",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_obj',
-            field=models.ForeignKey(blank=True, help_text='the object to store this script on, if not a global script.', null=True, on_delete=django.db.models.deletion.CASCADE, to='objects.ObjectDB', verbose_name='scripted object'),
+            model_name="scriptdb",
+            name="db_obj",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="the object to store this script on, if not a global script.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="objects.ObjectDB",
+                verbose_name="scripted object",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_persistent',
-            field=models.BooleanField(default=False, verbose_name='survive server reboot'),
+            model_name="scriptdb",
+            name="db_persistent",
+            field=models.BooleanField(default=False, verbose_name="survive server reboot"),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_repeats',
-            field=models.IntegerField(default=0, help_text='0 means off.', verbose_name='number of repeats'),
+            model_name="scriptdb",
+            name="db_repeats",
+            field=models.IntegerField(
+                default=0, help_text="0 means off.", verbose_name="number of repeats"
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_start_delay',
-            field=models.BooleanField(default=False, help_text='pause interval seconds before starting.', verbose_name='start delay'),
+            model_name="scriptdb",
+            name="db_start_delay",
+            field=models.BooleanField(
+                default=False,
+                help_text="pause interval seconds before starting.",
+                verbose_name="start delay",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_tags',
-            field=models.ManyToManyField(help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.', to='typeclasses.Tag'),
+            model_name="scriptdb",
+            name="db_tags",
+            field=models.ManyToManyField(
+                help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+                to="typeclasses.Tag",
+            ),
         ),
         migrations.AlterField(
-            model_name='scriptdb',
-            name='db_typeclass_path',
-            field=models.CharField(help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.", max_length=255, null=True, verbose_name='typeclass'),
+            model_name="scriptdb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
         ),
     ]
diff --git a/evennia/scripts/migrations/0013_auto_20191025_0831.py b/evennia/scripts/migrations/0013_auto_20191025_0831.py
new file mode 100644
index 00000000000..be687c8fd20
--- /dev/null
+++ b/evennia/scripts/migrations/0013_auto_20191025_0831.py
@@ -0,0 +1,22 @@
+# Generated by Django 2.2.6 on 2019-10-25 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("scripts", "0012_auto_20190128_1820")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="scriptdb",
+            name="db_typeclass_path",
+            field=models.CharField(
+                db_index=True,
+                help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+                max_length=255,
+                null=True,
+                verbose_name="typeclass",
+            ),
+        )
+    ]
diff --git a/evennia/scripts/models.py b/evennia/scripts/models.py
index bc892110af0..6c8dfc593e1 100644
--- a/evennia/scripts/models.py
+++ b/evennia/scripts/models.py
@@ -24,8 +24,6 @@
 - Give the account/object a time-limited bonus/effect
 
 """
-from builtins import object
-
 from django.conf import settings
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
@@ -38,11 +36,12 @@
 _SA = object.__setattr__
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # ScriptDB
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class ScriptDB(TypedObject):
     """
@@ -81,25 +80,39 @@ class ScriptDB(TypedObject):
     # db_key, db_typeclass_path, db_date_created, db_permissions
 
     # optional description.
-    db_desc = models.CharField('desc', max_length=255, blank=True)
+    db_desc = models.CharField("desc", max_length=255, blank=True)
     # A reference to the database object affected by this Script, if any.
-    db_obj = models.ForeignKey("objects.ObjectDB", null=True, blank=True, on_delete=models.CASCADE,
-                               verbose_name='scripted object',
-                               help_text='the object to store this script on, if not a global script.')
-    db_account = models.ForeignKey("accounts.AccountDB", null=True, blank=True,
-                                   on_delete=models.CASCADE, verbose_name="scripted account",
-                                   help_text='the account to store this script on (should not be set if db_obj is set)')
+    db_obj = models.ForeignKey(
+        "objects.ObjectDB",
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
+        verbose_name="scripted object",
+        help_text="the object to store this script on, if not a global script.",
+    )
+    db_account = models.ForeignKey(
+        "accounts.AccountDB",
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE,
+        verbose_name="scripted account",
+        help_text="the account to store this script on (should not be set if db_obj is set)",
+    )
 
     # how often to run Script (secs). -1 means there is no timer
-    db_interval = models.IntegerField('interval', default=-1, help_text='how often to repeat script, in seconds. -1 means off.')
+    db_interval = models.IntegerField(
+        "interval", default=-1, help_text="how often to repeat script, in seconds. -1 means off."
+    )
     # start script right away or wait interval seconds first
-    db_start_delay = models.BooleanField('start delay', default=False, help_text='pause interval seconds before starting.')
+    db_start_delay = models.BooleanField(
+        "start delay", default=False, help_text="pause interval seconds before starting."
+    )
     # how many times this script is to be repeated, if interval!=0.
-    db_repeats = models.IntegerField('number of repeats', default=0, help_text='0 means off.')
+    db_repeats = models.IntegerField("number of repeats", default=0, help_text="0 means off.")
     # defines if this script should survive a reboot or not
-    db_persistent = models.BooleanField('survive server reboot', default=False)
+    db_persistent = models.BooleanField("survive server reboot", default=False)
     # defines if this script has already been started in this session
-    db_is_active = models.BooleanField('script active', default=False)
+    db_is_active = models.BooleanField("script active", default=False)
 
     # Database manager
     objects = ScriptDBManager()
@@ -145,8 +158,9 @@ def __set_obj(self, value):
             pass
         if isinstance(value, (str, int)):
             from evennia.objects.models import ObjectDB
+
             value = to_str(value)
-            if (value.isdigit() or value.startswith("#")):
+            if value.isdigit() or value.startswith("#"):
                 dbid = dbref(value, reqhash=False)
                 if dbid:
                     try:
@@ -162,5 +176,6 @@ def __set_obj(self, value):
             _SA(self, fname, value)
         # saving the field
         _GA(self, "save")(update_fields=[fname])
+
     obj = property(__get_obj, __set_obj)
     object = property(__get_obj, __set_obj)
diff --git a/evennia/scripts/monitorhandler.py b/evennia/scripts/monitorhandler.py
index 64af43a1aed..e47e9d1546d 100644
--- a/evennia/scripts/monitorhandler.py
+++ b/evennia/scripts/monitorhandler.py
@@ -11,7 +11,6 @@
 
 """
 import inspect
-from builtins import object
 
 from collections import defaultdict
 from evennia.server.models import ServerConfig
@@ -50,7 +49,9 @@ def save(self):
         if self.monitors:
             for obj in self.monitors:
                 for fieldname in self.monitors[obj]:
-                    for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].items():
+                    for idstring, (callback, persistent, kwargs) in self.monitors[obj][
+                        fieldname
+                    ].items():
                         path = "%s.%s" % (callback.__module__, callback.__name__)
                         savedata.append((obj, fieldname, idstring, path, persistent, kwargs))
             savedata = dbserialize(savedata)
@@ -145,9 +146,14 @@ def add(self, obj, fieldname, callback, idstring="", persistent=False, **kwargs)
                 raise TypeError("callback is not a function.")
             dbserialize((obj, fieldname, callback, idstring, persistent, kwargs))
         except Exception:
-            err = "Invalid monitor definition: \n" \
-                  " (%s, %s, %s, %s, %s, %s)" % (obj, fieldname, callback, idstring,
-                                                 persistent, kwargs)
+            err = "Invalid monitor definition: \n" " (%s, %s, %s, %s, %s, %s)" % (
+                obj,
+                fieldname,
+                callback,
+                idstring,
+                persistent,
+                kwargs,
+            )
             logger.log_trace(err)
         else:
             self.monitors[obj][fieldname][idstring] = (callback, persistent, kwargs)
@@ -188,7 +194,9 @@ def all(self, obj=None):
 
         for obj in objs:
             for fieldname in self.monitors[obj]:
-                for idstring, (callback, persistent, kwargs) in self.monitors[obj][fieldname].items():
+                for idstring, (callback, persistent, kwargs) in self.monitors[obj][
+                    fieldname
+                ].items():
                     output.append((obj, fieldname, idstring, persistent, kwargs))
         return output
 
diff --git a/evennia/scripts/scripthandler.py b/evennia/scripts/scripthandler.py
index 375f602d2b3..d2298a7ce2a 100644
--- a/evennia/scripts/scripthandler.py
+++ b/evennia/scripts/scripthandler.py
@@ -5,8 +5,6 @@
 `scripts` on the game object.
 
 """
-from builtins import object
-
 from evennia.scripts.models import ScriptDB
 from evennia.utils import create
 from evennia.utils import logger
@@ -50,9 +48,15 @@ def __str__(self):
                     next_repeat = script.time_until_next_repeat()
                 except Exception:
                     next_repeat = "?"
-            string += _("\n '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repeats): %(desc)s") % \
-                {"key": script.key, "next_repeat": next_repeat,
-                 "interval": interval, "repeats": repeats, "desc": script.desc}
+            string += _(
+                "\n '%(key)s' (%(next_repeat)s/%(interval)s, %(repeats)s repeats): %(desc)s"
+            ) % {
+                "key": script.key,
+                "next_repeat": next_repeat,
+                "interval": interval,
+                "repeats": repeats,
+                "desc": script.desc,
+            }
         return string.strip()
 
     def add(self, scriptclass, key=None, autostart=True):
@@ -70,12 +74,12 @@ def add(self, scriptclass, key=None, autostart=True):
         """
         if self.obj.__dbclass__.__name__ == "AccountDB":
             # we add to an Account, not an Object
-            script = create.create_script(scriptclass, key=key, account=self.obj,
-                                          autostart=autostart)
+            script = create.create_script(
+                scriptclass, key=key, account=self.obj, autostart=autostart
+            )
         else:
             # the normal - adding to an Object
-            script = create.create_script(scriptclass, key=key, obj=self.obj,
-                                          autostart=autostart)
+            script = create.create_script(scriptclass, key=key, obj=self.obj, autostart=autostart)
         if not script:
             logger.log_err("Script %s could not be created and/or started." % scriptclass)
             return False
@@ -123,11 +127,16 @@ def delete(self, key=None):
         """
         delscripts = ScriptDB.objects.get_all_scripts_on_obj(self.obj, key=key)
         if not delscripts:
-            delscripts = [script for script in ScriptDB.objects.get_all_scripts_on_obj(self.obj) if script.path == key]
+            delscripts = [
+                script
+                for script in ScriptDB.objects.get_all_scripts_on_obj(self.obj)
+                if script.path == key
+            ]
         num = 0
         for script in delscripts:
             num += script.stop()
         return num
+
     # alias to delete
     stop = delete
 
diff --git a/evennia/scripts/scripts.py b/evennia/scripts/scripts.py
index 0e1573c4126..75c9074ad48 100644
--- a/evennia/scripts/scripts.py
+++ b/evennia/scripts/scripts.py
@@ -13,7 +13,6 @@
 from evennia.scripts.models import ScriptDB
 from evennia.scripts.manager import ScriptManager
 from evennia.utils import create, logger
-from future.utils import with_metaclass
 
 __all__ = ["DefaultScript", "DoNothing", "Store"]
 
@@ -35,6 +34,7 @@ class ExtendedLoopingCall(LoopingCall):
     than `self.interval`.
 
     """
+
     start_delay = None
     callcount = 0
 
@@ -69,8 +69,7 @@ def start(self, interval, now=True, start_delay=None, count_start=0):
             steps if we want.
 
         """
-        assert not self.running, ("Tried to start an already running "
-                                  "ExtendedLoopingCall.")
+        assert not self.running, "Tried to start an already running " "ExtendedLoopingCall."
         if interval < 0:
             raise ValueError("interval must be >= 0")
         self.running = True
@@ -119,8 +118,7 @@ def force_repeat(self):
                 running.
 
         """
-        assert self.running, ("Tried to fire an ExtendedLoopingCall "
-                              "that was not running.")
+        assert self.running, "Tried to fire an ExtendedLoopingCall " "that was not running."
         self.call.cancel()
         self.call = None
         self.starttime = self.clock.seconds()
@@ -144,12 +142,13 @@ def next_call_time(self):
         return None
 
 
-class ScriptBase(with_metaclass(TypeclassBase, ScriptDB)):
+class ScriptBase(ScriptDB, metaclass=TypeclassBase):
     """
     Base class for scripts. Don't inherit from this, inherit from the
     class `DefaultScript` below instead.
 
     """
+
     objects = ScriptManager()
 
     def __str__(self):
@@ -163,22 +162,21 @@ def _start_task(self):
         Start task runner.
 
         """
-
+        if self.ndb._task:
+            return
         self.ndb._task = ExtendedLoopingCall(self._step_task)
 
         if self.db._paused_time:
             # the script was paused; restarting
             callcount = self.db._paused_callcount or 0
-            self.ndb._task.start(self.db_interval,
-                                 now=False,
-                                 start_delay=self.db._paused_time,
-                                 count_start=callcount)
+            self.ndb._task.start(
+                self.db_interval, now=False, start_delay=self.db._paused_time, count_start=callcount
+            )
             del self.db._paused_time
             del self.db._paused_repeats
         else:
             # starting script anew
-            self.ndb._task.start(self.db_interval,
-                                 now=not self.db_start_delay)
+            self.ndb._task.start(self.db_interval, now=not self.db_start_delay)
 
     def _stop_task(self):
         """
@@ -195,9 +193,9 @@ def _step_errback(self, e):
 
         """
         cname = self.__class__.__name__
-        estring = _("Script %(key)s(#%(dbid)s) of type '%(cname)s': at_repeat() error '%(err)s'.") % \
-            {"key": self.key, "dbid": self.dbid, "cname": cname,
-             "err": e.getErrorMessage()}
+        estring = _(
+            "Script %(key)s(#%(dbid)s) of type '%(cname)s': at_repeat() error '%(err)s'."
+        ) % {"key": self.key, "dbid": self.dbid, "cname": cname, "err": e.getErrorMessage()}
         try:
             self.db_obj.msg(estring)
         except Exception:
@@ -333,10 +331,10 @@ def create(cls, key, **kwargs):
         errors = []
         obj = None
 
-        kwargs['key'] = key
+        kwargs["key"] = key
 
         # If no typeclass supplied, use this class
-        kwargs['typeclass'] = kwargs.pop('typeclass', cls)
+        kwargs["typeclass"] = kwargs.pop("typeclass", cls)
 
         try:
             obj = create.create_script(**kwargs)
@@ -353,7 +351,6 @@ def at_script_creation(self):
         """
         pass
 
-
     def time_until_next_repeat(self):
         """
         Get time until the script fires it `at_repeat` hook again.
@@ -397,6 +394,7 @@ def at_idmapper_flush(self):
         if ret and self.ndb._task:
             try:
                 from twisted.internet import reactor
+
                 global FLUSHING_INSTANCES
                 # store the current timers for the _task and stop it to avoid duplicates after cache flush
                 paused_time = self.ndb._task.next_call_time()
@@ -409,6 +407,7 @@ def at_idmapper_flush(self):
                     reactor.callLater(2, restart_scripts_after_flush)
             except Exception:
                 import traceback
+
                 traceback.print_exc()
         return ret
 
@@ -429,7 +428,8 @@ def start(self, force_restart=False):
 
         """
         if self.is_active and not force_restart:
-            # The script is already running, but make sure we have a _task if this is after a cache flush
+            # The script is already running, but make sure we have a _task if
+            # this is after a cache flush
             if not self.ndb._task and self.db_interval >= 0:
                 self.ndb._task = ExtendedLoopingCall(self._step_task)
                 try:
@@ -440,7 +440,9 @@ def start(self, force_restart=False):
                     now = not self.db_start_delay
                     start_delay = None
                     callcount = 0
-                self.ndb._task.start(self.db_interval, now=now, start_delay=start_delay, count_start=callcount)
+                self.ndb._task.start(
+                    self.db_interval, now=now, start_delay=start_delay, count_start=callcount
+                )
             return 0
 
         obj = self.obj
@@ -681,6 +683,7 @@ def at_server_shutdown(self):
 
 # Some useful default Script types used by Evennia.
 
+
 class DoNothing(DefaultScript):
     """
     A script that does nothing. Used as default fallback.
diff --git a/evennia/scripts/taskhandler.py b/evennia/scripts/taskhandler.py
index 8ec3aa4e054..4ec3f89808e 100644
--- a/evennia/scripts/taskhandler.py
+++ b/evennia/scripts/taskhandler.py
@@ -81,9 +81,11 @@ def save(self):
             try:
                 dbserialize(callback)
             except (TypeError, AttributeError):
-                raise ValueError("the specified callback {} cannot be pickled. "
-                                 "It must be a top-level function in a module or an "
-                                 "instance method.".format(callback))
+                raise ValueError(
+                    "the specified callback {} cannot be pickled. "
+                    "It must be a top-level function in a module or an "
+                    "instance method.".format(callback)
+                )
             else:
                 safe_callback = callback
 
@@ -122,9 +124,11 @@ def add(self, timedelay, callback, *args, **kwargs):
                 try:
                     dbserialize(arg)
                 except (TypeError, AttributeError):
-                    log_err("The positional argument {} cannot be "
-                            "pickled and will not be present in the arguments "
-                            "fed to the callback {}".format(arg, callback))
+                    log_err(
+                        "The positional argument {} cannot be "
+                        "pickled and will not be present in the arguments "
+                        "fed to the callback {}".format(arg, callback)
+                    )
                 else:
                     safe_args.append(arg)
 
@@ -132,9 +136,11 @@ def add(self, timedelay, callback, *args, **kwargs):
                 try:
                     dbserialize(value)
                 except (TypeError, AttributeError):
-                    log_err("The {} keyword argument {} cannot be "
-                            "pickled and will not be present in the arguments "
-                            "fed to the callback {}".format(key, value, callback))
+                    log_err(
+                        "The {} keyword argument {} cannot be "
+                        "pickled and will not be present in the arguments "
+                        "fed to the callback {}".format(key, value, callback)
+                    )
                 else:
                     safe_kwargs[key] = value
 
diff --git a/evennia/scripts/tests.py b/evennia/scripts/tests.py
index f5120d0da53..c0de2ae901e 100644
--- a/evennia/scripts/tests.py
+++ b/evennia/scripts/tests.py
@@ -8,13 +8,13 @@
 
 
 class TestScript(EvenniaTest):
-    
     def test_create(self):
         "Check the script can be created via the convenience method."
-        obj, errors = DefaultScript.create('useless-machine')
+        obj, errors = DefaultScript.create("useless-machine")
         self.assertTrue(obj, errors)
         self.assertFalse(errors, errors)
 
+
 class TestScriptDB(TestCase):
     "Check the singleton/static ScriptDB object works correctly"
 
diff --git a/evennia/scripts/tickerhandler.py b/evennia/scripts/tickerhandler.py
index b840bf2d9c5..c17d64d7d5d 100644
--- a/evennia/scripts/tickerhandler.py
+++ b/evennia/scripts/tickerhandler.py
@@ -66,7 +66,6 @@ class MyTickerHandler(TickerHandler):
 
 """
 import inspect
-from builtins import object
 
 from twisted.internet.defer import inlineCallbacks
 from django.core.exceptions import ObjectDoesNotExist
@@ -80,8 +79,7 @@ class MyTickerHandler(TickerHandler):
 _SA = object.__setattr__
 
 
-_ERROR_ADD_TICKER = \
-    """TickerHandler: Tried to add an invalid ticker:
+_ERROR_ADD_TICKER = """TickerHandler: Tried to add an invalid ticker:
 {storekey}
 Ticker was not added."""
 
@@ -232,6 +230,7 @@ class TickerPool(object):
     subscribed objects at given times.
 
     """
+
     ticker_class = Ticker
 
     def __init__(self):
@@ -297,6 +296,7 @@ class TickerHandler(object):
     instructions and and re-applies them at a server restart.
 
     """
+
     ticker_pool_class = TickerPool
 
     def __init__(self, save_name="ticker_storage"):
@@ -385,14 +385,24 @@ def save(self):
         """
         if self.ticker_storage:
             # get the current times so the tickers can be restarted with a delay later
-            start_delays = dict((interval, ticker.task.next_call_time())
-                                for interval, ticker in self.ticker_pool.tickers.items())
+            start_delays = dict(
+                (interval, ticker.task.next_call_time())
+                for interval, ticker in self.ticker_pool.tickers.items()
+            )
 
             # remove any subscriptions that lost its object in the interim
-            to_save = {store_key: (args, kwargs) for store_key, (args, kwargs) in self.ticker_storage.items()
-                       if ((store_key[1] and ("_obj" in kwargs and kwargs["_obj"].pk) and
-                            hasattr(kwargs["_obj"], store_key[1])) or    # a valid method with existing obj
-                           store_key[2])}  # a path given
+            to_save = {
+                store_key: (args, kwargs)
+                for store_key, (args, kwargs) in self.ticker_storage.items()
+                if (
+                    (
+                        store_key[1]
+                        and ("_obj" in kwargs and kwargs["_obj"].pk)
+                        and hasattr(kwargs["_obj"], store_key[1])
+                    )
+                    or store_key[2]  # a valid method with existing obj
+                )
+            }  # a path given
 
             # update the timers for the tickers
             for store_key, (args, kwargs) in to_save.items():
@@ -480,6 +490,11 @@ def add(self, interval=60, callback=None, idstring="", persistent=True, *args, *
                 callback every time it is called. This must be data possible
                 to pickle!
 
+        Returns:
+            store_key (tuple): The immutable store-key for this ticker. This can
+                be stored and passed into `.remove(store_key=store_key)` later to
+                easily stop this ticker later.
+
         Notes:
             The callback will be identified by type and stored either as
             as combination of serialized database object + methodname or
@@ -490,8 +505,10 @@ def add(self, interval=60, callback=None, idstring="", persistent=True, *args, *
 
         """
         if isinstance(callback, int):
-            raise RuntimeError("TICKER_HANDLER.add has changed: "
-                               "the interval is now the first argument, callback the second.")
+            raise RuntimeError(
+                "TICKER_HANDLER.add has changed: "
+                "the interval is now the first argument, callback the second."
+            )
 
         obj, path, callfunc = self._get_callback(callback)
         store_key = self._store_key(obj, path, interval, callfunc, idstring, persistent)
@@ -500,29 +517,43 @@ def add(self, interval=60, callback=None, idstring="", persistent=True, *args, *
         self.ticker_storage[store_key] = (args, kwargs)
         self.ticker_pool.add(store_key, *args, **kwargs)
         self.save()
+        return store_key
 
-    def remove(self, interval=60, callback=None, idstring="", persistent=True):
+    def remove(self, interval=60, callback=None, idstring="", persistent=True, store_key=None):
         """
-        Remove object from ticker or only remove it from tickers with
-        a given interval.
+        Remove ticker subscription from handler.
 
         Args:
             interval (int, optional): Interval of ticker to remove.
             callback (callable function or method): Either a function or
                 the method of a typeclassed object.
             idstring (str, optional): Identifier id of ticker to remove.
+            persistent (bool, optional): Whether this ticker is persistent or not.
+            store_key (str, optional): If given, all other kwargs are ignored and only
+                this is used to identify the ticker.
+
+        Raises:
+            KeyError: If no matching ticker was found to remove.
+
+        Notes:
+            The store-key is normally built from the interval/callback/idstring/persistent values;
+            but if the `store_key` is explicitly given, this is used instead.
 
         """
         if isinstance(callback, int):
-            raise RuntimeError("TICKER_HANDLER.remove has changed: "
-                               "the interval is now the first argument, callback the second.")
-
-        obj, path, callfunc = self._get_callback(callback)
-        store_key = self._store_key(obj, path, interval, callfunc, idstring, persistent)
+            raise RuntimeError(
+                "TICKER_HANDLER.remove has changed: "
+                "the interval is now the first argument, callback the second."
+            )
+        if not store_key:
+            obj, path, callfunc = self._get_callback(callback)
+            store_key = self._store_key(obj, path, interval, callfunc, idstring, persistent)
         to_remove = self.ticker_storage.pop(store_key, None)
         if to_remove:
             self.ticker_pool.remove(store_key)
             self.save()
+        else:
+            raise KeyError(f"No Ticker was found matching the store-key {store_key}.")
 
     def clear(self, interval=None):
         """
@@ -538,9 +569,11 @@ def clear(self, interval=None):
         """
         self.ticker_pool.stop(interval)
         if interval:
-            self.ticker_storage = dict((store_key, store_key)
-                                       for store_key in self.ticker_storage
-                                       if store_key[1] != interval)
+            self.ticker_storage = dict(
+                (store_key, store_key)
+                for store_key in self.ticker_storage
+                if store_key[1] != interval
+            )
         else:
             self.ticker_storage = {}
         self.save()
@@ -561,8 +594,10 @@ def all(self, interval=None):
         """
         if interval is None:
             # return dict of all, ordered by interval
-            return dict((interval, ticker.subscriptions)
-                        for interval, ticker in self.ticker_pool.tickers.items())
+            return dict(
+                (interval, ticker.subscriptions)
+                for interval, ticker in self.ticker_pool.tickers.items()
+            )
         else:
             # get individual interval
             ticker = self.ticker_pool.tickers.get(interval, None)
@@ -580,8 +615,13 @@ def all_display(self):
         """
         store_keys = []
         for ticker in self.ticker_pool.tickers.values():
-            for (objtup, callfunc, path, interval, idstring, persistent), (args, kwargs) in ticker.subscriptions.items():
-                store_keys.append((kwargs.get("_obj", None), callfunc, path, interval, idstring, persistent))
+            for (
+                (objtup, callfunc, path, interval, idstring, persistent),
+                (args, kwargs),
+            ) in ticker.subscriptions.items():
+                store_keys.append(
+                    (kwargs.get("_obj", None), callfunc, path, interval, idstring, persistent)
+                )
         return store_keys
 
 
diff --git a/evennia/server/admin.py b/evennia/server/admin.py
index 75f0a39dff5..efaa347fb69 100644
--- a/evennia/server/admin.py
+++ b/evennia/server/admin.py
@@ -12,10 +12,11 @@ class ServerConfigAdmin(admin.ModelAdmin):
     Custom admin for server configs
 
     """
-    list_display = ('db_key', 'db_value')
-    list_display_links = ('db_key',)
-    ordering = ['db_key', 'db_value']
-    search_fields = ['db_key']
+
+    list_display = ("db_key", "db_value")
+    list_display_links = ("db_key",)
+    ordering = ["db_key", "db_value"]
+    search_fields = ["db_key"]
     save_as = True
     save_on_top = True
     list_select_related = True
diff --git a/evennia/server/amp_client.py b/evennia/server/amp_client.py
index 08c46a75203..3c3f40dc7a1 100644
--- a/evennia/server/amp_client.py
+++ b/evennia/server/amp_client.py
@@ -17,6 +17,7 @@ class AMPClientFactory(protocol.ReconnectingClientFactory):
     connection error.
 
     """
+
     # Initial reconnect delay in seconds.
     initialDelay = 1
     factor = 1.5
@@ -95,6 +96,7 @@ class AMPServerClientProtocol(amp.AMPMultiConnectionProtocol):
     Portal (which acts as the AMP-server)
 
     """
+
     # sending AMP data
 
     def connectionMade(self):
@@ -108,7 +110,8 @@ def connectionMade(self):
         # first thing we do is to request the Portal to sync all sessions
         # back with the Server side. We also need the startup mode (reload, reset, shutdown)
         self.send_AdminServer2Portal(
-                amp.DUMMYSESSION, operation=amp.PSYNC, spid=os.getpid(), info_dict=info_dict)
+            amp.DUMMYSESSION, operation=amp.PSYNC, spid=os.getpid(), info_dict=info_dict
+        )
         # run the intial setup if needed
         self.factory.server.run_initial_setup()
 
@@ -131,7 +134,8 @@ def data_to_portal(self, command, sessid, **kwargs):
         """
         # print("server data_to_portal: {}, {}, {}".format(command, sessid, kwargs))
         return self.callRemote(command, packed_data=amp.dumps((sessid, kwargs))).addErrback(
-                self.errback, command.key)
+            self.errback, command.key
+        )
 
     def send_MsgServer2Portal(self, session, **kwargs):
         """
@@ -158,8 +162,9 @@ def send_AdminServer2Portal(self, session, operation="", **kwargs):
             kwargs (dict, optional): Data going into the adminstrative.
 
         """
-        return self.data_to_portal(amp.AdminServer2Portal, session.sessid,
-                                   operation=operation, **kwargs)
+        return self.data_to_portal(
+            amp.AdminServer2Portal, session.sessid, operation=operation, **kwargs
+        )
 
     # receiving AMP data
 
@@ -228,18 +233,18 @@ def server_receive_adminportal2server(self, packed_data):
         elif operation == amp.SRELOAD:  # server reload
             # shut down in reload mode
             server_sessionhandler.all_sessions_portal_sync()
-            server_sessionhandler.server.shutdown(mode='reload')
+            server_sessionhandler.server.shutdown(mode="reload")
 
         elif operation == amp.SRESET:
             # shut down in reset mode
             server_sessionhandler.all_sessions_portal_sync()
-            server_sessionhandler.server.shutdown(mode='reset')
+            server_sessionhandler.server.shutdown(mode="reset")
 
         elif operation == amp.SSHUTD:  # server shutdown
             # shutdown in stop mode
-            server_sessionhandler.server.shutdown(mode='shutdown')
+            server_sessionhandler.server.shutdown(mode="shutdown")
 
         else:
-            raise Exception("operation %(op)s not recognized." % {'op': operation})
+            raise Exception("operation %(op)s not recognized." % {"op": operation})
 
         return {}
diff --git a/evennia/server/connection_wizard.py b/evennia/server/connection_wizard.py
index 26668bc5ec6..8fe0090f631 100644
--- a/evennia/server/connection_wizard.py
+++ b/evennia/server/connection_wizard.py
@@ -10,7 +10,6 @@
 
 
 class ConnectionWizard(object):
-
     def __init__(self):
         self.data = {}
         self.prev_node = None
@@ -132,19 +131,19 @@ def ask_input(self, prompt=" > ", default=None, validator=None):
             if not resp and default:
                 resp = str(default)
 
-            if resp.lower() in ('q', 'quit'):
+            if resp.lower() in ("q", "quit"):
                 sys.exit()
 
-            if resp.lower() == 'none':
-                resp = ''
+            if resp.lower() == "none":
+                resp = ""
 
                 if validator and not validator(resp):
                     continue
 
                 ok = input("\n Leave blank? [Y]/N: ")
-                if ok.lower() in ('n', 'no'):
+                if ok.lower() in ("n", "no"):
                     continue
-                elif ok.lower() in ('q', 'quit'):
+                elif ok.lower() in ("q", "quit"):
                     sys.exit()
                 return resp
 
@@ -155,7 +154,7 @@ def ask_input(self, prompt=" > ", default=None, validator=None):
             ok = input("\n Is this correct? [Y]/N: ")
             if ok.lower() in ("n", "no"):
                 continue
-            elif ok.lower() in ('q', 'quit'):
+            elif ok.lower() in ("q", "quit"):
                 sys.exit()
             return resp
 
@@ -170,15 +169,17 @@ def node_start(wizard):
     Use `quit` at any time to abort and throw away unsaved changes.
     """
     options = {
-        "1": ("Add your game to the Evennia game index (also for closed-dev games)",
-              node_game_index_start, {}),
+        "1": (
+            "Add your game to the Evennia game index (also for closed-dev games)",
+            node_game_index_start,
+            {},
+        ),
         # "2": ("Add MSSP information (for mud-list crawlers)",
         #       node_mssp_start, {}),
         # "3": ("Add Grapevine listing",
         #       node_grapevine_start, {}),
-        "2": ("View and Save created settings",
-              node_view_and_apply_settings, {}),
-               }
+        "2": ("View and Save created settings", node_view_and_apply_settings, {}),
+    }
 
     wizard.display(text)
     wizard.ask_node(options)
@@ -201,7 +202,7 @@ def node_game_index_start(wizard, **kwargs):
     """
 
     wizard.display(text)
-    if wizard.ask_yesno("Continue adding/editing an Index entry?") == 'yes':
+    if wizard.ask_yesno("Continue adding/editing an Index entry?") == "yes":
         node_game_index_fields(wizard)
     else:
         node_start(wizard)
@@ -215,7 +216,7 @@ def node_game_index_fields(wizard, status=None):
 
     # game status
 
-    status_default = wizard.game_index_listing['game_status']
+    status_default = wizard.game_index_listing["game_status"]
     text = f"""
     What is the status of your game?
         - pre-alpha: a game in its very early stages, mostly unfinished or unstarted
@@ -230,12 +231,11 @@ def node_game_index_fields(wizard, status=None):
     options = ["pre-alpha", "alpha", "beta", "launched"]
 
     wizard.display(text)
-    wizard.game_index_listing['game_status'] = \
-        wizard.ask_choice("Select one: ", options)
+    wizard.game_index_listing["game_status"] = wizard.ask_choice("Select one: ", options)
 
     # short desc
 
-    sdesc_default = wizard.game_index_listing.get('short_description', None)
+    sdesc_default = wizard.game_index_listing.get("short_description", None)
 
     text = f"""
     Enter a short description of your game. Make it snappy and interesting!
@@ -256,8 +256,9 @@ def sdesc_validator(inp):
         return True
 
     wizard.display(text)
-    wizard.game_index_listing['short_description'] = \
-        wizard.ask_input(default=sdesc_default, validator=sdesc_validator)
+    wizard.game_index_listing["short_description"] = wizard.ask_input(
+        default=sdesc_default, validator=sdesc_validator
+    )
 
     # long desc
 
@@ -273,8 +274,7 @@ def sdesc_validator(inp):
     """
 
     wizard.display(text)
-    wizard.game_index_listing['long_description'] = \
-        wizard.ask_input(default=long_default)
+    wizard.game_index_listing["long_description"] = wizard.ask_input(default=long_default)
 
     # listing contact
 
@@ -297,12 +297,13 @@ def contact_validator(inp):
         return True
 
     wizard.display(text)
-    wizard.game_index_listing['listing_contact'] = \
-        wizard.ask_input(default=listing_default, validator=contact_validator)
+    wizard.game_index_listing["listing_contact"] = wizard.ask_input(
+        default=listing_default, validator=contact_validator
+    )
 
     # telnet hostname
 
-    hostname_default = wizard.game_index_listing.get('telnet_hostname', None)
+    hostname_default = wizard.game_index_listing.get("telnet_hostname", None)
     text = f"""
     Enter the hostname to which third-party telnet mud clients can connect to
     your game. This would be the name of the server your game is hosted on,
@@ -315,13 +316,11 @@ def contact_validator(inp):
     """
 
     wizard.display(text)
-    wizard.game_index_listing['telnet_hostname'] = \
-        wizard.ask_input(default=hostname_default)
-
+    wizard.game_index_listing["telnet_hostname"] = wizard.ask_input(default=hostname_default)
 
     # telnet port
 
-    port_default = wizard.game_index_listing.get('telnet_port', None)
+    port_default = wizard.game_index_listing.get("telnet_port", None)
     text = f"""
     Enter the main telnet port. The Evennia default is 4000. You can change
     this with the TELNET_PORTS server setting.
@@ -333,13 +332,11 @@ def contact_validator(inp):
     """
 
     wizard.display(text)
-    wizard.game_index_listing['telnet_port'] = \
-        wizard.ask_input(default=port_default)
-
+    wizard.game_index_listing["telnet_port"] = wizard.ask_input(default=port_default)
 
     # website
 
-    website_default = wizard.game_index_listing.get('game_website', None)
+    website_default = wizard.game_index_listing.get("game_website", None)
     text = f"""
     Evennia is its own web server and runs your game's website. Enter the
     URL of the website here, like http://yourwebsite.com, here.
@@ -351,12 +348,11 @@ def contact_validator(inp):
     """
 
     wizard.display(text)
-    wizard.game_index_listing['game_website'] = \
-        wizard.ask_input(default=website_default)
+    wizard.game_index_listing["game_website"] = wizard.ask_input(default=website_default)
 
     # webclient
 
-    webclient_default = wizard.game_index_listing.get('web_client_url', None)
+    webclient_default = wizard.game_index_listing.get("web_client_url", None)
     text = f"""
     Evennia offers its own native webclient. Normally it will be found from the
     game homepage at something like http://yourwebsite.com/webclient. Enter
@@ -370,15 +366,17 @@ def contact_validator(inp):
     """
 
     wizard.display(text)
-    wizard.game_index_listing['web_client_url'] = \
-        wizard.ask_input(default=webclient_default)
+    wizard.game_index_listing["web_client_url"] = wizard.ask_input(default=webclient_default)
 
-    if not (wizard.game_index_listing.get('web_client_url') or
-            (wizard.game_index_listing.get('telnet_host'))):
+    if not (
+        wizard.game_index_listing.get("web_client_url")
+        or (wizard.game_index_listing.get("telnet_host"))
+    ):
         wizard.display(
             "\nNote: You have not specified any connection options. This means "
             "your game \nwill be marked as being in 'closed development' in "
-            "the index.")
+            "the index."
+        )
 
     wizard.display("\nDon't forget to inspect and save your changes.")
 
@@ -417,6 +415,7 @@ def node_mssp_start(wizard):
 
 # Admin
 
+
 def _save_changes(wizard):
     """
     Perform the save
@@ -425,22 +424,25 @@ def _save_changes(wizard):
     # add import statement to settings file
     import_stanza = "from .connection_settings import *"
     setting_module = mod_import("server.conf.settings")
-    with open(setting_module.__file__, 'r+') as f:
+    with open(setting_module.__file__, "r+") as f:
         txt = f.read()  # moves pointer to end of file
         if import_stanza not in txt:
             # add to the end of the file
-            f.write("\n\n"
-                    "try:\n"
-                    "    # Created by the `evennia connections` wizard\n"
-                    f"    {import_stanza}\n"
-                    "except ImportError:\n"
-                    "    pass")
-
-    connect_settings_file = path.join(settings.GAME_DIR,
-                                      "server", "conf", "connection_settings.py")
-    with open(connect_settings_file, 'w') as f:
-        f.write("# This file is auto-generated by the `evennia connections` wizard.\n"
-                "# Don't edit manually, your changes will be overwritten.\n\n")
+            f.write(
+                "\n\n"
+                "try:\n"
+                "    # Created by the `evennia connections` wizard\n"
+                f"    {import_stanza}\n"
+                "except ImportError:\n"
+                "    pass"
+            )
+
+    connect_settings_file = path.join(settings.GAME_DIR, "server", "conf", "connection_settings.py")
+    with open(connect_settings_file, "w") as f:
+        f.write(
+            "# This file is auto-generated by the `evennia connections` wizard.\n"
+            "# Don't edit manually, your changes will be overwritten.\n\n"
+        )
 
         f.write(wizard.save_output)
         wizard.display(f"saving to {connect_settings_file} ...")
@@ -459,9 +461,9 @@ def node_view_and_apply_settings(wizard):
         if wizard.game_index_listing != settings.GAME_INDEX_LISTING:
             game_index_txt = "No changes to save for Game Index."
         else:
-            game_index_txt = ("GAME_INDEX_ENABLED = True\n"
-                              "GAME_INDEX_LISTING = \\\n" +
-                              pp.pformat(wizard.game_index_listing))
+            game_index_txt = "GAME_INDEX_ENABLED = True\n" "GAME_INDEX_LISTING = \\\n" + pp.pformat(
+                wizard.game_index_listing
+            )
             saves = True
 
     text = game_index_txt
@@ -469,7 +471,7 @@ def node_view_and_apply_settings(wizard):
     wizard.display(f"Settings to save:\n\n{text}")
 
     if saves:
-        if wizard.ask_yesno("Do you want to save these settings?") == 'yes':
+        if wizard.ask_yesno("Do you want to save these settings?") == "yes":
             wizard.save_output = text
             _save_changes(wizard)
             wizard.display("... saved!")
diff --git a/evennia/server/deprecations.py b/evennia/server/deprecations.py
index 3920c508793..3776364ba5e 100644
--- a/evennia/server/deprecations.py
+++ b/evennia/server/deprecations.py
@@ -18,31 +18,32 @@ def check_errors(settings):
         DeprecationWarning if a critical deprecation is found.
 
     """
-    deprstring = ("settings.%s should be renamed to %s. If defaults are used, "
-                  "their path/classname must be updated "
-                  "(see evennia/settings_default.py).")
+    deprstring = (
+        "settings.%s should be renamed to %s. If defaults are used, "
+        "their path/classname must be updated "
+        "(see evennia/settings_default.py)."
+    )
     if hasattr(settings, "CMDSET_DEFAULT"):
-        raise DeprecationWarning(deprstring % (
-            "CMDSET_DEFAULT", "CMDSET_CHARACTER"))
+        raise DeprecationWarning(deprstring % ("CMDSET_DEFAULT", "CMDSET_CHARACTER"))
     if hasattr(settings, "CMDSET_OOC"):
         raise DeprecationWarning(deprstring % ("CMDSET_OOC", "CMDSET_ACCOUNT"))
     if settings.WEBSERVER_ENABLED and not isinstance(settings.WEBSERVER_PORTS[0], tuple):
         raise DeprecationWarning(
-            "settings.WEBSERVER_PORTS must be on the form "
-            "[(proxyport, serverport), ...]")
+            "settings.WEBSERVER_PORTS must be on the form " "[(proxyport, serverport), ...]"
+        )
     if hasattr(settings, "BASE_COMM_TYPECLASS"):
-        raise DeprecationWarning(deprstring % (
-            "BASE_COMM_TYPECLASS", "BASE_CHANNEL_TYPECLASS"))
+        raise DeprecationWarning(deprstring % ("BASE_COMM_TYPECLASS", "BASE_CHANNEL_TYPECLASS"))
     if hasattr(settings, "COMM_TYPECLASS_PATHS"):
-        raise DeprecationWarning(deprstring % (
-            "COMM_TYPECLASS_PATHS", "CHANNEL_TYPECLASS_PATHS"))
+        raise DeprecationWarning(deprstring % ("COMM_TYPECLASS_PATHS", "CHANNEL_TYPECLASS_PATHS"))
     if hasattr(settings, "CHARACTER_DEFAULT_HOME"):
         raise DeprecationWarning(
             "settings.CHARACTER_DEFAULT_HOME should be renamed to "
             "DEFAULT_HOME. See also settings.START_LOCATION "
-            "(see evennia/settings_default.py).")
-    deprstring = ("settings.%s is now merged into settings.TYPECLASS_PATHS. "
-                  "Update your settings file.")
+            "(see evennia/settings_default.py)."
+        )
+    deprstring = (
+        "settings.%s is now merged into settings.TYPECLASS_PATHS. " "Update your settings file."
+    )
     if hasattr(settings, "OBJECT_TYPECLASS_PATHS"):
         raise DeprecationWarning(deprstring % "OBJECT_TYPECLASS_PATHS")
     if hasattr(settings, "SCRIPT_TYPECLASS_PATHS"):
@@ -56,30 +57,55 @@ def check_errors(settings):
             "settings.SEARCH_MULTIMATCH_SEPARATOR was replaced by "
             "SEARCH_MULTIMATCH_REGEX and SEARCH_MULTIMATCH_TEMPLATE. "
             "Update your settings file (see evennia/settings_default.py "
-            "for more info).")
+            "for more info)."
+        )
 
-    gametime_deprecation = ("The settings TIME_SEC_PER_MIN, TIME_MIN_PER_HOUR,"
-                            "TIME_HOUR_PER_DAY, TIME_DAY_PER_WEEK, \n"
-                            "TIME_WEEK_PER_MONTH and TIME_MONTH_PER_YEAR "
-                            "are no longer supported. Remove them from your "
-                            "settings file to continue.\nIf you want to use "
-                            "and manipulate these time units, the tools from utils.gametime "
-                            "are now found in contrib/convert_gametime.py instead.")
-    if any(hasattr(settings, value) for value in ("TIME_SEC_PER_MIN", "TIME_MIN_PER_HOUR",
-                                                  "TIME_HOUR_PER_DAY", "TIME_DAY_PER_WEEK",
-                                                  "TIME_WEEK_PER_MONTH",
-                                                  "TIME_MONTH_PER_YEAR")):
+    gametime_deprecation = (
+        "The settings TIME_SEC_PER_MIN, TIME_MIN_PER_HOUR,"
+        "TIME_HOUR_PER_DAY, TIME_DAY_PER_WEEK, \n"
+        "TIME_WEEK_PER_MONTH and TIME_MONTH_PER_YEAR "
+        "are no longer supported. Remove them from your "
+        "settings file to continue.\nIf you want to use "
+        "and manipulate these time units, the tools from utils.gametime "
+        "are now found in contrib/convert_gametime.py instead."
+    )
+    if any(
+        hasattr(settings, value)
+        for value in (
+            "TIME_SEC_PER_MIN",
+            "TIME_MIN_PER_HOUR",
+            "TIME_HOUR_PER_DAY",
+            "TIME_DAY_PER_WEEK",
+            "TIME_WEEK_PER_MONTH",
+            "TIME_MONTH_PER_YEAR",
+        )
+    ):
         raise DeprecationWarning(gametime_deprecation)
 
-    game_directory_deprecation = ("The setting GAME_DIRECTORY_LISTING was removed. It must be "
-                                  "renamed to GAME_INDEX_LISTING instead.")
+    game_directory_deprecation = (
+        "The setting GAME_DIRECTORY_LISTING was removed. It must be "
+        "renamed to GAME_INDEX_LISTING instead."
+    )
     if hasattr(settings, "GAME_DIRECTORY_LISTING"):
         raise DeprecationWarning(game_directory_deprecation)
 
+    chan_connectinfo = settings.CHANNEL_CONNECTINFO
+    if chan_connectinfo is not None and not isinstance(chan_connectinfo, dict):
+        raise DeprecationWarning(
+            "settings.CHANNEL_CONNECTINFO has changed. It "
+            "must now be either None or a dict "
+            "specifying the properties of the channel to create."
+        )
+
 
 def check_warnings(settings):
     """
-    Check deprecations that should produce warnings but which
+    Check conditions and deprecations that should produce warnings but which
     does not stop launch.
     """
-    pass
+    if settings.DEBUG:
+        print(" [Devel: settings.DEBUG is True. Important to turn off in production.]")
+    if settings.IN_GAME_ERRORS:
+        print(" [Devel: settings.IN_GAME_ERRORS is True. Turn off in production.]")
+    if settings.ALLOWED_HOSTS == ["*"]:
+        print(" [Devel: settings.ALLOWED_HOSTS set to '*' (all). Limit in production.]")
diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py
index 43b374913f7..74eb408bcbd 100644
--- a/evennia/server/evennia_launcher.py
+++ b/evennia/server/evennia_launcher.py
@@ -36,6 +36,7 @@
 EVENNIA_ROOT = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import evennia  # noqa
+
 EVENNIA_LIB = os.path.join(os.path.dirname(os.path.abspath(evennia.__file__)))
 EVENNIA_SERVER = os.path.join(EVENNIA_LIB, "server")
 EVENNIA_TEMPLATE = os.path.join(EVENNIA_LIB, "game_template")
@@ -81,18 +82,18 @@
 AMP_INTERFACE = None
 AMP_CONNECTION = None
 
-SRELOAD = chr(14)      # server reloading (have portal start a new server)
-SSTART = chr(15)       # server start
-PSHUTD = chr(16)       # portal (+server) shutdown
-SSHUTD = chr(17)       # server-only shutdown
-PSTATUS = chr(18)      # ping server or portal status
-SRESET = chr(19)       # shutdown server in reset mode
+SRELOAD = chr(14)  # server reloading (have portal start a new server)
+SSTART = chr(15)  # server start
+PSHUTD = chr(16)  # portal (+server) shutdown
+SSHUTD = chr(17)  # server-only shutdown
+PSTATUS = chr(18)  # ping server or portal status
+SRESET = chr(19)  # shutdown server in reset mode
 
 # requirements
-PYTHON_MIN = '3.7'
-TWISTED_MIN = '18.0.0'
-DJANGO_MIN = '2.1'
-DJANGO_REC = '2.2.4'
+PYTHON_MIN = "3.7"
+TWISTED_MIN = "18.0.0"
+DJANGO_MIN = "2.1"
+DJANGO_REC = "2.2.5"
 
 try:
     sys.path[1] = EVENNIA_ROOT
@@ -105,8 +106,7 @@
 #
 # ------------------------------------------------------------
 
-CREATED_NEW_GAMEDIR = \
-    """
+CREATED_NEW_GAMEDIR = """
     Welcome to Evennia!
     Created a new Evennia game directory '{gamedir}'.
 
@@ -132,22 +132,19 @@
     your new Evennia project!)
     """
 
-ERROR_INPUT = \
-    """
+ERROR_INPUT = """
     Command
       {args} {kwargs}
     raised an error: '{traceback}'.
 """
 
-ERROR_NO_ALT_GAMEDIR = \
-        """
+ERROR_NO_ALT_GAMEDIR = """
     The path '{gamedir}' could not be found.
 """
 
-ERROR_NO_GAMEDIR = \
-    """
+ERROR_NO_GAMEDIR = """
     ERROR: No Evennia settings file was found. Evennia looks for the
-    file in your game directory as server/conf/settings.py.
+    file in your game directory as ./server/conf/settings.py.
 
     You must run this command from somewhere inside a valid game
     directory first created with
@@ -167,8 +164,7 @@
 
     """
 
-WARNING_MOVING_SUPERUSER = \
-    """
+WARNING_MOVING_SUPERUSER = """
     WARNING: Evennia expects an Account superuser with id=1. No such
     Account was found. However, another superuser ('{other_key}',
     id={other_id}) was found in the database. If you just created this
@@ -181,8 +177,7 @@
     Please confirm this is acceptable before continuing.
     """
 
-WARNING_RUNSERVER = \
-    """
+WARNING_RUNSERVER = """
     WARNING: There is no need to run the Django development
     webserver to test out Evennia web features (the web client
     will in fact not work since the Django test server knows
@@ -190,8 +185,7 @@
     webserver component active (this is the default).
     """
 
-ERROR_SETTINGS = \
-    """
+ERROR_SETTINGS = """
     ERROR: There was an error importing Evennia's config file
     {settingspath}.
     There is usually one of three reasons for this:
@@ -204,17 +198,17 @@
            errors mentioning 'DJANGO_SETTINGS_MODULE'. If you run a
            virtual machine, it might be worth to restart it to see if
            this resolves the issue.
-    """.format(settingspath=SETTINGS_PATH)
+    """.format(
+    settingspath=SETTINGS_PATH
+)
 
-ERROR_INITSETTINGS = \
-    """
+ERROR_INITSETTINGS = """
     ERROR: 'evennia --initsettings' must be called from the root of
     your game directory, since it tries to (re)create the new
     settings.py file in a subfolder server/conf/.
     """
 
-RECREATED_SETTINGS = \
-    """
+RECREATED_SETTINGS = """
     (Re)created an empty settings file in server/conf/settings.py.
 
     Note that if you were using an existing database, the password
@@ -223,33 +217,30 @@
     their accounts with their old passwords.
     """
 
-ERROR_INITMISSING = \
-    """
+ERROR_INITMISSING = """
     ERROR: 'evennia --initmissing' must be called from the root of
     your game directory, since it tries to create any missing files
     in the server/ subfolder.
     """
 
-RECREATED_MISSING = \
-    """
+RECREATED_MISSING = """
     (Re)created any missing directories or files.  Evennia should
     be ready to run now!
     """
 
-ERROR_DATABASE = \
-    """
-    ERROR: Your database does not seem to be set up correctly.
+ERROR_DATABASE = """
+    ERROR: Your database does not exist or is not set up correctly.
     (error was '{traceback}')
 
-    Standing in your game directory, run
+    If you think your database should work, make sure you are running your
+    commands from inside your game directory. If this error persists, run
 
        evennia migrate
 
     to initialize/update the database according to your settings.
     """
 
-ERROR_WINDOWS_WIN32API = \
-    """
+ERROR_WINDOWS_WIN32API = """
     ERROR: Unable to import win32api, which Twisted requires to run.
     You may download it from:
 
@@ -263,8 +254,7 @@
         easy_install http://<url to win32api exe>
     """
 
-INFO_WINDOWS_BATFILE = \
-    """
+INFO_WINDOWS_BATFILE = """
     INFO: Since you are running Windows, a file 'twistd.bat' was
     created for you. This is a simple batch file that tries to call
     the twisted executable. Evennia determined this to be:
@@ -279,13 +269,11 @@
     are ready to start the server.
     """
 
-CMDLINE_HELP = \
-    """Starts, initializes, manages and operates the Evennia MU* server.
+CMDLINE_HELP = """Starts, initializes, manages and operates the Evennia MU* server.
 Most standard django management commands are also accepted."""
 
 
-VERSION_INFO = \
-    """
+VERSION_INFO = """
     Evennia {version}
     OS: {os}
     Python: {python}
@@ -293,8 +281,7 @@
     Django: {django}{about}
     """
 
-ABOUT_INFO = \
-    """
+ABOUT_INFO = """
     Evennia MUD/MUX/MU* development system
 
     Licence: BSD 3-Clause Licence
@@ -307,8 +294,7 @@
     Use -h for command line options.
     """
 
-HELP_ENTRY = \
-    """
+HELP_ENTRY = """
     Evennia has two processes, the 'Server' and the 'Portal'.
     External users connect to the Portal while the Server runs the
     game/database. Restarting the Server will refresh code but not
@@ -324,8 +310,7 @@
         https://github.com/evennia/evennia/wiki
     """
 
-MENU = \
-    """
+MENU = """
     +----Evennia Launcher-------------------------------------------+
     {gameinfo}
     +--- Common operations -----------------------------------------+
@@ -349,16 +334,14 @@
     |  h) Help               i) About info                q) Abort  |
     +---------------------------------------------------------------+"""
 
-ERROR_AMP_UNCONFIGURED = \
-    """
+ERROR_AMP_UNCONFIGURED = """
     Can't find server info for connecting. Either run this command from
     the game dir (it will then use the game's settings file) or specify
     the path to your game's settings file manually with the --settings
     option.
     """
 
-ERROR_LOGDIR_MISSING = \
-    """
+ERROR_LOGDIR_MISSING = """
     ERROR: One or more log-file directory locations could not be
     found:
 
@@ -375,25 +358,21 @@
     the log directory also not being created.)
     """
 
-ERROR_PYTHON_VERSION = \
-    """
+ERROR_PYTHON_VERSION = """
     ERROR: Python {pversion} used. Evennia requires version
     {python_min} or higher.
     """
 
-ERROR_TWISTED_VERSION = \
-    """
+ERROR_TWISTED_VERSION = """
     ERROR: Twisted {tversion} found. Evennia requires
     version {twisted_min} or higher.
     """
 
-ERROR_NOTWISTED = \
-    """
+ERROR_NOTWISTED = """
     ERROR: Twisted does not seem to be installed.
     """
 
-ERROR_DJANGO_MIN = \
-    """
+ERROR_DJANGO_MIN = """
     ERROR: Django {dversion} found. Evennia requires version {django_min}
     or higher.
 
@@ -406,50 +385,42 @@
     any warnings and don't run `makemigrate` even if told to.
     """
 
-NOTE_DJANGO_MIN = \
-    """
+NOTE_DJANGO_MIN = """
     NOTE: Django {dversion} found. This will work, but Django {django_rec} is
     recommended for production.
     """
 
-NOTE_DJANGO_NEW = \
-    """
+NOTE_DJANGO_NEW = """
     NOTE: Django {dversion} found. This is newer than Evennia's
     recommended version ({django_rec}). It might work, but may be new
     enough to not be fully tested yet. Report any issues.
     """
 
-ERROR_NODJANGO = \
-    """
+ERROR_NODJANGO = """
     ERROR: Django does not seem to be installed.
     """
 
-NOTE_KEYBOARDINTERRUPT = \
-    """
+NOTE_KEYBOARDINTERRUPT = """
     STOP: Caught keyboard interrupt while in interactive mode.
     """
 
-NOTE_TEST_DEFAULT = \
-    """
+NOTE_TEST_DEFAULT = """
     TESTING: Using Evennia's default settings file (evennia.settings_default).
     (use 'evennia test --settings settings.py .' to run only your custom game tests)
     """
 
-NOTE_TEST_CUSTOM = \
-    """
+NOTE_TEST_CUSTOM = """
     TESTING: Using specified settings file '{settings_dotpath}'.
 
     OBS: Evennia's full test suite may not pass if the settings are very
     different from the default (use 'evennia test evennia' to run core tests)
     """
 
-PROCESS_ERROR = \
-    """
+PROCESS_ERROR = """
     {component} process error: {traceback}.
     """
 
-PORTAL_INFO = \
-    """{servername} Portal {version}
+PORTAL_INFO = """{servername} Portal {version}
     external ports:
         {telnet}
         {telnet_ssl}
@@ -462,8 +433,7 @@
 """
 
 
-SERVER_INFO = \
-    """{servername} Server {version}
+SERVER_INFO = """{servername} Server {version}
     internal ports (to Portal):
         {webserver}
         {amp}
@@ -472,8 +442,7 @@
     {errors}"""
 
 
-ARG_OPTIONS = \
-    """Actions on installed server. One of:
+ARG_OPTIONS = """Actions on installed server. One of:
  start       - launch server+portal if not running
  reload      - restart server in 'reload' mode
  stop        - shutdown server+portal
@@ -498,7 +467,7 @@
 
 
 def _is_windows():
-    return os.name == 'nt'
+    return os.name == "nt"
 
 
 def _file_names_compact(filepath1, filepath2):
@@ -509,7 +478,7 @@ def _file_names_compact(filepath1, filepath2):
         name2 = os.path.basename(filepath2)
         return "{} and {}".format(filepath1, name2)
     else:
-        return "{} and {}". format(filepath1, filepath2)
+        return "{} and {}".format(filepath1, filepath2)
 
 
 def _print_info(portal_info_dict, server_info_dict):
@@ -543,12 +512,12 @@ def _strip_empty_lines(string):
     maxwidth = max(len(line) for line in info.split("\n"))
     top_border = "-" * (maxwidth - 11) + " Evennia " + "---"
     border = "-" * (maxwidth + 1)
-    print(top_border + "\n" + info + '\n' + border)
+    print(top_border + "\n" + info + "\n" + border)
 
 
 def _parse_status(response):
     "Unpack the status information"
-    return pickle.loads(response['status'])
+    return pickle.loads(response["status"])
 
 
 def _get_twistd_cmdline(pprofiler, sprofiler):
@@ -556,24 +525,22 @@ def _get_twistd_cmdline(pprofiler, sprofiler):
     Compile the command line for starting a Twisted application using the 'twistd' executable.
 
     """
-    portal_cmd = [TWISTED_BINARY,
-                  "--python={}".format(PORTAL_PY_FILE)]
-    server_cmd = [TWISTED_BINARY,
-                  "--python={}".format(SERVER_PY_FILE)]
+    portal_cmd = [TWISTED_BINARY, "--python={}".format(PORTAL_PY_FILE)]
+    server_cmd = [TWISTED_BINARY, "--python={}".format(SERVER_PY_FILE)]
 
-    if os.name != 'nt':
+    if os.name != "nt":
         # PID files only for UNIX
         portal_cmd.append("--pidfile={}".format(PORTAL_PIDFILE))
         server_cmd.append("--pidfile={}".format(SERVER_PIDFILE))
 
     if pprofiler:
-        portal_cmd.extend(["--savestats",
-                           "--profiler=cprofile",
-                           "--profile={}".format(PPROFILER_LOGFILE)])
+        portal_cmd.extend(
+            ["--savestats", "--profiler=cprofile", "--profile={}".format(PPROFILER_LOGFILE)]
+        )
     if sprofiler:
-        server_cmd.extend(["--savestats",
-                           "--profiler=cprofile",
-                           "--profile={}".format(SPROFILER_LOGFILE)])
+        server_cmd.extend(
+            ["--savestats", "--profiler=cprofile", "--profile={}".format(SPROFILER_LOGFILE)]
+        )
 
     return portal_cmd, server_cmd
 
@@ -595,10 +562,11 @@ class MsgStatus(amp.Command):
     Ping between AMP services
 
     """
+
     key = "MsgStatus"
-    arguments = [(b'status', amp.String())]
-    errors = {Exception: b'EXCEPTION'}
-    response = [(b'status', amp.String())]
+    arguments = [(b"status", amp.String())]
+    errors = {Exception: b"EXCEPTION"}
+    response = [(b"status", amp.String())]
 
 
 class MsgLauncher2Portal(amp.Command):
@@ -606,10 +574,10 @@ class MsgLauncher2Portal(amp.Command):
     Message Launcher -> Portal
 
     """
+
     key = "MsgLauncher2Portal"
-    arguments = [(b'operation', amp.String()),
-                 (b'arguments', amp.String())]
-    errors = {Exception: b'EXCEPTION'}
+    arguments = [(b"operation", amp.String()), (b"arguments", amp.String())]
+    errors = {Exception: b"EXCEPTION"}
     response = []
 
 
@@ -618,6 +586,7 @@ class AMPLauncherProtocol(amp.AMP):
     Defines callbacks to the launcher
 
     """
+
     def __init__(self):
         self.on_status = []
 
@@ -680,13 +649,15 @@ def _on_connect_fail(fail):
 
     def _send():
         if operation == PSTATUS:
-            return AMP_CONNECTION.callRemote(MsgStatus, status=b"").addCallbacks(_callback, _errback)
+            return AMP_CONNECTION.callRemote(MsgStatus, status=b"").addCallbacks(
+                _callback, _errback
+            )
         else:
             return AMP_CONNECTION.callRemote(
                 MsgLauncher2Portal,
-                operation=bytes(operation, 'utf-8'),
-                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL)).addCallbacks(
-                    _callback, _errback)
+                operation=bytes(operation, "utf-8"),
+                arguments=pickle.dumps(arguments, pickle.HIGHEST_PROTOCOL),
+            ).addCallbacks(_callback, _errback)
 
     if AMP_CONNECTION:
         # already connected - send right away
@@ -705,19 +676,21 @@ def query_status(callback=None):
     Send status ping to portal
 
     """
-    wmap = {True: "RUNNING",
-            False: "NOT RUNNING"}
+    wmap = {True: "RUNNING", False: "NOT RUNNING"}
 
     def _callback(response):
         if callback:
             callback(response)
         else:
             pstatus, sstatus, ppid, spid, pinfo, sinfo = _parse_status(response)
-            print("Portal: {}{}\nServer: {}{}".format(
-                wmap[pstatus], " (pid {})".format(
-                    get_pid(PORTAL_PIDFILE, ppid)) if pstatus else "",
-                wmap[sstatus], " (pid {})".format(
-                    get_pid(SERVER_PIDFILE, spid)) if sstatus else ""))
+            print(
+                "Portal: {}{}\nServer: {}{}".format(
+                    wmap[pstatus],
+                    " (pid {})".format(get_pid(PORTAL_PIDFILE, ppid)) if pstatus else "",
+                    wmap[sstatus],
+                    " (pid {})".format(get_pid(SERVER_PIDFILE, spid)) if sstatus else "",
+                )
+            )
             _reactor_stop()
 
     def _errback(fail):
@@ -738,8 +711,9 @@ def wait_for_status_reply(callback):
         print("No Evennia connection established.")
 
 
-def wait_for_status(portal_running=True, server_running=True, callback=None, errback=None,
-                    rate=0.5, retries=20):
+def wait_for_status(
+    portal_running=True, server_running=True, callback=None, errback=None, rate=0.5, retries=20
+):
     """
     Repeat the status ping until the desired state combination is achieved.
 
@@ -755,10 +729,12 @@ def wait_for_status(portal_running=True, server_running=True, callback=None, err
         rate (float): How often to retry.
         retries (int): How many times to retry before timing out and calling `errback`.
     """
+
     def _callback(response):
         prun, srun, _, _, _, _ = _parse_status(response)
-        if ((portal_running is None or prun == portal_running) and
-                (server_running is None or srun == server_running)):
+        if (portal_running is None or prun == portal_running) and (
+            server_running is None or srun == server_running
+        ):
             # the correct state was achieved
             if callback:
                 callback(prun, srun)
@@ -772,9 +748,16 @@ def _callback(response):
                     print("Connection to Evennia timed out. Try again.")
                     _reactor_stop()
             else:
-                reactor.callLater(rate, wait_for_status,
-                                  portal_running, server_running,
-                                  callback, errback, rate, retries - 1)
+                reactor.callLater(
+                    rate,
+                    wait_for_status,
+                    portal_running,
+                    server_running,
+                    callback,
+                    errback,
+                    rate,
+                    retries - 1,
+                )
 
     def _errback(fail):
         """
@@ -794,9 +777,16 @@ def _errback(fail):
                     print("Connection to Evennia timed out. Try again.")
                     _reactor_stop()
             else:
-                reactor.callLater(rate, wait_for_status,
-                                  portal_running, server_running,
-                                  callback, errback, rate, retries - 1)
+                reactor.callLater(
+                    rate,
+                    wait_for_status,
+                    portal_running,
+                    server_running,
+                    callback,
+                    errback,
+                    rate,
+                    retries - 1,
+                )
 
     return send_instruction(PSTATUS, None, _callback, _errback)
 
@@ -833,8 +823,11 @@ def _server_started(response):
         _reactor_stop()
 
     def _portal_started(*args):
-        print("... Portal started.\nServer starting {} ...".format(
-            "(under cProfile)" if sprofiler else ""))
+        print(
+            "... Portal started.\nServer starting {} ...".format(
+                "(under cProfile)" if sprofiler else ""
+            )
+        )
         wait_for_status_reply(_server_started)
         send_instruction(SSTART, server_cmd)
 
@@ -854,8 +847,7 @@ def _portal_not_running(fail):
             if _is_windows():
                 # Windows requires special care
                 create_no_window = 0x08000000
-                Popen(portal_cmd, env=getenv(), bufsize=-1,
-                      creationflags=create_no_window)
+                Popen(portal_cmd, env=getenv(), bufsize=-1, creationflags=create_no_window)
             else:
                 Popen(portal_cmd, env=getenv(), bufsize=-1)
         except Exception as e:
@@ -913,6 +905,7 @@ def stop_evennia():
     This instructs the Portal to stop the Server and then itself.
 
     """
+
     def _portal_stopped(*args):
         print("... Portal stopped.\nEvennia shut down.")
         _reactor_stop()
@@ -995,6 +988,7 @@ def start_server_interactive():
     Start the Server under control of the launcher process (foreground)
 
     """
+
     def _iserver():
         _, server_twistd_cmd = _get_twistd_cmdline(False, False)
         server_twistd_cmd.append("--nodaemon")
@@ -1023,6 +1017,7 @@ def start_portal_interactive():
         portal application in evennia/server/portal/portal.py.
 
     """
+
     def _iportal(fail):
         portal_twistd_cmd, server_twistd_cmd = _get_twistd_cmdline(False, False)
         portal_twistd_cmd.append("--nodaemon")
@@ -1031,8 +1026,7 @@ def _iportal(fail):
         if _is_windows():
             # Windows requires special care
             create_no_window = 0x08000000
-            Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
-                  creationflags=create_no_window)
+            Popen(server_twistd_cmd, env=getenv(), bufsize=-1, creationflags=create_no_window)
         else:
             Popen(server_twistd_cmd, env=getenv(), bufsize=-1)
 
@@ -1062,6 +1056,7 @@ def stop_server_only(when_stopped=None, interactive=False):
             mechanism.
 
     """
+
     def _server_stopped(*args):
         if when_stopped:
             when_stopped()
@@ -1099,6 +1094,7 @@ def query_info():
     Display the info strings from the running Evennia
 
     """
+
     def _got_status(status):
         _, _, _, _, pinfo, sinfo = _parse_status(status)
         _print_info(pinfo, sinfo)
@@ -1154,8 +1150,10 @@ def _block(filehandle, size=65536):
 
         if new_linecount < old_linecount:
             # this happens if the file was cycled or manually deleted/edited.
-            print(" ** Log file {filename} has cycled or been edited. "
-                  "Restarting log. ".format(filehandle.name))
+            print(
+                " ** Log file {filename} has cycled or been edited. "
+                "Restarting log. ".format(filehandle.name)
+            )
             new_linecount = 0
             old_linecount = 0
 
@@ -1191,7 +1189,7 @@ def _tail_file(filename, file_size, line_count, max_lines=None):
 
         if has_changed:
             try:
-                with open(filename, 'r') as filehandle:
+                with open(filename, "r") as filehandle:
                     new_lines, line_count = _get_new_lines(filehandle, line_count)
             except IOError:
                 # the log file might not exist yet. Wait a little, then try again ...
@@ -1236,9 +1234,11 @@ def evennia_version():
         # even if evennia is not found, we should not crash here.
         pass
     try:
-        rev = check_output(
-            "git rev-parse --short HEAD",
-            shell=True, cwd=EVENNIA_ROOT, stderr=STDOUT).strip().decode()
+        rev = (
+            check_output("git rev-parse --short HEAD", shell=True, cwd=EVENNIA_ROOT, stderr=STDOUT)
+            .strip()
+            .decode()
+        )
         version = "%s (rev %s)" % (version, rev)
     except (IOError, CalledProcessError, OSError):
         # move on if git is not answering
@@ -1268,10 +1268,10 @@ def check_main_evennia_dependencies():
     # Twisted
     try:
         import twisted
+
         tversion = twisted.version.short()
         if LooseVersion(tversion) < LooseVersion(TWISTED_MIN):
-            print(ERROR_TWISTED_VERSION.format(
-                tversion=tversion, twisted_min=TWISTED_MIN))
+            print(ERROR_TWISTED_VERSION.format(tversion=tversion, twisted_min=TWISTED_MIN))
             error = True
     except ImportError:
         print(ERROR_NOTWISTED)
@@ -1282,15 +1282,12 @@ def check_main_evennia_dependencies():
         # only the main version (1.5, not 1.5.4.0)
         dversion_main = ".".join(dversion.split(".")[:3])
         if LooseVersion(dversion) < LooseVersion(DJANGO_MIN):
-            print(ERROR_DJANGO_MIN.format(
-                dversion=dversion_main, django_min=DJANGO_MIN))
+            print(ERROR_DJANGO_MIN.format(dversion=dversion_main, django_min=DJANGO_MIN))
             error = True
         elif LooseVersion(DJANGO_MIN) <= LooseVersion(dversion) < LooseVersion(DJANGO_REC):
-            print(NOTE_DJANGO_MIN.format(
-                dversion=dversion_main, django_rec=DJANGO_REC))
+            print(NOTE_DJANGO_MIN.format(dversion=dversion_main, django_rec=DJANGO_REC))
         elif LooseVersion(DJANGO_REC) < LooseVersion(dversion_main):
-            print(NOTE_DJANGO_NEW.format(
-                dversion=dversion_main, django_rec=DJANGO_REC))
+            print(NOTE_DJANGO_NEW.format(dversion=dversion_main, django_rec=DJANGO_REC))
     except ImportError:
         print(ERROR_NODJANGO)
         error = True
@@ -1331,9 +1328,14 @@ def create_secret_key():
     """
     import random
     import string
-    secret_key = list((string.ascii_letters +
-                       string.digits + string.punctuation).replace("\\", "")
-                      .replace("'", '"').replace("{", "_").replace("}", "-"))
+
+    secret_key = list(
+        (string.ascii_letters + string.digits + string.punctuation)
+        .replace("\\", "")
+        .replace("'", '"')
+        .replace("{", "_")
+        .replace("}", "-")
+    )
     random.shuffle(secret_key)
     secret_key = "".join(secret_key[:40])
     return secret_key
@@ -1353,36 +1355,39 @@ def create_settings_file(init=True, secret_settings=False):
     """
     if secret_settings:
         settings_path = os.path.join(GAMEDIR, "server", "conf", "secret_settings.py")
-        setting_dict = {"secret_key": "\'%s\'" % create_secret_key()}
+        setting_dict = {"secret_key": "'%s'" % create_secret_key()}
     else:
         settings_path = os.path.join(GAMEDIR, "server", "conf", "settings.py")
         setting_dict = {
             "settings_default": os.path.join(EVENNIA_LIB, "settings_default.py"),
-            "servername": "\"%s\"" % GAMEDIR.rsplit(os.path.sep, 1)[1],
-            "secret_key": "\'%s\'" % create_secret_key()}
+            "servername": '"%s"' % GAMEDIR.rsplit(os.path.sep, 1)[1],
+            "secret_key": "'%s'" % create_secret_key(),
+        }
 
     if not init:
         # if not --init mode, settings file may already exist from before
         if os.path.exists(settings_path):
             inp = eval(input("%s already exists. Do you want to reset it? y/[N]> " % settings_path))
-            if not inp.lower() == 'y':
+            if not inp.lower() == "y":
                 print("Aborted.")
                 return
             else:
                 print("Reset the settings file.")
 
         if secret_settings:
-            default_settings_path = os.path.join(EVENNIA_TEMPLATE, "server", "conf", "secret_settings.py")
+            default_settings_path = os.path.join(
+                EVENNIA_TEMPLATE, "server", "conf", "secret_settings.py"
+            )
         else:
             default_settings_path = os.path.join(EVENNIA_TEMPLATE, "server", "conf", "settings.py")
         shutil.copy(default_settings_path, settings_path)
 
-    with open(settings_path, 'r') as f:
+    with open(settings_path, "r") as f:
         settings_string = f.read()
 
     settings_string = settings_string.format(**setting_dict)
 
-    with open(settings_path, 'w') as f:
+    with open(settings_path, "w") as f:
         f.write(settings_string)
 
 
@@ -1404,8 +1409,7 @@ def create_game_directory(dirname):
     # copy template directory
     shutil.copytree(EVENNIA_TEMPLATE, GAMEDIR)
     # rename gitignore to .gitignore
-    os.rename(os.path.join(GAMEDIR, 'gitignore'),
-              os.path.join(GAMEDIR, '.gitignore'))
+    os.rename(os.path.join(GAMEDIR, "gitignore"), os.path.join(GAMEDIR, ".gitignore"))
 
     # pre-build settings file in the new GAMEDIR
     create_settings_file()
@@ -1419,7 +1423,8 @@ def create_superuser():
     """
     print(
         "\nCreate a superuser below. The superuser is Account #1, the 'owner' "
-        "account of the server. Email is optional and can be empty.\n")
+        "account of the server. Email is optional and can be empty.\n"
+    )
     django.core.management.call_command("createsuperuser", interactive=True)
 
 
@@ -1432,14 +1437,16 @@ def check_database():
     """
     # Check so a database exists and is accessible
     from django.db import connection
+
     tables = connection.introspection.get_table_list(connection.cursor())
     if not tables or not isinstance(tables[0], str):  # django 1.8+
         tables = [tableinfo.name for tableinfo in tables]
-    if tables and 'accounts_accountdb' in tables:
+    if tables and "accounts_accountdb" in tables:
         # database exists and seems set up. Initialize evennia.
         evennia._init()
     # Try to get Account#1
     from evennia.accounts.models import AccountDB
+
     try:
         AccountDB.objects.get(id=1)
     except django.db.utils.OperationalError as e:
@@ -1459,8 +1466,7 @@ def check_database():
             other = other_superuser[0]
             other_id = other.id
             other_key = other.username
-            print(WARNING_MOVING_SUPERUSER.format(
-                other_key=other_key, other_id=other_id))
+            print(WARNING_MOVING_SUPERUSER.format(other_key=other_key, other_id=other_id))
             res = ""
             while res.upper() != "Y":
                 # ask for permission
@@ -1471,6 +1477,7 @@ def check_database():
                     break
             # continue with the
             from copy import deepcopy
+
             new = deepcopy(other)
             other.delete()
             new.id = 1
@@ -1491,7 +1498,7 @@ def getenv():
     """
     sep = ";" if _is_windows() else ":"
     env = os.environ.copy()
-    env['PYTHONPATH'] = sep.join(sys.path)
+    env["PYTHONPATH"] = sep.join(sys.path)
     return env
 
 
@@ -1508,7 +1515,7 @@ def get_pid(pidfile, default=None):
 
     """
     if os.path.exists(pidfile):
-        with open(pidfile, 'r') as f:
+        with open(pidfile, "r") as f:
             pid = f.read()
             return pid
     return default
@@ -1528,7 +1535,7 @@ def del_pid(pidfile):
         os.remove(pidfile)
 
 
-def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SIG):
+def kill(pidfile, component="Server", callback=None, errback=None, killsignal=SIG):
     """
     Send a kill signal to a process based on PID. A customized
     success/error message will be returned. If clean=True, the system
@@ -1546,12 +1553,13 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
         callback (callable, optional): Called if kill signal was sent successfully.
             This is ignored on Windows.
         killsignal (int, optional): Signal identifier for signal to send. This is
-            Ignored on Windows.
+            ignored on Windows.
 
     """
     if _is_windows():
         # Windows signal sending is very limited.
         from win32api import GenerateConsoleCtrlEvent, SetConsoleCtrlHandler
+
         try:
             # Windows can only send a SIGINT-like signal to
             # *every* process spawned off the same console, so we must
@@ -1572,10 +1580,13 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
             try:
                 os.kill(int(pid), killsignal)
             except OSError:
-                print("{component} ({pid}) cannot be stopped. "
-                      "The PID file '{pidfile}' seems stale. "
-                      "Try removing it manually.".format(
-                          component=component, pid=pid, pidfile=pidfile))
+                print(
+                    "{component} ({pid}) cannot be stopped. "
+                    "The PID file '{pidfile}' seems stale. "
+                    "Try removing it manually.".format(
+                        component=component, pid=pid, pidfile=pidfile
+                    )
+                )
                 return
             if callback:
                 callback()
@@ -1585,8 +1596,10 @@ def kill(pidfile, component='Server', callback=None, errback=None, killsignal=SI
         if errback:
             errback()
         else:
-            print("Could not send kill signal - {component} does "
-                  "not appear to be running.".format(component=component))
+            print(
+                "Could not send kill signal - {component} does "
+                "not appear to be running.".format(component=component)
+            )
 
 
 def show_version_info(about=False):
@@ -1604,13 +1617,16 @@ def show_version_info(about=False):
     import twisted
 
     return VERSION_INFO.format(
-        version=EVENNIA_VERSION, about=ABOUT_INFO if about else "",
-        os=os.name, python=sys.version.split()[0],
+        version=EVENNIA_VERSION,
+        about=ABOUT_INFO if about else "",
+        os=os.name,
+        python=sys.version.split()[0],
         twisted=twisted.version.short(),
-        django=django.get_version())
+        django=django.get_version(),
+    )
 
 
-def error_check_python_modules():
+def error_check_python_modules(show_warnings=False):
     """
     Import settings modules in settings. This will raise exceptions on
     pure python-syntax issues which are hard to catch gracefully with
@@ -1618,6 +1634,9 @@ def error_check_python_modules():
     python source files themselves). Best they fail already here
     before we get any further.
 
+    Kwargs:
+        show_warnings (bool): If non-fatal warning messages should be shown.
+
     """
 
     from django.conf import settings
@@ -1626,18 +1645,21 @@ def _imp(path, split=True):
         "helper method"
         mod, fromlist = path, "None"
         if split:
-            mod, fromlist = path.rsplit('.', 1)
+            mod, fromlist = path.rsplit(".", 1)
         __import__(mod, fromlist=[fromlist])
 
     # check the historical deprecations
     from evennia.server import deprecations
+
     try:
         deprecations.check_errors(settings)
-        deprecations.check_warnings(settings)
     except DeprecationWarning as err:
         print(err)
         sys.exit()
 
+    if show_warnings:
+        deprecations.check_warnings(settings)
+
     # core modules
     _imp(settings.COMMAND_PARSER)
     _imp(settings.SEARCH_AT_RESULT)
@@ -1647,6 +1669,7 @@ def _imp(path, split=True):
         _imp(path, split=False)
 
     from evennia.commands import cmdsethandler
+
     if not cmdsethandler.import_cmdset(settings.CMDSET_UNLOGGEDIN, None):
         print("Warning: CMDSET_UNLOGGED failed to load!")
     if not cmdsethandler.import_cmdset(settings.CMDSET_CHARACTER, None):
@@ -1668,6 +1691,7 @@ def _imp(path, split=True):
 #
 # ------------------------------------------------------------
 
+
 def init_game_directory(path, check_db=True, need_gamedir=True):
     """
     Try to analyze the given path to find settings.py - this defines
@@ -1691,12 +1715,12 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
     if TEST_MODE or not need_gamedir:
         if ENFORCED_SETTING:
             print(NOTE_TEST_CUSTOM.format(settings_dotpath=SETTINGS_DOTPATH))
-            os.environ['DJANGO_SETTINGS_MODULE'] = SETTINGS_DOTPATH
+            os.environ["DJANGO_SETTINGS_MODULE"] = SETTINGS_DOTPATH
         else:
             print(NOTE_TEST_DEFAULT)
-            os.environ['DJANGO_SETTINGS_MODULE'] = 'evennia.settings_default'
+            os.environ["DJANGO_SETTINGS_MODULE"] = "evennia.settings_default"
     else:
-        os.environ['DJANGO_SETTINGS_MODULE'] = SETTINGS_DOTPATH
+        os.environ["DJANGO_SETTINGS_MODULE"] = SETTINGS_DOTPATH
 
     # required since django1.7
     django.setup()
@@ -1707,6 +1731,7 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
     except Exception as ex:
         if not str(ex).startswith("No module named"):
             import traceback
+
             print(traceback.format_exc().strip())
         print(ERROR_SETTINGS)
         sys.exit()
@@ -1746,11 +1771,15 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
 
     # verify existence of log file dir (this can be missing e.g.
     # if the game dir itself was cloned since log files are in .gitignore)
-    logdirs = [logfile.rsplit(os.path.sep, 1)
-               for logfile in (SERVER_LOGFILE, PORTAL_LOGFILE, HTTP_LOGFILE)]
+    logdirs = [
+        logfile.rsplit(os.path.sep, 1) for logfile in (SERVER_LOGFILE, PORTAL_LOGFILE, HTTP_LOGFILE)
+    ]
     if not all(os.path.isdir(pathtup[0]) for pathtup in logdirs):
-        errstr = "\n    ".join("%s (log file %s)" % (pathtup[0], pathtup[1]) for pathtup in logdirs
-                               if not os.path.isdir(pathtup[0]))
+        errstr = "\n    ".join(
+            "%s (log file %s)" % (pathtup[0], pathtup[1])
+            for pathtup in logdirs
+            if not os.path.isdir(pathtup[0])
+        )
         print(ERROR_LOGDIR_MISSING.format(logfiles=errstr))
         sys.exit()
 
@@ -1789,12 +1818,14 @@ def init_game_directory(path, check_db=True, need_gamedir=True):
             # Update: In 2016, it seems Twisted 16 has changed the name of
             # of its executable from 'twistd.py' to 'twistd.exe'.
             twistd_path = os.path.abspath(
-                os.path.join(twistd_dir, os.pardir, os.pardir, os.pardir,
-                             os.pardir, 'scripts', 'twistd.exe'))
+                os.path.join(
+                    twistd_dir, os.pardir, os.pardir, os.pardir, os.pardir, "scripts", "twistd.exe"
+                )
+            )
 
-            with open(batpath, 'w') as bat_file:
+            with open(batpath, "w") as bat_file:
                 # build a custom bat file for windows
-                bat_file.write("@\"%s\" %%*" % twistd_path)
+                bat_file.write('@"%s" %%*' % twistd_path)
 
             print(INFO_WINDOWS_BATFILE.format(twistd_path=twistd_path))
 
@@ -1831,6 +1862,7 @@ def run_connect_wizard():
 
     """
     from .connection_wizard import ConnectionWizard, node_start
+
     wizard = ConnectionWizard()
     node_start(wizard)
 
@@ -1854,13 +1886,12 @@ def list_settings(keys):
         table = evtable.EvTable()
         confs = [key for key in sorted(evsettings.__dict__) if key.isupper()]
         for i in range(0, len(confs), 4):
-            table.add_row(*confs[i:i + 4])
+            table.add_row(*confs[i : i + 4])
     else:
         # a specific key
         table = evtable.EvTable(width=131)
         keys = [key.upper() for key in keys]
-        confs = dict((key, var) for key, var in evsettings.__dict__.items()
-                     if key in keys)
+        confs = dict((key, var) for key, var in evsettings.__dict__.items() if key in keys)
         for key, val in confs.items():
             table.add_row(key, str(val))
     print(table)
@@ -1881,13 +1912,13 @@ def run_menu():
         inp = input(" option > ")
 
         # quitting and help
-        if inp.lower() == 'q':
+        if inp.lower() == "q":
             return
-        elif inp.lower() == 'h':
+        elif inp.lower() == "h":
             print(HELP_ENTRY)
             eval(input("press <return> to continue ..."))
             continue
-        elif inp.lower() in ('v', 'i', 'a'):
+        elif inp.lower() in ("v", "i", "a"):
             print(show_version_info(about=True))
             eval(input("press <return> to continue ..."))
             continue
@@ -1914,30 +1945,34 @@ def run_menu():
             if _is_windows():
                 print("This option is not supported on Windows.")
             else:
-                kill(SERVER_PIDFILE, 'Server')
+                kill(SERVER_PIDFILE, "Server")
         elif inp == 8:
             if _is_windows():
                 print("This option is not supported on Windows.")
             else:
-                kill(SERVER_PIDFILE, 'Server')
-                kill(PORTAL_PIDFILE, 'Portal')
+                kill(SERVER_PIDFILE, "Server")
+                kill(PORTAL_PIDFILE, "Portal")
         elif inp == 9:
             if not SERVER_LOGFILE:
                 init_game_directory(CURRENT_DIR, check_db=False)
             tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, 20, 20)
-            print("   Tailing logfiles {} (Ctrl-C to exit) ...".format(
-                _file_names_compact(SERVER_LOGFILE, PORTAL_LOGFILE)))
+            print(
+                "   Tailing logfiles {} (Ctrl-C to exit) ...".format(
+                    _file_names_compact(SERVER_LOGFILE, PORTAL_LOGFILE)
+                )
+            )
         elif inp == 10:
             query_status()
         elif inp == 11:
             query_info()
         elif inp == 12:
             print("Running 'evennia --settings settings.py test .' ...")
-            Popen([sys.executable, __file__, '--settings', 'settings.py', 'test', '.'],
-                  env=getenv()).wait()
+            Popen(
+                [sys.executable, __file__, "--settings", "settings.py", "test", "."], env=getenv()
+            ).wait()
         elif inp == 13:
             print("Running 'evennia test evennia' ...")
-            Popen([sys.executable, __file__, 'test', 'evennia'], env=getenv()).wait()
+            Popen([sys.executable, __file__, "test", "evennia"], env=getenv()).wait()
         else:
             print("Not a valid option.")
             continue
@@ -1953,49 +1988,91 @@ def main():
 
     parser = ArgumentParser(description=CMDLINE_HELP, formatter_class=argparse.RawTextHelpFormatter)
     parser.add_argument(
-        '--gamedir', nargs=1, action='store', dest='altgamedir',
+        "--gamedir",
+        nargs=1,
+        action="store",
+        dest="altgamedir",
         metavar="<path>",
-        help="location of gamedir (default: current location)")
+        help="location of gamedir (default: current location)",
+    )
     parser.add_argument(
-        '--init', action='store', dest="init", metavar="<gamename>",
-        help="creates a new gamedir 'name' at current location")
+        "--init",
+        action="store",
+        dest="init",
+        metavar="<gamename>",
+        help="creates a new gamedir 'name' at current location",
+    )
     parser.add_argument(
-        '--log', '-l', action='store_true', dest='tail_log', default=False,
-        help="tail the portal and server logfiles and print to stdout")
+        "--log",
+        "-l",
+        action="store_true",
+        dest="tail_log",
+        default=False,
+        help="tail the portal and server logfiles and print to stdout",
+    )
     parser.add_argument(
-        '--list', nargs='+', action='store', dest='listsetting', metavar="all|<key>",
-        help=("list settings, use 'all' to list all available keys"))
+        "--list",
+        nargs="+",
+        action="store",
+        dest="listsetting",
+        metavar="all|<key>",
+        help=("list settings, use 'all' to list all available keys"),
+    )
     parser.add_argument(
-        '--settings', nargs=1, action='store', dest='altsettings',
-        default=None, metavar="<path>",
-        help=("start evennia with alternative settings file from\n"
-              " gamedir/server/conf/. (default is settings.py)"))
+        "--settings",
+        nargs=1,
+        action="store",
+        dest="altsettings",
+        default=None,
+        metavar="<path>",
+        help=(
+            "start evennia with alternative settings file from\n"
+            " gamedir/server/conf/. (default is settings.py)"
+        ),
+    )
     parser.add_argument(
-        '--initsettings', action='store_true', dest="initsettings",
+        "--initsettings",
+        action="store_true",
+        dest="initsettings",
         default=False,
-        help="create a new, empty settings file as\n gamedir/server/conf/settings.py")
+        help="create a new, empty settings file as\n gamedir/server/conf/settings.py",
+    )
     parser.add_argument(
-        '--initmissing', action='store_true', dest="initmissing",
+        "--initmissing",
+        action="store_true",
+        dest="initmissing",
         default=False,
-        help="checks for missing secret_settings or server logs\n directory, and adds them if needed")
+        help="checks for missing secret_settings or server logs\n directory, and adds them if needed",
+    )
     parser.add_argument(
-        '--profiler', action='store_true', dest='profiler', default=False,
-        help="start given server component under the Python profiler")
+        "--profiler",
+        action="store_true",
+        dest="profiler",
+        default=False,
+        help="start given server component under the Python profiler",
+    )
     parser.add_argument(
-        '--dummyrunner', nargs=1, action='store', dest='dummyrunner',
+        "--dummyrunner",
+        nargs=1,
+        action="store",
+        dest="dummyrunner",
         metavar="<N>",
-        help="test a server by connecting <N> dummy accounts to it")
+        help="test a server by connecting <N> dummy accounts to it",
+    )
     parser.add_argument(
-        '-v', '--version', action='store_true',
-        dest='show_version', default=False,
-        help="show version info")
+        "-v",
+        "--version",
+        action="store_true",
+        dest="show_version",
+        default=False,
+        help="show version info",
+    )
 
-    parser.add_argument(
-        "operation", nargs='?', default="noop",
-        help=ARG_OPTIONS)
+    parser.add_argument("operation", nargs="?", default="noop", help=ARG_OPTIONS)
     parser.epilog = (
         "Common Django-admin commands are shell, dbshell, test and migrate.\n"
-        "See the Django documentation for more management commands.")
+        "See the Django documentation for more management commands."
+    )
 
     args, unknown_args = parser.parse_known_args()
 
@@ -2022,9 +2099,11 @@ def main():
     if args.init:
         # initialization of game directory
         create_game_directory(args.init)
-        print(CREATED_NEW_GAMEDIR.format(
-            gamedir=args.init,
-            settings_path=os.path.join(args.init, SETTINGS_PATH)))
+        print(
+            CREATED_NEW_GAMEDIR.format(
+                gamedir=args.init, settings_path=os.path.join(args.init, SETTINGS_PATH)
+            )
+        )
         sys.exit()
 
     if args.show_version:
@@ -2039,8 +2118,7 @@ def main():
         SETTINGSFILE = sfile
         ENFORCED_SETTING = True
         SETTINGS_DOTPATH = "server.conf.%s" % sfile.rstrip(".py")
-        print("Using settings file '%s' (%s)." % (
-            SETTINGSFILE, SETTINGS_DOTPATH))
+        print("Using settings file '%s' (%s)." % (SETTINGSFILE, SETTINGS_DOTPATH))
 
     if args.initsettings:
         # create new settings file
@@ -2052,16 +2130,24 @@ def main():
         sys.exit()
 
     if args.initmissing:
+        created = False
         try:
             log_path = os.path.join(SERVERDIR, "logs")
             if not os.path.exists(log_path):
                 os.makedirs(log_path)
+                print(f"    ... Created missing log dir {log_path}.")
+                created = True
 
             settings_path = os.path.join(CONFDIR, "secret_settings.py")
             if not os.path.exists(settings_path):
                 create_settings_file(init=False, secret_settings=True)
+                print(f"    ... Created missing secret_settings.py file as {settings_path}.")
+                created = True
 
-            print(RECREATED_MISSING)
+            if created:
+                print(RECREATED_MISSING)
+            else:
+                print("    ... No missing resources to create/init. You are good to go.")
         except IOError:
             print(ERROR_INITMISSING)
         sys.exit()
@@ -2075,12 +2161,15 @@ def main():
 
         # adjust how many lines we show from existing logs
         start_lines1, start_lines2 = 20, 20
-        if option not in ('reload', 'reset', 'noop'):
+        if option not in ("reload", "reset", "noop"):
             start_lines1, start_lines2 = 0, 0
 
         tail_log_files(PORTAL_LOGFILE, SERVER_LOGFILE, start_lines1, start_lines2)
-        print("   Tailing logfiles {} (Ctrl-C to exit) ...".format(
-            _file_names_compact(SERVER_LOGFILE, PORTAL_LOGFILE)))
+        print(
+            "   Tailing logfiles {} (Ctrl-C to exit) ...".format(
+                _file_names_compact(SERVER_LOGFILE, PORTAL_LOGFILE)
+            )
+        )
     if args.dummyrunner:
         # launch the dummy runner
         init_game_directory(CURRENT_DIR, check_db=True)
@@ -2089,12 +2178,27 @@ def main():
         # display all current server settings
         init_game_directory(CURRENT_DIR, check_db=False)
         list_settings(args.listsetting)
-    elif option == 'menu':
+    elif option == "menu":
         # launch menu for operation
         init_game_directory(CURRENT_DIR, check_db=True)
         run_menu()
-    elif option in ('status', 'info', 'start', 'istart', 'ipstart', 'reload', 'restart', 'reboot',
-                    'reset', 'stop', 'sstop', 'kill', 'skill', 'sstart', 'connections'):
+    elif option in (
+        "status",
+        "info",
+        "start",
+        "istart",
+        "ipstart",
+        "reload",
+        "restart",
+        "reboot",
+        "reset",
+        "stop",
+        "sstop",
+        "kill",
+        "skill",
+        "sstart",
+        "connections",
+    ):
         # operate the server directly
         if not SERVER_LOGFILE:
             init_game_directory(CURRENT_DIR, check_db=True)
@@ -2104,38 +2208,38 @@ def main():
             query_info()
         elif option == "start":
             init_game_directory(CURRENT_DIR, check_db=True)
-            error_check_python_modules()
+            error_check_python_modules(show_warnings=args.tail_log)
             start_evennia(args.profiler, args.profiler)
         elif option == "istart":
             init_game_directory(CURRENT_DIR, check_db=True)
-            error_check_python_modules()
+            error_check_python_modules(show_warnings=args.tail_log)
             start_server_interactive()
         elif option == "ipstart":
             start_portal_interactive()
-        elif option in ('reload', 'restart'):
+        elif option in ("reload", "restart"):
             reload_evennia(args.profiler)
-        elif option == 'reboot':
+        elif option == "reboot":
             reboot_evennia(args.profiler, args.profiler)
-        elif option == 'reset':
+        elif option == "reset":
             reload_evennia(args.profiler, reset=True)
-        elif option == 'stop':
+        elif option == "stop":
             stop_evennia()
-        elif option == 'sstop':
+        elif option == "sstop":
             stop_server_only()
-        elif option == 'sstart':
+        elif option == "sstart":
             start_only_server()
-        elif option == 'kill':
+        elif option == "kill":
             if _is_windows():
                 print("This option is not supported on Windows.")
             else:
-                kill(SERVER_PIDFILE, 'Server')
-                kill(PORTAL_PIDFILE, 'Portal')
-        elif option == 'skill':
+                kill(SERVER_PIDFILE, "Server")
+                kill(PORTAL_PIDFILE, "Portal")
+        elif option == "skill":
             if _is_windows():
                 print("This option is not supported on Windows.")
             else:
-                kill(SERVER_PIDFILE, 'Server')
-        elif option == 'connections':
+                kill(SERVER_PIDFILE, "Server")
+        elif option == "connections":
             run_connect_wizard()
 
     elif option != "noop":
@@ -2143,11 +2247,11 @@ def main():
         check_db = False
         need_gamedir = True
         # some commands don't require the presence of a game directory to work
-        if option in ('makemessages', 'compilemessages'):
+        if option in ("makemessages", "compilemessages"):
             need_gamedir = False
 
         # handle special django commands
-        if option in ('runserver', 'testserver'):
+        if option in ("runserver", "testserver"):
             print(WARNING_RUNSERVER)
         if option in ("shell", "check"):
             # some django commands requires the database to exist,
@@ -2167,7 +2271,7 @@ def main():
             # pass on to the core django manager - re-parse the entire input line
             # but keep 'evennia' as the name instead of django-admin. This is
             # an exit condition.
-            sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
+            sys.argv[0] = re.sub(r"(-script\.pyw?|\.exe)?$", "", sys.argv[0])
             sys.exit(execute_from_command_line())
 
     elif not args.tail_log:
@@ -2178,6 +2282,6 @@ def main():
         reactor.run()
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     # start Evennia from the command line
     main()
diff --git a/evennia/server/evennia_runner.py b/evennia/server/evennia_runner.py
index c17dde70458..eac473efa49 100644
--- a/evennia/server/evennia_runner.py
+++ b/evennia/server/evennia_runner.py
@@ -36,8 +36,8 @@
 EVENNIA_BIN = os.path.join(EVENNIA_ROOT, "bin")
 EVENNIA_LIB = os.path.dirname(evennia.__file__)
 
-SERVER_PY_FILE = os.path.join(EVENNIA_LIB, 'server', 'server.py')
-PORTAL_PY_FILE = os.path.join(EVENNIA_LIB, 'server', 'portal', 'portal.py')
+SERVER_PY_FILE = os.path.join(EVENNIA_LIB, "server", "server.py")
+PORTAL_PY_FILE = os.path.join(EVENNIA_LIB, "server", "portal", "portal.py")
 
 GAMEDIR = None
 SERVERDIR = "server"
@@ -53,8 +53,7 @@
 
 # messages
 
-CMDLINE_HELP = \
-    """
+CMDLINE_HELP = """
     This program manages the running Evennia processes. It is called
     by evennia and should not be started manually. Its main task is to
     sit and watch the Server and restart it whenever the user reloads.
@@ -63,13 +62,11 @@
     are stored in the game's server/ directory.
     """
 
-PROCESS_ERROR = \
-    """
+PROCESS_ERROR = """
     {component} process error: {traceback}.
     """
 
-PROCESS_IOERROR = \
-    """
+PROCESS_IOERROR = """
     {component} IOError: {traceback}
     One possible explanation is that 'twistd' was not found.
     """
@@ -85,7 +82,7 @@ def set_restart_mode(restart_file, flag="reload"):
     """
     This sets a flag file for the restart mode.
     """
-    with open(restart_file, 'w') as f:
+    with open(restart_file, "w") as f:
         f.write(str(flag))
 
 
@@ -96,7 +93,7 @@ def getenv():
     sep = ";" if os.name == "nt" else ":"
     env = os.environ.copy()
     sys.path.insert(0, GAMEDIR)
-    env['PYTHONPATH'] = sep.join(sys.path)
+    env["PYTHONPATH"] = sep.join(sys.path)
     return env
 
 
@@ -105,7 +102,7 @@ def get_restart_mode(restart_file):
     Parse the server/portal restart status
     """
     if os.path.exists(restart_file):
-        with open(restart_file, 'r') as f:
+        with open(restart_file, "r") as f:
             return f.read()
     return "shutdown"
 
@@ -117,7 +114,7 @@ def get_pid(pidfile):
     """
     pid = None
     if os.path.exists(pidfile):
-        with open(pidfile, 'r') as f:
+        with open(pidfile, "r") as f:
             pid = f.read()
     return pid
 
@@ -126,7 +123,7 @@ def cycle_logfile(logfile):
     """
     Rotate the old log files to <filename>.old
     """
-    logfile_old = logfile + '.old'
+    logfile_old = logfile + ".old"
     if os.path.exists(logfile):
         # Cycle the old logfiles to *.old
         if os.path.exists(logfile_old):
@@ -134,6 +131,7 @@ def cycle_logfile(logfile):
             os.remove(logfile_old)
         os.rename(logfile, logfile_old)
 
+
 # Start program management
 
 
@@ -167,7 +165,7 @@ def portal_waiter(queue):
         try:
             if not doexit and get_restart_mode(PORTAL_RESTART) == "True":
                 # start portal as interactive, reloadable thread
-                PORTAL = _thread.start_new_thread(portal_waiter, (processes, ))
+                PORTAL = _thread.start_new_thread(portal_waiter, (processes,))
             else:
                 # normal operation: start portal as a daemon;
                 # we don't care to monitor it for restart
@@ -182,7 +180,7 @@ def portal_waiter(queue):
                 SERVER = Popen(server_argv, env=getenv())
             else:
                 # start server as a reloadable thread
-                SERVER = _thread.start_new_thread(server_waiter, (processes, ))
+                SERVER = _thread.start_new_thread(server_waiter, (processes,))
     except IOError as e:
         print(PROCESS_IOERROR.format(component="Server", traceback=e))
         return
@@ -196,6 +194,7 @@ def portal_waiter(queue):
 
         # this blocks until something is actually returned.
         from twisted.internet.error import ReactorNotRunning
+
         try:
             try:
                 message, rc = processes.get()
@@ -204,17 +203,23 @@ def portal_waiter(queue):
                 break
 
             # restart only if process stopped cleanly
-            if (message == "server_stopped" and int(rc) == 0 and
-                    get_restart_mode(SERVER_RESTART) in ("True", "reload", "reset")):
+            if (
+                message == "server_stopped"
+                and int(rc) == 0
+                and get_restart_mode(SERVER_RESTART) in ("True", "reload", "reset")
+            ):
                 print(PROCESS_RESTART.format(component="Server"))
-                SERVER = _thread.start_new_thread(server_waiter, (processes, ))
+                SERVER = _thread.start_new_thread(server_waiter, (processes,))
                 continue
 
             # normally the portal is not reloaded since it's run as a daemon.
-            if (message == "portal_stopped" and int(rc) == 0 and
-                    get_restart_mode(PORTAL_RESTART) == "True"):
+            if (
+                message == "portal_stopped"
+                and int(rc) == 0
+                and get_restart_mode(PORTAL_RESTART) == "True"
+            ):
                 print(PROCESS_RESTART.format(component="Portal"))
-                PORTAL = _thread.start_new_thread(portal_waiter, (processes, ))
+                PORTAL = _thread.start_new_thread(portal_waiter, (processes,))
                 continue
             break
         except ReactorNotRunning:
@@ -228,29 +233,66 @@ def main():
     """
 
     parser = ArgumentParser(description=CMDLINE_HELP)
-    parser.add_argument('--noserver', action='store_true', dest='noserver',
-                        default=False, help='Do not start Server process')
-    parser.add_argument('--noportal', action='store_true', dest='noportal',
-                        default=False, help='Do not start Portal process')
-    parser.add_argument('--logserver', action='store_true', dest='logserver',
-                        default=False, help='Log Server output to logfile')
-    parser.add_argument('--iserver', action='store_true', dest='iserver',
-                        default=False, help='Server in interactive mode')
-    parser.add_argument('--iportal', action='store_true', dest='iportal',
-                        default=False, help='Portal in interactive mode')
-    parser.add_argument('--pserver', action='store_true', dest='pserver',
-                        default=False, help='Profile Server')
-    parser.add_argument('--pportal', action='store_true', dest='pportal',
-                        default=False, help='Profile Portal')
-    parser.add_argument('--nologcycle', action='store_false', dest='nologcycle',
-                        default=True, help='Do not cycle log files')
-    parser.add_argument('--doexit', action='store_true', dest='doexit',
-                        default=False, help='Immediately exit after processes have started.')
-    parser.add_argument('gamedir', help="path to game dir")
-    parser.add_argument('twistdbinary', help="path to twistd binary")
-    parser.add_argument('slogfile', help="path to server log file")
-    parser.add_argument('plogfile', help="path to portal log file")
-    parser.add_argument('hlogfile', help="path to http log file")
+    parser.add_argument(
+        "--noserver",
+        action="store_true",
+        dest="noserver",
+        default=False,
+        help="Do not start Server process",
+    )
+    parser.add_argument(
+        "--noportal",
+        action="store_true",
+        dest="noportal",
+        default=False,
+        help="Do not start Portal process",
+    )
+    parser.add_argument(
+        "--logserver",
+        action="store_true",
+        dest="logserver",
+        default=False,
+        help="Log Server output to logfile",
+    )
+    parser.add_argument(
+        "--iserver",
+        action="store_true",
+        dest="iserver",
+        default=False,
+        help="Server in interactive mode",
+    )
+    parser.add_argument(
+        "--iportal",
+        action="store_true",
+        dest="iportal",
+        default=False,
+        help="Portal in interactive mode",
+    )
+    parser.add_argument(
+        "--pserver", action="store_true", dest="pserver", default=False, help="Profile Server"
+    )
+    parser.add_argument(
+        "--pportal", action="store_true", dest="pportal", default=False, help="Profile Portal"
+    )
+    parser.add_argument(
+        "--nologcycle",
+        action="store_false",
+        dest="nologcycle",
+        default=True,
+        help="Do not cycle log files",
+    )
+    parser.add_argument(
+        "--doexit",
+        action="store_true",
+        dest="doexit",
+        default=False,
+        help="Immediately exit after processes have started.",
+    )
+    parser.add_argument("gamedir", help="path to game dir")
+    parser.add_argument("twistdbinary", help="path to twistd binary")
+    parser.add_argument("slogfile", help="path to server log file")
+    parser.add_argument("plogfile", help="path to portal log file")
+    parser.add_argument("hlogfile", help="path to http log file")
 
     args = parser.parse_args()
 
@@ -275,30 +317,32 @@ def main():
     PPROFILER_LOGFILE = os.path.join(GAMEDIR, SERVERDIR, "logs", "portal.prof")
 
     # set up default project calls
-    server_argv = [TWISTED_BINARY,
-                   '--nodaemon',
-                   '--logfile=%s' % SERVER_LOGFILE,
-                   '--pidfile=%s' % SERVER_PIDFILE,
-                   '--python=%s' % SERVER_PY_FILE]
-    portal_argv = [TWISTED_BINARY,
-                   '--logfile=%s' % PORTAL_LOGFILE,
-                   '--pidfile=%s' % PORTAL_PIDFILE,
-                   '--python=%s' % PORTAL_PY_FILE]
+    server_argv = [
+        TWISTED_BINARY,
+        "--nodaemon",
+        "--logfile=%s" % SERVER_LOGFILE,
+        "--pidfile=%s" % SERVER_PIDFILE,
+        "--python=%s" % SERVER_PY_FILE,
+    ]
+    portal_argv = [
+        TWISTED_BINARY,
+        "--logfile=%s" % PORTAL_LOGFILE,
+        "--pidfile=%s" % PORTAL_PIDFILE,
+        "--python=%s" % PORTAL_PY_FILE,
+    ]
 
     # Profiling settings (read file from python shell e.g with
     # p = pstats.Stats('server.prof')
-    pserver_argv = ['--savestats',
-                    '--profiler=cprofile',
-                    '--profile=%s' % SPROFILER_LOGFILE]
-    pportal_argv = ['--savestats',
-                    '--profiler=cprofile',
-                    '--profile=%s' % PPROFILER_LOGFILE]
+    pserver_argv = ["--savestats", "--profiler=cprofile", "--profile=%s" % SPROFILER_LOGFILE]
+    pportal_argv = ["--savestats", "--profiler=cprofile", "--profile=%s" % PPROFILER_LOGFILE]
 
     # Server
 
     pid = get_pid(SERVER_PIDFILE)
     if pid and not args.noserver:
-        print("\nEvennia Server is already running as process %(pid)s. Not restarted." % {'pid': pid})
+        print(
+            "\nEvennia Server is already running as process %(pid)s. Not restarted." % {"pid": pid}
+        )
         args.noserver = True
     if args.noserver:
         server_argv = None
@@ -320,14 +364,16 @@ def main():
 
     pid = get_pid(PORTAL_PIDFILE)
     if pid and not args.noportal:
-        print("\nEvennia Portal is already running as process %(pid)s. Not restarted." % {'pid': pid})
+        print(
+            "\nEvennia Portal is already running as process %(pid)s. Not restarted." % {"pid": pid}
+        )
         args.noportal = True
     if args.noportal:
         portal_argv = None
     else:
         if args.iportal:
             # make portal interactive
-            portal_argv[1] = '--nodaemon'
+            portal_argv[1] = "--nodaemon"
             set_restart_mode(PORTAL_RESTART, True)
             print("\nStarting Evennia Portal in non-Daemon mode (output to stdout).")
         else:
@@ -343,7 +389,7 @@ def main():
         print(PROCESS_DOEXIT)
 
     # Windows fixes (Windows don't support pidfiles natively)
-    if os.name == 'nt':
+    if os.name == "nt":
         if server_argv:
             del server_argv[-2]
         if portal_argv:
@@ -353,5 +399,5 @@ def main():
     start_services(server_argv, portal_argv, doexit=args.doexit)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/evennia/server/game_index_client/client.py b/evennia/server/game_index_client/client.py
index b441355fa07..36f8bf99c4f 100644
--- a/evennia/server/game_index_client/client.py
+++ b/evennia/server/game_index_client/client.py
@@ -21,8 +21,8 @@
 from evennia.server.sessionhandler import SESSIONS
 from evennia.utils import get_evennia_version, logger
 
-_EGI_HOST = 'http://evennia-game-index.appspot.com'
-_EGI_REPORT_PATH = '/api/v1/game/check_in'
+_EGI_HOST = "http://evennia-game-index.appspot.com"
+_EGI_REPORT_PATH = "/api/v1/game/check_in"
 
 
 class EvenniaGameIndexClient(object):
@@ -56,15 +56,14 @@ def send_game_details(self):
         status_code, response_body = yield self._form_and_send_request()
         if status_code == 200:
             if not self.logged_first_connect:
-                logger.log_infomsg(
-                    "Successfully sent game details to Evennia Game Index.")
+                logger.log_infomsg("Successfully sent game details to Evennia Game Index.")
                 self.logged_first_connect = True
             return
         # At this point, either EGD is having issues or the payload we sent
         # is improperly formed (probably due to mis-configuration).
         logger.log_errmsg(
-            'Failed to send game details to Evennia Game Index. HTTP '
-            'status code was %s. Message was: %s' % (status_code, response_body)
+            "Failed to send game details to Evennia Game Index. HTTP "
+            "status code was %s. Message was: %s" % (status_code, response_body)
         )
 
         if status_code == 400 and self._on_bad_request:
@@ -80,8 +79,8 @@ def _form_and_send_request(self):
         """
         agent = Agent(reactor, pool=self._conn_pool)
         headers = {
-            b'User-Agent': [b'Evennia Game Index Client'],
-            b'Content-Type': [b'application/x-www-form-urlencoded'],
+            b"User-Agent": [b"Evennia Game Index Client"],
+            b"Content-Type": [b"application/x-www-form-urlencoded"],
         }
         egi_config = settings.GAME_INDEX_LISTING
         # We are using `or` statements below with dict.get() to avoid sending
@@ -89,27 +88,24 @@ def _form_and_send_request(self):
         try:
             values = {
                 # Game listing stuff
-                'game_name': egi_config.get('game_name', settings.SERVERNAME),
-                'game_status': egi_config['game_status'],
-                'game_website': egi_config.get('game_website', ''),
-                'short_description': egi_config['short_description'],
-                'long_description': egi_config.get('long_description', ''),
-                'listing_contact': egi_config['listing_contact'],
-
+                "game_name": egi_config.get("game_name", settings.SERVERNAME),
+                "game_status": egi_config["game_status"],
+                "game_website": egi_config.get("game_website", ""),
+                "short_description": egi_config["short_description"],
+                "long_description": egi_config.get("long_description", ""),
+                "listing_contact": egi_config["listing_contact"],
                 # How to play
-                'telnet_hostname': egi_config.get('telnet_hostname', ''),
-                'telnet_port': egi_config.get('telnet_port', ''),
-                'web_client_url': egi_config.get('web_client_url', ''),
-
+                "telnet_hostname": egi_config.get("telnet_hostname", ""),
+                "telnet_port": egi_config.get("telnet_port", ""),
+                "web_client_url": egi_config.get("web_client_url", ""),
                 # Game stats
-                'connected_account_count': SESSIONS.account_count(),
-                'total_account_count': AccountDB.objects.num_total_accounts() or 0,
-
+                "connected_account_count": SESSIONS.account_count(),
+                "total_account_count": AccountDB.objects.num_total_accounts() or 0,
                 # System info
-                'evennia_version': get_evennia_version(),
-                'python_version': platform.python_version(),
-                'django_version': django.get_version(),
-                'server_platform': platform.platform(),
+                "evennia_version": get_evennia_version(),
+                "python_version": platform.python_version(),
+                "django_version": django.get_version(),
+                "server_platform": platform.platform(),
             }
         except KeyError as err:
             raise KeyError(f"Error loading GAME_INDEX_LISTING: {err}")
@@ -117,16 +113,18 @@ def _form_and_send_request(self):
         data = urllib.parse.urlencode(values)
 
         d = agent.request(
-            b'POST', bytes(self.report_url, 'utf-8'),
+            b"POST",
+            bytes(self.report_url, "utf-8"),
             headers=Headers(headers),
-            bodyProducer=StringProducer(data))
+            bodyProducer=StringProducer(data),
+        )
 
         d.addCallback(self.handle_egd_response)
         return d
 
     def handle_egd_response(self, response):
         if 200 <= response.code < 300:
-            d = defer.succeed((response.code, 'OK'))
+            d = defer.succeed((response.code, "OK"))
         else:
             # Go through the horrifying process of getting the response body
             # out of Twisted's plumbing.
@@ -142,7 +140,7 @@ class SimpleResponseReceiver(protocol.Protocol):
 
     def __init__(self, status_code, d):
         self.status_code = status_code
-        self.buf = ''
+        self.buf = ""
         self.d = d
 
     def dataReceived(self, data):
@@ -159,7 +157,7 @@ class StringProducer(object):
     """
 
     def __init__(self, body):
-        self.body = bytes(body, 'utf-8')
+        self.body = bytes(body, "utf-8")
         self.length = len(body)
 
     def startProducing(self, consumer):
@@ -177,4 +175,5 @@ class QuietHTTP11ClientFactory(_HTTP11ClientFactory):
     """
     Silences the obnoxious factory start/stop messages in the default client.
     """
+
     noisy = False
diff --git a/evennia/server/game_index_client/service.py b/evennia/server/game_index_client/service.py
index 9e92a4c9490..0b1f8ecc473 100644
--- a/evennia/server/game_index_client/service.py
+++ b/evennia/server/game_index_client/service.py
@@ -21,13 +21,13 @@ class EvenniaGameIndexService(Service):
     to the Evennia Game Index.
 
     """
+
     # We didn't stick the Evennia prefix on here because it'd get marked as
     # a core system service.
-    name = 'GameIndexClient'
+    name = "GameIndexClient"
 
     def __init__(self):
-        self.client = EvenniaGameIndexClient(
-            on_bad_request=self._die_on_bad_request)
+        self.client = EvenniaGameIndexClient(on_bad_request=self._die_on_bad_request)
         self.loop = LoopingCall(self.client.send_game_details)
 
     def startService(self):
@@ -36,8 +36,7 @@ def startService(self):
         # Start the loop, but only after a short delay. This allows the
         # portal and the server time to sync up as far as total player counts.
         # Prevents always reporting a count of 0.
-        reactor.callLater(
-            _FIRST_UPDATE_DELAY, self.loop.start, _CLIENT_UPDATE_RATE)
+        reactor.callLater(_FIRST_UPDATE_DELAY, self.loop.start, _CLIENT_UPDATE_RATE)
 
     def stopService(self):
         if self.running == 0:
@@ -54,6 +53,6 @@ def _die_on_bad_request(self):
         Stop the service so we're not wasting resources.
         """
         logger.log_infomsg(
-            "Shutting down Evennia Game Index client service due to "
-            "invalid configuration.")
+            "Shutting down Evennia Game Index client service due to " "invalid configuration."
+        )
         self.stopService()
diff --git a/evennia/server/initial_setup.py b/evennia/server/initial_setup.py
index 759e15694a6..8f7fd3300fa 100644
--- a/evennia/server/initial_setup.py
+++ b/evennia/server/initial_setup.py
@@ -25,11 +25,13 @@
     """
 
 
-LIMBO_DESC = _("""
+LIMBO_DESC = _(
+    """
 Welcome to your new |wEvennia|n-based game! Visit http://www.evennia.com if you need
 help, want to contribute, report issues or just join the community.
 As Account #1 you can create a demo/tutorial area with |w@batchcommand tutorial_world.build|n.
-    """)
+    """
+)
 
 
 WARNING_POSTGRESQL_FIX = """
@@ -74,7 +76,9 @@ def create_objects():
     god_account.swap_typeclass(account_typeclass, clean_attributes=True)
     god_account.basetype_setup()
     god_account.at_account_creation()
-    god_account.locks.add("examine:perm(Developer);edit:false();delete:false();boot:false();msg:all()")
+    god_account.locks.add(
+        "examine:perm(Developer);edit:false();delete:false();boot:false();msg:all()"
+    )
     # this is necessary for quelling to work correctly.
     god_account.permissions.add("Developer")
 
@@ -83,14 +87,14 @@ def create_objects():
     # Create the in-game god-character for account #1 and set
     # it to exist in Limbo.
     character_typeclass = settings.BASE_CHARACTER_TYPECLASS
-    god_character = create.create_object(character_typeclass,
-                                         key=god_account.username,
-                                         nohome=True)
+    god_character = create.create_object(character_typeclass, key=god_account.username, nohome=True)
 
     god_character.id = 1
     god_character.save()
-    god_character.db.desc = _('This is User #1.')
-    god_character.locks.add("examine:perm(Developer);edit:false();delete:false();boot:false();msg:all();puppet:false()")
+    god_character.db.desc = _("This is User #1.")
+    god_character.locks.add(
+        "examine:perm(Developer);edit:false();delete:false();boot:false();msg:all();puppet:false()"
+    )
     god_character.permissions.add("Developer")
 
     god_account.attributes.add("_first_login", True)
@@ -102,7 +106,7 @@ def create_objects():
         god_account.db_playable_characters = [god_character]
 
     room_typeclass = settings.BASE_ROOM_TYPECLASS
-    limbo_obj = create.create_object(room_typeclass, _('Limbo'), nohome=True)
+    limbo_obj = create.create_object(room_typeclass, _("Limbo"), nohome=True)
     limbo_obj.id = 2
     limbo_obj.save()
     limbo_obj.db.desc = LIMBO_DESC.strip()
@@ -124,6 +128,17 @@ def create_channels():
     logger.log_info("Initial setup: Creating default channels ...")
 
     goduser = get_god_account()
+
+    channel_mudinfo = settings.CHANNEL_MUDINFO
+    if not channel_mudinfo:
+        raise RuntimeError("settings.CHANNEL_MUDINFO must be defined.")
+    channel = create.create_channel(**channel_mudinfo)
+    channel.connect(goduser)
+
+    channel_connectinfo = settings.CHANNEL_CONNECTINFO
+    if channel_connectinfo:
+        channel = create.create_channel(**channel_connectinfo)
+
     for channeldict in settings.DEFAULT_CHANNELS:
         channel = create.create_channel(**channeldict)
         channel.connect(goduser)
@@ -155,8 +170,9 @@ def collectstatic():
 
     """
     from django.core.management import call_command
+
     logger.log_info("Initial setup: Gathering static resources using 'collectstatic'")
-    call_command('collectstatic', '--noinput')
+    call_command("collectstatic", "--noinput")
 
 
 def reset_server():
@@ -169,6 +185,7 @@ def reset_server():
     """
     ServerConfig.objects.conf("server_epoch", time.time())
     from evennia.server.sessionhandler import SESSIONS
+
     logger.log_info("Initial setup complete. Restarting Server once.")
     SESSIONS.portal_reset_server()
 
@@ -193,11 +210,7 @@ def handle_setup(last_step):
     last_step = last_step or 0
 
     # setting up the list of functions to run
-    setup_queue = [create_objects,
-                   create_channels,
-                   at_initial_setup,
-                   collectstatic,
-                   reset_server]
+    setup_queue = [create_objects, create_channels, at_initial_setup, collectstatic, reset_server]
 
     # step through queue, from last completed function
     for num, setup_func in enumerate(setup_queue[last_step:]):
@@ -210,10 +223,12 @@ def handle_setup(last_step):
         except Exception:
             if last_step + num == 1:
                 from evennia.objects.models import ObjectDB
+
                 for obj in ObjectDB.objects.all():
                     obj.delete()
             elif last_step + num == 2:
                 from evennia.comms.models import ChannelDB
+
                 ChannelDB.objects.all().delete()
             raise
         # save this step
diff --git a/evennia/server/inputfuncs.py b/evennia/server/inputfuncs.py
index 4eee9911881..bdf82c07c24 100644
--- a/evennia/server/inputfuncs.py
+++ b/evennia/server/inputfuncs.py
@@ -19,7 +19,6 @@
 settings.INPUT_FUNC_MODULES.
 
 """
-from future.utils import viewkeys
 
 import importlib
 from codecs import lookup as codecs_lookup
@@ -34,7 +33,7 @@
 
 # always let "idle" work since we use this in the webclient
 _IDLE_COMMAND = settings.IDLE_COMMAND
-_IDLE_COMMAND = (_IDLE_COMMAND, ) if _IDLE_COMMAND == "idle" else (_IDLE_COMMAND, "idle")
+_IDLE_COMMAND = (_IDLE_COMMAND,) if _IDLE_COMMAND == "idle" else (_IDLE_COMMAND, "idle")
 _GA = object.__getattribute__
 _SA = object.__setattr__
 
@@ -48,6 +47,7 @@ def _NA(o):
 
 # All global functions are inputfuncs available to process inputs
 
+
 def text(session, *args, **kwargs):
     """
     Main text input from the client. This will execute a command
@@ -59,8 +59,8 @@ def text(session, *args, **kwargs):
             arguments are ignored.
 
     """
-    #from evennia.server.profiling.timetrace import timetrace
-    #text = timetrace(text, "ServerSession.data_in")
+    # from evennia.server.profiling.timetrace import timetrace
+    # text = timetrace(text, "ServerSession.data_in")
 
     txt = args[0] if args else None
 
@@ -77,11 +77,13 @@ def text(session, *args, **kwargs):
         # nick replacement
         puppet = session.puppet
         if puppet:
-            txt = puppet.nicks.nickreplace(txt,
-                                           categories=("inputline", "channel"), include_account=True)
+            txt = puppet.nicks.nickreplace(
+                txt, categories=("inputline", "channel"), include_account=True
+            )
         else:
-            txt = session.account.nicks.nickreplace(txt,
-                                                    categories=("inputline", "channel"), include_account=False)
+            txt = session.account.nicks.nickreplace(
+                txt, categories=("inputline", "channel"), include_account=False
+            )
     kwargs.pop("options", None)
     cmdhandler(session, txt, callertype="session", session=session, **kwargs)
     session.update_session_counters()
@@ -128,20 +130,33 @@ def default(session, cmdname, *args, **kwargs):
     it will get `cmdname` as the first argument.
 
     """
-    err = "Session {sessid}: Input command not recognized:\n" \
-        " name: '{cmdname}'\n" \
-        " args, kwargs: {args}, {kwargs}".format(sessid=session.sessid,
-                                                 cmdname=cmdname,
-                                                 args=args,
-                                                 kwargs=kwargs)
+    err = (
+        "Session {sessid}: Input command not recognized:\n"
+        " name: '{cmdname}'\n"
+        " args, kwargs: {args}, {kwargs}".format(
+            sessid=session.sessid, cmdname=cmdname, args=args, kwargs=kwargs
+        )
+    )
     if session.protocol_flags.get("INPUTDEBUG", False):
         session.msg(err)
     log_err(err)
 
 
-_CLIENT_OPTIONS = \
-    ("ANSI", "XTERM256", "MXP", "UTF-8", "SCREENREADER", "ENCODING", "MCCP",
-     "SCREENHEIGHT", "SCREENWIDTH", "INPUTDEBUG", "RAW", "NOCOLOR", "NOGOAHEAD")
+_CLIENT_OPTIONS = (
+    "ANSI",
+    "XTERM256",
+    "MXP",
+    "UTF-8",
+    "SCREENREADER",
+    "ENCODING",
+    "MCCP",
+    "SCREENHEIGHT",
+    "SCREENWIDTH",
+    "INPUTDEBUG",
+    "RAW",
+    "NOCOLOR",
+    "NOGOAHEAD",
+)
 
 
 def client_options(session, *args, **kwargs):
@@ -170,8 +185,7 @@ def client_options(session, *args, **kwargs):
     old_flags = session.protocol_flags
     if not kwargs or kwargs.get("get", False):
         # return current settings
-        options = dict((key, old_flags[key]) for key in old_flags
-                       if key.upper() in _CLIENT_OPTIONS)
+        options = dict((key, old_flags[key]) for key in old_flags if key.upper() in _CLIENT_OPTIONS)
         session.msg(client_options=options)
         return
 
@@ -225,19 +239,23 @@ def validate_bool(val):
             flags["RAW"] = validate_bool(value)
         elif key == "nogoahead":
             flags["NOGOAHEAD"] = validate_bool(value)
-        elif key in ('Char 1', 'Char.Skills 1', 'Char.Items 1',
-                     'Room 1', 'IRE.Rift 1', 'IRE.Composer 1'):
+        elif key in (
+            "Char 1",
+            "Char.Skills 1",
+            "Char.Items 1",
+            "Room 1",
+            "IRE.Rift 1",
+            "IRE.Composer 1",
+        ):
             # ignore mudlet's default send (aimed at IRE games)
             pass
         elif key not in ("options", "cmdid"):
-            err = _ERROR_INPUT.format(
-                name="client_settings", session=session, inp=key)
+            err = _ERROR_INPUT.format(name="client_settings", session=session, inp=key)
             session.msg(text=err)
 
     session.protocol_flags.update(flags)
     # we must update the protocol flags on the portal session copy as well
-    session.sessionhandler.session_portal_partial_sync(
-            {session.sessid: {"protocol_flags": flags}})
+    session.sessionhandler.session_portal_partial_sync({session.sessid: {"protocol_flags": flags}})
 
 
 def get_client_options(session, *args, **kwargs):
@@ -253,8 +271,9 @@ def get_inputfuncs(session, *args, **kwargs):
     it from this module alone since multiple modules could be added.
     So we get it from the sessionhandler.
     """
-    inputfuncsdict = dict((key, func.__doc__) for key, func
-                          in session.sessionhandler.get_inputfuncs().items())
+    inputfuncsdict = dict(
+        (key, func.__doc__) for key, func in session.sessionhandler.get_inputfuncs().items()
+    )
     session.msg(get_inputfuncs=inputfuncsdict)
 
 
@@ -270,6 +289,7 @@ def login(session, *args, **kwargs):
     """
     if not session.logged_in and "name" in kwargs and "password" in kwargs:
         from evennia.commands.default.unloggedin import create_normal_account
+
         account = create_normal_account(session, kwargs["name"], kwargs["password"])
         if account:
             session.sessionhandler.login(session, account)
@@ -279,7 +299,7 @@ def login(session, *args, **kwargs):
     "name": lambda obj: obj.key,
     "key": lambda obj: obj.key,
     "location": lambda obj: obj.location.key if obj.location else "None",
-    "servername": lambda obj: settings.SERVERNAME
+    "servername": lambda obj: settings.SERVERNAME,
 }
 
 
@@ -309,11 +329,11 @@ def _testrepeat(**kwargs):
         session (Session): Session to return to.
     """
     import time
+
     kwargs["session"].msg(repeat="Repeat called: %s" % time.time())
 
 
-_repeatable = {"test1": _testrepeat,  # example only
-               "test2": _testrepeat}  # "
+_repeatable = {"test1": _testrepeat, "test2": _testrepeat}  # example only  # "
 
 
 def repeat(session, *args, **kwargs):
@@ -334,14 +354,23 @@ def repeat(session, *args, **kwargs):
 
     """
     from evennia.scripts.tickerhandler import TICKER_HANDLER
+
     name = kwargs.get("callback", "")
     interval = max(5, int(kwargs.get("interval", 60)))
 
     if name in _repeatable:
         if kwargs.get("stop", False):
-            TICKER_HANDLER.remove(interval, _repeatable[name], idstring=session.sessid, persistent=False)
+            TICKER_HANDLER.remove(
+                interval, _repeatable[name], idstring=session.sessid, persistent=False
+            )
         else:
-            TICKER_HANDLER.add(interval, _repeatable[name], idstring=session.sessid, persistent=False, session=session)
+            TICKER_HANDLER.add(
+                interval,
+                _repeatable[name],
+                idstring=session.sessid,
+                persistent=False,
+                session=session,
+            )
     else:
         session.msg("Allowed repeating functions are: %s" % (", ".join(_repeatable)))
 
@@ -352,11 +381,7 @@ def unrepeat(session, *args, **kwargs):
     repeat(session, *args, **kwargs)
 
 
-_monitorable = {
-    "name": "db_key",
-    "location": "db_location",
-    "desc": "desc"
-}
+_monitorable = {"name": "db_key", "location": "db_location", "desc": "desc"}
 
 
 def _on_monitor_change(**kwargs):
@@ -364,7 +389,7 @@ def _on_monitor_change(**kwargs):
     obj = kwargs["obj"]
     name = kwargs["name"]
     session = kwargs["session"]
-    outputfunc_name = kwargs['outputfunc_name']
+    outputfunc_name = kwargs["outputfunc_name"]
 
     # the session may be None if the char quits and someone
     # else then edits the object
@@ -390,6 +415,7 @@ def monitor(session, *args, **kwargs):
 
     """
     from evennia.scripts.monitorhandler import MONITOR_HANDLER
+
     name = kwargs.get("name", None)
     outputfunc_name = kwargs("outputfunc_name", "monitor")
     if name and name in _monitorable and session.puppet:
@@ -399,9 +425,16 @@ def monitor(session, *args, **kwargs):
             MONITOR_HANDLER.remove(obj, field_name, idstring=session.sessid)
         else:
             # the handler will add fieldname and obj to the kwargs automatically
-            MONITOR_HANDLER.add(obj, field_name, _on_monitor_change, idstring=session.sessid,
-                                persistent=False, name=name, session=session,
-                                outputfunc_name=outputfunc_name)
+            MONITOR_HANDLER.add(
+                obj,
+                field_name,
+                _on_monitor_change,
+                idstring=session.sessid,
+                persistent=False,
+                name=name,
+                session=session,
+                outputfunc_name=outputfunc_name,
+            )
 
 
 def unmonitor(session, *args, **kwargs):
@@ -418,6 +451,7 @@ def monitored(session, *args, **kwargs):
 
     """
     from evennia.scripts.monitorhandler import MONITOR_HANDLER
+
     obj = session.puppet
     monitors = MONITOR_HANDLER.all(obj=obj)
     session.msg(monitored=(monitors, {}))
@@ -477,10 +511,15 @@ def webclient_options(session, *args, **kwargs):
         # Create a monitor. If a monitor already exists then it will replace
         # the previous one since it would use the same idstring
         from evennia.scripts.monitorhandler import MONITOR_HANDLER
-        MONITOR_HANDLER.add(account, "_saved_webclient_options",
-                            _on_webclient_options_change,
-                            idstring=session.sessid, persistent=False,
-                            session=session)
+
+        MONITOR_HANDLER.add(
+            account,
+            "_saved_webclient_options",
+            _on_webclient_options_change,
+            idstring=session.sessid,
+            persistent=False,
+            session=session,
+        )
     else:
         # kwargs provided: persist them to the account object
         for key, value in kwargs.items():
@@ -505,14 +544,28 @@ def msdp_list(session, *args, **kwargs):
 
     """
     from evennia.scripts.monitorhandler import MONITOR_HANDLER
+
     args_lower = [arg.lower() for arg in args]
     if "commands" in args_lower:
-        inputfuncs = [key[5:] if key.startswith("msdp_") else key
-                      for key in session.sessionhandler.get_inputfuncs().keys()]
+        inputfuncs = [
+            key[5:] if key.startswith("msdp_") else key
+            for key in session.sessionhandler.get_inputfuncs().keys()
+        ]
         session.msg(commands=(inputfuncs, {}))
     if "lists" in args_lower:
-        session.msg(lists=(['commands', 'lists', 'configurable_variables', 'reportable_variables',
-                            'reported_variables', 'sendable_variables'], {}))
+        session.msg(
+            lists=(
+                [
+                    "commands",
+                    "lists",
+                    "configurable_variables",
+                    "reportable_variables",
+                    "reported_variables",
+                    "sendable_variables",
+                ],
+                {},
+            )
+        )
     if "configurable_variables" in args_lower:
         session.msg(configurable_variables=(_CLIENT_OPTIONS, {}))
     if "reportable_variables" in args_lower:
@@ -532,7 +585,7 @@ def msdp_report(session, *args, **kwargs):
     MSDP REPORT command
 
     """
-    kwargs['outputfunc_name': 'report']
+    kwargs["outputfunc_name":"report"]
     monitor(session, *args, **kwargs)
 
 
@@ -542,3 +595,14 @@ def msdp_unreport(session, *args, **kwargs):
 
     """
     unmonitor(session, *args, **kwargs)
+
+
+# client specific
+
+
+def external_discord_hello(session, *args, **kwargs):
+    """
+    Sent by Mudlet as a greeting; added here to avoid
+    logging a missing inputfunc for it.
+    """
+    pass
diff --git a/evennia/server/migrations/0001_initial.py b/evennia/server/migrations/0001_initial.py
index 0ca07164ad9..2db772f8f19 100644
--- a/evennia/server/migrations/0001_initial.py
+++ b/evennia/server/migrations/0001_initial.py
@@ -6,21 +6,25 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='ServerConfig',
+            name="ServerConfig",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(unique=True, max_length=64)),
-                ('db_value', models.TextField(blank=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                ("db_key", models.CharField(unique=True, max_length=64)),
+                ("db_value", models.TextField(blank=True)),
             ],
             options={
-                'verbose_name': 'Server Config value',
-                'verbose_name_plural': 'Server Config values',
+                "verbose_name": "Server Config value",
+                "verbose_name_plural": "Server Config values",
             },
             bases=(models.Model,),
-        ),
+        )
     ]
diff --git a/evennia/server/migrations/0002_auto_20190128_2311.py b/evennia/server/migrations/0002_auto_20190128_2311.py
index b6b8db0f556..609e276427d 100644
--- a/evennia/server/migrations/0002_auto_20190128_2311.py
+++ b/evennia/server/migrations/0002_auto_20190128_2311.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 23:11
-from __future__ import unicode_literals
 
 from base64 import b64encode
 from django.db import migrations
@@ -11,26 +10,27 @@
 
 
 def forwards(apps, schema_editor):
-    ServerConfig = apps.get_model('server', 'ServerConfig')
+    ServerConfig = apps.get_model("server", "ServerConfig")
     for conf in ServerConfig.objects.all():
         # picklefield requires base64 encoding
-        value = loads(to_bytes(conf.db_value), encoding='bytes')   # py2->py3 byte encoding
+        value = loads(to_bytes(conf.db_value), encoding="bytes")  # py2->py3 byte encoding
         conf.db_value = b64encode(dumps(deepcopy(value), protocol=4)).decode()
-        conf.save(update_fields=['db_value'])
+        conf.save(update_fields=["db_value"])
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('server', '0001_initial'),
-    ]
+    dependencies = [("server", "0001_initial")]
 
     operations = [
         migrations.RunPython(forwards, migrations.RunPython.noop),
         migrations.AlterField(
-            model_name='serverconfig',
-            name='db_value',
-            field=evennia.utils.picklefield.PickledObjectField(help_text='The data returned when the config value is accessed. Must be written as a Python literal if editing through the admin interface. Attribute values which are not Python literals cannot be edited through the admin interface.', null=True, verbose_name='value'),
+            model_name="serverconfig",
+            name="db_value",
+            field=evennia.utils.picklefield.PickledObjectField(
+                help_text="The data returned when the config value is accessed. Must be written as a Python literal if editing through the admin interface. Attribute values which are not Python literals cannot be edited through the admin interface.",
+                null=True,
+                verbose_name="value",
+            ),
         ),
-
     ]
diff --git a/evennia/server/models.py b/evennia/server/models.py
index 80f0673e237..1dc3924c54b 100644
--- a/evennia/server/models.py
+++ b/evennia/server/models.py
@@ -18,11 +18,12 @@
 from evennia.utils import picklefield
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # ServerConfig
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class ServerConfig(WeakSharedMemoryModel):
     """
@@ -48,11 +49,13 @@ class ServerConfig(WeakSharedMemoryModel):
     # db_value = models.BinaryField(blank=True)
 
     db_value = picklefield.PickledObjectField(
-        'value', null=True,
+        "value",
+        null=True,
         help_text="The data returned when the config value is accessed. Must be "
-                  "written as a Python literal if editing through the admin "
-                  "interface. Attribute values which are not Python literals "
-                  "cannot be edited through the admin interface.")
+        "written as a Python literal if editing through the admin "
+        "interface. Attribute values which are not Python literals "
+        "cannot be edited through the admin interface.",
+    )
 
     objects = ServerConfigManager()
     _is_deleted = False
@@ -66,43 +69,45 @@ class ServerConfig(WeakSharedMemoryModel):
     # is the object in question).
 
     # key property (wraps db_key)
-    #@property
+    # @property
     def __key_get(self):
         "Getter. Allows for value = self.key"
         return self.db_key
 
-    #@key.setter
+    # @key.setter
     def __key_set(self, value):
         "Setter. Allows for self.key = value"
         self.db_key = value
         self.save()
 
-    #@key.deleter
+    # @key.deleter
     def __key_del(self):
         "Deleter. Allows for del self.key. Deletes entry."
         self.delete()
+
     key = property(__key_get, __key_set, __key_del)
 
     # value property (wraps db_value)
-    #@property
+    # @property
     def __value_get(self):
         "Getter. Allows for value = self.value"
         return from_pickle(self.db_value, db_obj=self)
 
-    #@value.setter
+    # @value.setter
     def __value_set(self, value):
         "Setter. Allows for self.value = value"
-        if utils.has_parent('django.db.models.base.Model', value):
+        if utils.has_parent("django.db.models.base.Model", value):
             # we have to protect against storing db objects.
             logger.log_err("ServerConfig cannot store db objects! (%s)" % value)
             return
         self.db_value = to_pickle(value)
         self.save()
 
-    #@value.deleter
+    # @value.deleter
     def __value_del(self):
         "Deleter. Allows for del self.value. Deletes entry."
         self.delete()
+
     value = property(__value_get, __value_set, __value_del)
 
     class Meta(object):
diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py
index 831b79ff7b9..4a96da9f25f 100644
--- a/evennia/server/portal/amp.py
+++ b/evennia/server/portal/amp.py
@@ -23,28 +23,28 @@
 # communication bits
 # (chr(9) and chr(10) are \t and \n, so skipping them)
 
-PCONN = chr(1)         # portal session connect
-PDISCONN = chr(2)      # portal session disconnect
-PSYNC = chr(3)         # portal session sync
-SLOGIN = chr(4)        # server session login
-SDISCONN = chr(5)      # server session disconnect
-SDISCONNALL = chr(6)   # server session disconnect all
-SSHUTD = chr(7)        # server shutdown
-SSYNC = chr(8)         # server session sync
-SCONN = chr(11)        # server creating new connection (for irc bots and etc)
-PCONNSYNC = chr(12)    # portal post-syncing a session
+PCONN = chr(1)  # portal session connect
+PDISCONN = chr(2)  # portal session disconnect
+PSYNC = chr(3)  # portal session sync
+SLOGIN = chr(4)  # server session login
+SDISCONN = chr(5)  # server session disconnect
+SDISCONNALL = chr(6)  # server session disconnect all
+SSHUTD = chr(7)  # server shutdown
+SSYNC = chr(8)  # server session sync
+SCONN = chr(11)  # server creating new connection (for irc bots and etc)
+PCONNSYNC = chr(12)  # portal post-syncing a session
 PDISCONNALL = chr(13)  # portal session disconnect all
-SRELOAD = chr(14)      # server shutdown in reload mode
-SSTART = chr(15)       # server start (portal must already be running anyway)
-PSHUTD = chr(16)       # portal (+server) shutdown
-SSHUTD = chr(17)       # server shutdown
-PSTATUS = chr(18)      # ping server or portal status
-SRESET = chr(19)       # server shutdown in reset mode
+SRELOAD = chr(14)  # server shutdown in reload mode
+SSTART = chr(15)  # server start (portal must already be running anyway)
+PSHUTD = chr(16)  # portal (+server) shutdown
+SSHUTD = chr(17)  # server shutdown
+PSTATUS = chr(18)  # ping server or portal status
+SRESET = chr(19)  # server shutdown in reset mode
 
-NUL = b'\x00'
-NULNUL = b'\x00\x00'
+NUL = b"\x00"
+NULNUL = b"\x00\x00"
 
-AMP_MAXLEN = amp.MAX_VALUE_LENGTH    # max allowed data length in AMP protocol (cannot be changed)
+AMP_MAXLEN = amp.MAX_VALUE_LENGTH  # max allowed data length in AMP protocol (cannot be changed)
 
 # buffers
 _SENDBATCH = defaultdict(list)
@@ -52,10 +52,11 @@
 
 # resources
 
-DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0)
+DUMMYSESSION = namedtuple("DummySession", ["sessid"])(0)
 
 
-_HTTP_WARNING = bytes("""
+_HTTP_WARNING = bytes(
+    """
 HTTP/1.1 200 OK
 Content-Type: text/html
 
@@ -67,11 +68,14 @@
         <h3>This port should NOT be publicly visible.</h3>
     </p>
   </body>
-</html>""".strip(), 'utf-8')
+</html>""".strip(),
+    "utf-8",
+)
 
 
 # Helper functions for pickling.
 
+
 def dumps(data):
     return pickle.dumps(data, pickle.HIGHEST_PROTOCOL)
 
@@ -91,6 +95,7 @@ def _get_logger():
 @wraps
 def catch_traceback(func):
     "Helper decorator"
+
     def decorator(*args, **kwargs):
         try:
             func(*args, **kwargs)
@@ -98,11 +103,13 @@ def decorator(*args, **kwargs):
             _get_logger().log_trace()
             raise  # make sure the error is visible on the other side of the connection too
             print(err)
+
     return decorator
 
 
 # AMP Communication Command types
 
+
 class Compressed(amp.String):
     """
     This is a custom AMP command Argument that both handles too-long
@@ -127,7 +134,7 @@ def fromBox(self, name, strings, objects, proto):
             if chunk is None:
                 break
             value.write(self.fromStringProto(chunk, proto))
-        objects[str(name, 'utf-8')] = value.getvalue()
+        objects[str(name, "utf-8")] = value.getvalue()
 
     def toBox(self, name, strings, objects, proto):
         """
@@ -138,7 +145,7 @@ def toBox(self, name, strings, objects, proto):
 
         # print("toBox: name={}, strings={}, objects={}, proto{}".format(name, strings, objects, proto))
 
-        value = BytesIO(objects[str(name, 'utf-8')])
+        value = BytesIO(objects[str(name, "utf-8")])
         strings[name] = self.toStringProto(value.read(AMP_MAXLEN), proto)
 
         # print("toBox strings[name] = {}".format(strings[name]))
@@ -171,10 +178,10 @@ class MsgLauncher2Portal(amp.Command):
     Message Launcher -> Portal
 
     """
+
     key = "MsgLauncher2Portal"
-    arguments = [(b'operation', amp.String()),
-                 (b'arguments', amp.String())]
-    errors = {Exception: b'EXCEPTION'}
+    arguments = [(b"operation", amp.String()), (b"arguments", amp.String())]
+    errors = {Exception: b"EXCEPTION"}
     response = []
 
 
@@ -183,9 +190,10 @@ class MsgPortal2Server(amp.Command):
     Message Portal -> Server
 
     """
+
     key = b"MsgPortal2Server"
-    arguments = [(b'packed_data', Compressed())]
-    errors = {Exception: b'EXCEPTION'}
+    arguments = [(b"packed_data", Compressed())]
+    errors = {Exception: b"EXCEPTION"}
     response = []
 
 
@@ -194,9 +202,10 @@ class MsgServer2Portal(amp.Command):
     Message Server -> Portal
 
     """
+
     key = "MsgServer2Portal"
-    arguments = [(b'packed_data', Compressed())]
-    errors = {Exception: b'EXCEPTION'}
+    arguments = [(b"packed_data", Compressed())]
+    errors = {Exception: b"EXCEPTION"}
     response = []
 
 
@@ -208,9 +217,10 @@ class AdminPortal2Server(amp.Command):
     server, such as when a new session connects or resyncs
 
     """
+
     key = "AdminPortal2Server"
-    arguments = [(b'packed_data', Compressed())]
-    errors = {Exception: b'EXCEPTION'}
+    arguments = [(b"packed_data", Compressed())]
+    errors = {Exception: b"EXCEPTION"}
     response = []
 
 
@@ -222,9 +232,10 @@ class AdminServer2Portal(amp.Command):
     portal.
 
     """
+
     key = "AdminServer2Portal"
-    arguments = [(b'packed_data', Compressed())]
-    errors = {Exception: b'EXCEPTION'}
+    arguments = [(b"packed_data", Compressed())]
+    errors = {Exception: b"EXCEPTION"}
     response = []
 
 
@@ -233,10 +244,11 @@ class MsgStatus(amp.Command):
     Check Status between AMP services
 
     """
+
     key = "MsgStatus"
-    arguments = [(b'status', amp.String())]
-    errors = {Exception: b'EXCEPTION'}
-    response = [(b'status', amp.String())]
+    arguments = [(b"status", amp.String())]
+    errors = {Exception: b"EXCEPTION"}
+    response = [(b"status", amp.String())]
 
 
 class FunctionCall(amp.Command):
@@ -247,19 +259,23 @@ class FunctionCall(amp.Command):
     the other. This does not use the batch-send functionality.
 
     """
+
     key = "FunctionCall"
-    arguments = [(b'module', amp.String()),
-                 (b'function', amp.String()),
-                 (b'args', amp.String()),
-                 (b'kwargs', amp.String())]
-    errors = {Exception: b'EXCEPTION'}
-    response = [(b'result', amp.String())]
+    arguments = [
+        (b"module", amp.String()),
+        (b"function", amp.String()),
+        (b"args", amp.String()),
+        (b"kwargs", amp.String()),
+    ]
+    errors = {Exception: b"EXCEPTION"}
+    response = [(b"result", amp.String())]
 
 
 # -------------------------------------------------------------
 # Core AMP protocol for communication Server <-> Portal
 # -------------------------------------------------------------
 
+
 class AMPMultiConnectionProtocol(amp.AMP):
     """
     AMP protocol that safely handle multiple connections to the same
@@ -364,8 +380,11 @@ def errback(self, e, info):
 
         """
         e.trap(Exception)
-        _get_logger().log_err("AMP Error for {info}: {trcbck} {err}".format(
-            info=info, trcbck=e.getTraceback(), err=e.getErrorMessage()))
+        _get_logger().log_err(
+            "AMP Error for {info}: {trcbck} {err}".format(
+                info=info, trcbck=e.getTraceback(), err=e.getErrorMessage()
+            )
+        )
 
     def data_in(self, packed_data):
         """
@@ -400,8 +419,9 @@ def broadcast(self, command, sessid, **kwargs):
         # print("broadcast: {} {}: {}".format(command, sessid, kwargs))
 
         for protcl in self.factory.broadcasts:
-            deferreds.append(protcl.callRemote(command, **kwargs).addErrback(
-                self.errback, command.key))
+            deferreds.append(
+                protcl.callRemote(command, **kwargs).addErrback(self.errback, command.key)
+            )
 
         return DeferredList(deferreds)
 
@@ -423,12 +443,17 @@ def send_FunctionCall(self, modulepath, functionname, *args, **kwargs):
             function call
 
         """
-        return self.callRemote(FunctionCall,
-                               module=modulepath,
-                               function=functionname,
-                               args=dumps(args),
-                               kwargs=dumps(kwargs)).addCallback(
-            lambda r: loads(r["result"])).addErrback(self.errback, "FunctionCall")
+        return (
+            self.callRemote(
+                FunctionCall,
+                module=modulepath,
+                function=functionname,
+                args=dumps(args),
+                kwargs=dumps(kwargs),
+            )
+            .addCallback(lambda r: loads(r["result"]))
+            .addErrback(self.errback, "FunctionCall")
+        )
 
     @FunctionCall.responder
     @catch_traceback
@@ -459,4 +484,4 @@ def receive_functioncall(self, module, function, func_args, func_kwargs):
             result.addCallback(lambda r: {"result": dumps(r)})
             return result
         else:
-            return {'result': dumps(result)}
+            return {"result": dumps(result)}
diff --git a/evennia/server/portal/amp_server.py b/evennia/server/portal/amp_server.py
index 70093648689..de8a08ecf96 100644
--- a/evennia/server/portal/amp_server.py
+++ b/evennia/server/portal/amp_server.py
@@ -14,7 +14,7 @@
 
 
 def _is_windows():
-    return os.name == 'nt'
+    return os.name == "nt"
 
 
 def getenv():
@@ -27,7 +27,7 @@ def getenv():
     """
     sep = ";" if _is_windows() else ":"
     env = os.environ.copy()
-    env['PYTHONPATH'] = sep.join(sys.path)
+    env["PYTHONPATH"] = sep.join(sys.path)
     return env
 
 
@@ -38,6 +38,7 @@ class AMPServerFactory(protocol.ServerFactory):
     'Server' process.
 
     """
+
     noisy = False
 
     def logPrefix(self):
@@ -83,6 +84,7 @@ class AMPServerProtocol(amp.AMPMultiConnectionProtocol):
     Protocol subclass for the AMP-server run by the Portal.
 
     """
+
     def connectionLost(self, reason):
         """
         Set up a simple callback mechanism to let the amp-server wait for a connection to close.
@@ -112,8 +114,9 @@ def get_status(self):
                 (portal_live, server_live, portal_PID, server_PID).
 
         """
-        server_connected = bool(self.factory.server_connection and
-                                self.factory.server_connection.transport.connected)
+        server_connected = bool(
+            self.factory.server_connection and self.factory.server_connection.transport.connected
+        )
         portal_info_dict = self.factory.portal.get_info_dict()
         server_info_dict = self.factory.portal.server_info_dict
         server_pid = self.factory.portal.server_process_id
@@ -140,8 +143,8 @@ def data_to_server(self, command, sessid, **kwargs):
         # print("portal data_to_server: {}, {}, {}".format(command, sessid, kwargs))
         if self.factory.server_connection:
             return self.factory.server_connection.callRemote(
-                        command, packed_data=amp.dumps((sessid, kwargs))).addErrback(
-                            self.errback, command.key)
+                command, packed_data=amp.dumps((sessid, kwargs))
+            ).addErrback(self.errback, command.key)
         else:
             # if no server connection is available, broadcast
             return self.broadcast(command, sessid, packed_data=amp.dumps((sessid, kwargs)))
@@ -158,7 +161,7 @@ def start_server(self, server_twistd_cmd):
         # start the Server
         print("Portal starting server ... {}".format(server_twistd_cmd))
         process = None
-        with open(settings.SERVER_LOG_FILE, 'a') as logfile:
+        with open(settings.SERVER_LOG_FILE, "a") as logfile:
             # we link stdout to a file in order to catch
             # eventual errors happening before the Server has
             # opened its logger.
@@ -166,13 +169,19 @@ def start_server(self, server_twistd_cmd):
                 if _is_windows():
                     # Windows requires special care
                     create_no_window = 0x08000000
-                    process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
-                                    stdout=logfile, stderr=STDOUT,
-                                    creationflags=create_no_window)
+                    process = Popen(
+                        server_twistd_cmd,
+                        env=getenv(),
+                        bufsize=-1,
+                        stdout=logfile,
+                        stderr=STDOUT,
+                        creationflags=create_no_window,
+                    )
 
                 else:
-                    process = Popen(server_twistd_cmd, env=getenv(), bufsize=-1,
-                                    stdout=logfile, stderr=STDOUT)
+                    process = Popen(
+                        server_twistd_cmd, env=getenv(), bufsize=-1, stdout=logfile, stderr=STDOUT
+                    )
             except Exception:
                 logger.log_trace()
 
@@ -205,7 +214,7 @@ def wait_for_server_connect(self, callback, *args, **kwargs):
         """
         self.factory.server_connect_callbacks.append((callback, args, kwargs))
 
-    def stop_server(self, mode='shutdown'):
+    def stop_server(self, mode="shutdown"):
         """
         Shut down server in one or more modes.
 
@@ -213,11 +222,11 @@ def stop_server(self, mode='shutdown'):
             mode (str): One of 'shutdown', 'reload' or 'reset'.
 
         """
-        if mode == 'reload':
+        if mode == "reload":
             self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SRELOAD)
-        elif mode == 'reset':
+        elif mode == "reset":
             self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SRESET)
-        elif mode == 'shutdown':
+        elif mode == "shutdown":
             self.send_AdminPortal2Server(amp.DUMMYSESSION, operation=amp.SSHUTD)
         self.factory.portal.server_restart_mode = mode
 
@@ -232,9 +241,8 @@ def send_Status2Launcher(self):
         # print("self.get_status(): {}".format(self.get_status()))
         if self.factory.launcher_connection:
             self.factory.launcher_connection.callRemote(
-                    amp.MsgStatus,
-                    status=amp.dumps(self.get_status())).addErrback(
-                            self.errback, amp.MsgStatus.key)
+                amp.MsgStatus, status=amp.dumps(self.get_status())
+            ).addErrback(self.errback, amp.MsgStatus.key)
 
     def send_MsgPortal2Server(self, session, **kwargs):
         """
@@ -262,8 +270,9 @@ def send_AdminPortal2Server(self, session, operation="", **kwargs):
             data (str or dict, optional): Data used in the administrative operation.
 
         """
-        return self.data_to_server(amp.AdminPortal2Server, session.sessid,
-                                   operation=operation, **kwargs)
+        return self.data_to_server(
+            amp.AdminPortal2Server, session.sessid, operation=operation, **kwargs
+        )
 
     # receive amp data
 
@@ -303,7 +312,7 @@ def portal_receive_launcher2portal(self, operation, arguments):
 
         """
         # Since the launcher command uses amp.String() we need to convert from byte here.
-        operation = str(operation, 'utf-8')
+        operation = str(operation, "utf-8")
         self.factory.launcher_connection = self
         _, server_connected, _, _, _, _ = self.get_status()
 
@@ -311,7 +320,7 @@ def portal_receive_launcher2portal(self, operation, arguments):
 
         # logger.log_msg("operation == amp.SSTART: {}: {}".format(operation == amp.SSTART, amp.loads(arguments)))
 
-        if operation == amp.SSTART:   # portal start  #15
+        if operation == amp.SSTART:  # portal start  #15
             # first, check if server is already running
             if not server_connected:
                 self.wait_for_server_connect(self.send_Status2Launcher)
@@ -320,38 +329,34 @@ def portal_receive_launcher2portal(self, operation, arguments):
         elif operation == amp.SRELOAD:  # reload server #14
             if server_connected:
                 # We let the launcher restart us once they get the signal
-                self.factory.server_connection.wait_for_disconnect(
-                    self.send_Status2Launcher)
-                self.stop_server(mode='reload')
+                self.factory.server_connection.wait_for_disconnect(self.send_Status2Launcher)
+                self.stop_server(mode="reload")
             else:
                 self.wait_for_server_connect(self.send_Status2Launcher)
                 self.start_server(amp.loads(arguments))
 
         elif operation == amp.SRESET:  # reload server #19
             if server_connected:
-                self.factory.server_connection.wait_for_disconnect(
-                    self.send_Status2Launcher)
-                self.stop_server(mode='reset')
+                self.factory.server_connection.wait_for_disconnect(self.send_Status2Launcher)
+                self.stop_server(mode="reset")
             else:
                 self.wait_for_server_connect(self.send_Status2Launcher)
                 self.start_server(amp.loads(arguments))
 
         elif operation == amp.SSHUTD:  # server-only shutdown #17
             if server_connected:
-                self.factory.server_connection.wait_for_disconnect(
-                    self.send_Status2Launcher)
-                self.stop_server(mode='shutdown')
+                self.factory.server_connection.wait_for_disconnect(self.send_Status2Launcher)
+                self.stop_server(mode="shutdown")
 
         elif operation == amp.PSHUTD:  # portal + server shutdown  #16
             if server_connected:
-                self.factory.server_connection.wait_for_disconnect(
-                    self.factory.portal.shutdown )
+                self.factory.server_connection.wait_for_disconnect(self.factory.portal.shutdown)
             else:
                 self.factory.portal.shutdown()
 
         else:
             logger.log_err("Operation {} not recognized".format(operation))
-            raise Exception("operation %(op)s not recognized." % {'op': operation})
+            raise Exception("operation %(op)s not recognized." % {"op": operation})
 
         return {}
 
@@ -413,22 +418,23 @@ def portal_receive_adminserver2portal(self, packed_data):
             portal_sessionhandler.server_disconnect_all(reason=kwargs.get("reason"))
 
         elif operation == amp.SRELOAD:  # server reload
-                self.factory.server_connection.wait_for_disconnect(
-                    self.start_server, self.factory.portal.server_twistd_cmd)
-                self.stop_server(mode='reload')
+            self.factory.server_connection.wait_for_disconnect(
+                self.start_server, self.factory.portal.server_twistd_cmd
+            )
+            self.stop_server(mode="reload")
 
         elif operation == amp.SRESET:  # server reset
-                self.factory.server_connection.wait_for_disconnect(
-                    self.start_server, self.factory.portal.server_twistd_cmd)
-                self.stop_server(mode='reset')
+            self.factory.server_connection.wait_for_disconnect(
+                self.start_server, self.factory.portal.server_twistd_cmd
+            )
+            self.stop_server(mode="reset")
 
         elif operation == amp.SSHUTD:  # server-only shutdown
-            self.stop_server(mode='shutdown')
+            self.stop_server(mode="shutdown")
 
         elif operation == amp.PSHUTD:  # full server+server shutdown
-            self.factory.server_connection.wait_for_disconnect(
-                self.factory.portal.shutdown)
-            self.stop_server(mode='shutdown')
+            self.factory.server_connection.wait_for_disconnect(self.factory.portal.shutdown)
+            self.stop_server(mode="shutdown")
 
         elif operation == amp.PSYNC:  # portal sync
             # Server has (re-)connected and wants the session data from portal
@@ -438,11 +444,13 @@ def portal_receive_adminserver2portal(self, packed_data):
             server_restart_mode = self.factory.portal.server_restart_mode
 
             sessdata = self.factory.portal.sessions.get_all_sync_data()
-            self.send_AdminPortal2Server(amp.DUMMYSESSION,
-                                         amp.PSYNC,
-                                         server_restart_mode=server_restart_mode,
-                                         sessiondata=sessdata,
-                                         portal_start_time=self.factory.portal.start_time)
+            self.send_AdminPortal2Server(
+                amp.DUMMYSESSION,
+                amp.PSYNC,
+                server_restart_mode=server_restart_mode,
+                sessiondata=sessdata,
+                portal_start_time=self.factory.portal.start_time,
+            )
             self.factory.portal.sessions.at_server_connection()
 
             if self.factory.server_connection:
@@ -458,8 +466,9 @@ def portal_receive_adminserver2portal(self, packed_data):
         elif operation == amp.SSYNC:  # server_session_sync
             # server wants to save session data to the portal,
             # maybe because it's about to shut down.
-            portal_sessionhandler.server_session_sync(kwargs.get("sessiondata"),
-                                                      kwargs.get("clean", True))
+            portal_sessionhandler.server_session_sync(
+                kwargs.get("sessiondata"), kwargs.get("clean", True)
+            )
 
             # set a flag in case we are about to shut down soon
             self.factory.server_restart_mode = True
@@ -468,5 +477,5 @@ def portal_receive_adminserver2portal(self, packed_data):
             portal_sessionhandler.server_connect(**kwargs)
 
         else:
-            raise Exception("operation %(op)s not recognized." % {'op': operation})
+            raise Exception("operation %(op)s not recognized." % {"op": operation})
         return {}
diff --git a/evennia/server/portal/grapevine.py b/evennia/server/portal/grapevine.py
index 76447726de9..6c5590e2a16 100644
--- a/evennia/server/portal/grapevine.py
+++ b/evennia/server/portal/grapevine.py
@@ -15,8 +15,7 @@
 from evennia.server.session import Session
 from evennia.utils import get_evennia_version
 from evennia.utils.logger import log_info, log_err
-from autobahn.twisted.websocket import (
-    WebSocketClientProtocol, WebSocketClientFactory, connectWS)
+from autobahn.twisted.websocket import WebSocketClientProtocol, WebSocketClientFactory, connectWS
 
 # There is only one at this time
 GRAPEVINE_URI = "wss://grapevine.haus/socket"
@@ -31,8 +30,7 @@
 GRAPEVINE_HEARTBEAT_FAILURE = 4001
 
 
-class RestartingWebsocketServerFactory(WebSocketClientFactory,
-                                       protocol.ReconnectingClientFactory):
+class RestartingWebsocketServerFactory(WebSocketClientFactory, protocol.ReconnectingClientFactory):
     """
     A variant of the websocket-factory that auto-reconnects.
 
@@ -44,8 +42,8 @@ class RestartingWebsocketServerFactory(WebSocketClientFactory,
 
     def __init__(self, sessionhandler, *args, **kwargs):
 
-        self.uid = kwargs.pop('uid')
-        self.channel = kwargs.pop('grapevine_channel')
+        self.uid = kwargs.pop("uid")
+        self.channel = kwargs.pop("grapevine_channel")
         self.sessionhandler = sessionhandler
 
         # self.noisy = False
@@ -170,7 +168,7 @@ def onMessage(self, payload, isBinary):
 
         """
         if not isBinary:
-            data = json.loads(str(payload, 'utf-8'))
+            data = json.loads(str(payload, "utf-8"))
             self.data_in(data=data)
             self.retry_task = None
 
@@ -205,7 +203,7 @@ def _send_json(self, data):
             data (str): Text to send.
 
         """
-        return self.sendMessage(json.dumps(data).encode('utf-8'))
+        return self.sendMessage(json.dumps(data).encode("utf-8"))
 
     def disconnect(self, reason=None):
         """
@@ -238,9 +236,9 @@ def send_authenticate(self, *args, **kwargs):
                 "supports": ["channels"],
                 "channels": GRAPEVINE_CHANNELS,
                 "version": "1.0.0",
-                "user_agent": get_evennia_version('pretty')
-              }
-            }
+                "user_agent": get_evennia_version("pretty"),
+            },
+        }
         # override on-the-fly
         data.update(kwargs)
 
@@ -252,14 +250,11 @@ def send_heartbeat(self, *args, **kwargs):
 
         """
         # pass along all connected players
-        data = {
-            "event": "heartbeat",
-            "payload": {
-            }
-        }
+        data = {"event": "heartbeat", "payload": {}}
         sessions = self.sessionhandler.get_sessions(include_unloggedin=False)
-        data['payload']['players'] = [sess.account.key for sess in sessions
-                                      if hasattr(sess, "account")]
+        data["payload"]["players"] = [
+            sess.account.key for sess in sessions if hasattr(sess, "account")
+        ]
 
         self._send_json(data)
 
@@ -269,12 +264,7 @@ def send_subscribe(self, channelname, *args, **kwargs):
 
         Use with session.msg(subscribe="channelname")
         """
-        data = {
-            "event": "channels/subscribe",
-            "payload": {
-               "channel": channelname
-            }
-        }
+        data = {"event": "channels/subscribe", "payload": {"channel": channelname}}
         self._send_json(data)
 
     def send_unsubscribe(self, channelname, *args, **kwargs):
@@ -283,12 +273,7 @@ def send_unsubscribe(self, channelname, *args, **kwargs):
 
         Use with session.msg(unsubscribe="channelname")
         """
-        data = {
-            "event": "channels/unsubscribe",
-            "payload": {
-               "channel": channelname
-            }
-        }
+        data = {"event": "channels/unsubscribe", "payload": {"channel": channelname}}
         self._send_json(data)
 
     def send_channel(self, text, channel, sender, *args, **kwargs):
@@ -303,11 +288,7 @@ def send_channel(self, text, channel, sender, *args, **kwargs):
 
         data = {
             "event": "channels/send",
-            "payload": {
-                "message": text,
-                "channel": channel,
-                "name": sender
-            }
+            "payload": {"message": text, "channel": channel, "name": sender},
         }
         self._send_json(data)
 
@@ -326,10 +307,10 @@ def data_in(self, data, **kwargs):
             data (dict): Converted json data.
 
         """
-        event = data['event']
+        event = data["event"]
         if event == "authenticate":
             # server replies to our auth handshake
-            if data['status'] != "success":
+            if data["status"] != "success":
                 log_err("Grapevine authentication failed.")
                 self.disconnect()
             else:
@@ -339,13 +320,14 @@ def data_in(self, data, **kwargs):
             self.send_heartbeat()
         elif event == "restart":
             # set the expected downtime
-            self.restart_downtime = data['payload']['downtime']
+            self.restart_downtime = data["payload"]["downtime"]
         elif event == "channels/subscribe":
             # subscription verification
-            if data.get('status', 'success') == "failure":
+            if data.get("status", "success") == "failure":
                 err = data.get("error", "N/A")
-                self.sessionhandler.data_in(bot_data_in=((f"Grapevine error: {err}"),
-                                                         {'event': event}))
+                self.sessionhandler.data_in(
+                    bot_data_in=((f"Grapevine error: {err}"), {"event": event})
+                )
         elif event == "channels/unsubscribe":
             # unsubscribe-verification
             pass
@@ -353,19 +335,24 @@ def data_in(self, data, **kwargs):
             # incoming broadcast from network
             payload = data["payload"]
 
-            print("channels/broadcast:", payload['channel'], self.channel)
-            if str(payload['channel']) != self.channel:
+            print("channels/broadcast:", payload["channel"], self.channel)
+            if str(payload["channel"]) != self.channel:
                 # only echo from channels this particular bot actually listens to
                 return
             else:
                 # correct channel
                 self.sessionhandler.data_in(
-                    self, bot_data_in=(
-                        str(payload['message'],),
-                        {"event": event,
-                         "grapevine_channel": str(payload['channel']),
-                         "sender": str(payload['name']),
-                         "game": str(payload['game'])}))
+                    self,
+                    bot_data_in=(
+                        str(payload["message"]),
+                        {
+                            "event": event,
+                            "grapevine_channel": str(payload["channel"]),
+                            "sender": str(payload["name"]),
+                            "game": str(payload["game"]),
+                        },
+                    ),
+                )
         elif event == "channels/send":
             pass
         else:
diff --git a/evennia/server/portal/irc.py b/evennia/server/portal/irc.py
index 2b616f2ce11..7e130727770 100644
--- a/evennia/server/portal/irc.py
+++ b/evennia/server/portal/irc.py
@@ -3,7 +3,6 @@
 The bot then pipes what is being said between the IRC channel and one or
 more Evennia channels.
 """
-from future.utils import viewkeys, viewvalues, viewitems
 
 import re
 from twisted.application import internet
@@ -50,55 +49,54 @@
 # test irc->evennia
 # Use Ctrl+C <num> to produce mIRC colors in e.g. irssi
 
-IRC_COLOR_MAP = dict((
-    (r'|n', IRC_COLOR + IRC_NORMAL),  # normal mode
-    (r'|H', IRC_RESET),   # un-highlight
-    (r'|/', "\n"),        # line break
-    (r'|t', "    "),      # tab
-    (r'|-', "    "),      # fixed tab
-    (r'|_', " "),         # space
-    (r'|*', IRC_INVERT),          # invert
-    (r'|^', ""),          # blinking text
-    (r'|h', IRC_BOLD),    # highlight, use bold instead
-
-    (r'|r', IRC_COLOR + IRC_RED),
-    (r'|g', IRC_COLOR + IRC_GREEN),
-    (r'|y', IRC_COLOR + IRC_YELLOW),
-    (r'|b', IRC_COLOR + IRC_BLUE),
-    (r'|m', IRC_COLOR + IRC_MAGENTA),
-    (r'|c', IRC_COLOR + IRC_CYAN),
-    (r'|w', IRC_COLOR + IRC_WHITE),  # pure white
-    (r'|x', IRC_COLOR + IRC_DGREY),  # dark grey
-
-    (r'|R', IRC_COLOR + IRC_DRED),
-    (r'|G', IRC_COLOR + IRC_DGREEN),
-    (r'|Y', IRC_COLOR + IRC_DYELLOW),
-    (r'|B', IRC_COLOR + IRC_DBLUE),
-    (r'|M', IRC_COLOR + IRC_DMAGENTA),
-    (r'|C', IRC_COLOR + IRC_DCYAN),
-    (r'|W', IRC_COLOR + IRC_GREY),   # light grey
-    (r'|X', IRC_COLOR + IRC_BLACK),  # pure black
-
-    (r'|[r', IRC_COLOR + IRC_NORMAL + "," + IRC_DRED),
-    (r'|[g', IRC_COLOR + IRC_NORMAL + "," + IRC_DGREEN),
-    (r'|[y', IRC_COLOR + IRC_NORMAL + "," + IRC_DYELLOW),
-    (r'|[b', IRC_COLOR + IRC_NORMAL + "," + IRC_DBLUE),
-    (r'|[m', IRC_COLOR + IRC_NORMAL + "," + IRC_DMAGENTA),
-    (r'|[c', IRC_COLOR + IRC_NORMAL + "," + IRC_DCYAN),
-    (r'|[w', IRC_COLOR + IRC_NORMAL + "," + IRC_GREY),    # light grey background
-    (r'|[x', IRC_COLOR + IRC_NORMAL + "," + IRC_BLACK)    # pure black background
-))
+IRC_COLOR_MAP = dict(
+    (
+        (r"|n", IRC_COLOR + IRC_NORMAL),  # normal mode
+        (r"|H", IRC_RESET),  # un-highlight
+        (r"|/", "\n"),  # line break
+        (r"|t", "    "),  # tab
+        (r"|-", "    "),  # fixed tab
+        (r"|_", " "),  # space
+        (r"|*", IRC_INVERT),  # invert
+        (r"|^", ""),  # blinking text
+        (r"|h", IRC_BOLD),  # highlight, use bold instead
+        (r"|r", IRC_COLOR + IRC_RED),
+        (r"|g", IRC_COLOR + IRC_GREEN),
+        (r"|y", IRC_COLOR + IRC_YELLOW),
+        (r"|b", IRC_COLOR + IRC_BLUE),
+        (r"|m", IRC_COLOR + IRC_MAGENTA),
+        (r"|c", IRC_COLOR + IRC_CYAN),
+        (r"|w", IRC_COLOR + IRC_WHITE),  # pure white
+        (r"|x", IRC_COLOR + IRC_DGREY),  # dark grey
+        (r"|R", IRC_COLOR + IRC_DRED),
+        (r"|G", IRC_COLOR + IRC_DGREEN),
+        (r"|Y", IRC_COLOR + IRC_DYELLOW),
+        (r"|B", IRC_COLOR + IRC_DBLUE),
+        (r"|M", IRC_COLOR + IRC_DMAGENTA),
+        (r"|C", IRC_COLOR + IRC_DCYAN),
+        (r"|W", IRC_COLOR + IRC_GREY),  # light grey
+        (r"|X", IRC_COLOR + IRC_BLACK),  # pure black
+        (r"|[r", IRC_COLOR + IRC_NORMAL + "," + IRC_DRED),
+        (r"|[g", IRC_COLOR + IRC_NORMAL + "," + IRC_DGREEN),
+        (r"|[y", IRC_COLOR + IRC_NORMAL + "," + IRC_DYELLOW),
+        (r"|[b", IRC_COLOR + IRC_NORMAL + "," + IRC_DBLUE),
+        (r"|[m", IRC_COLOR + IRC_NORMAL + "," + IRC_DMAGENTA),
+        (r"|[c", IRC_COLOR + IRC_NORMAL + "," + IRC_DCYAN),
+        (r"|[w", IRC_COLOR + IRC_NORMAL + "," + IRC_GREY),  # light grey background
+        (r"|[x", IRC_COLOR + IRC_NORMAL + "," + IRC_BLACK),  # pure black background
+    )
+)
 # ansi->irc
-RE_ANSI_COLOR = re.compile(r"|".join(
-    [re.escape(key) for key in viewkeys(IRC_COLOR_MAP)]), re.DOTALL)
-RE_MXP = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL)
+RE_ANSI_COLOR = re.compile(r"|".join([re.escape(key) for key in IRC_COLOR_MAP.keys()]), re.DOTALL)
+RE_MXP = re.compile(r"\|lc(.*?)\|lt(.*?)\|le", re.DOTALL)
 RE_ANSI_ESCAPES = re.compile(r"(%s)" % "|".join(("{{", "%%", "\\\\")), re.DOTALL)
 # irc->ansi
-_CLR_LIST = [re.escape(val)
-             for val in sorted(viewvalues(IRC_COLOR_MAP), key=len, reverse=True) if val.strip()]
+_CLR_LIST = [
+    re.escape(val) for val in sorted(IRC_COLOR_MAP.values(), key=len, reverse=True) if val.strip()
+]
 _CLR_LIST = _CLR_LIST[-2:] + _CLR_LIST[:-2]
 RE_IRC_COLOR = re.compile(r"|".join(_CLR_LIST), re.DOTALL)
-ANSI_COLOR_MAP = dict((tup[1], tup[0]) for tup in viewitems(IRC_COLOR_MAP) if tup[1].strip())
+ANSI_COLOR_MAP = dict((tup[1], tup[0]) for tup in IRC_COLOR_MAP.items() if tup[1].strip())
 
 
 def parse_ansi_to_irc(string):
@@ -123,7 +121,7 @@ def _sub_to_irc(ansi_match):
         pstring = RE_ANSI_COLOR.sub(_sub_to_irc, part)
         parsed_string.append("%s%s" % (pstring, sep[0].strip()))
     # strip mxp
-    parsed_string = RE_MXP.sub(r'\2', "".join(parsed_string))
+    parsed_string = RE_MXP.sub(r"\2", "".join(parsed_string))
     return parsed_string
 
 
@@ -149,12 +147,14 @@ def _sub_to_ansi(irc_match):
 
 # IRC bot
 
+
 class IRCBot(irc.IRCClient, Session):
     """
     An IRC bot that tracks activity in a channel as well
     as sends text to it when prompted
 
     """
+
     lineRate = 1
 
     # assigned by factory at creation
@@ -180,8 +180,10 @@ def signedOn(self):
         self.uid = int(self.factory.uid)
         self.logged_in = True
         self.factory.sessionhandler.connect(self)
-        logger.log_info("IRC bot '%s' connected to %s at %s:%s." % (self.nickname, self.channel,
-                                                                    self.network, self.port))
+        logger.log_info(
+            "IRC bot '%s' connected to %s at %s:%s."
+            % (self.nickname, self.channel, self.network, self.port)
+        )
 
     def disconnect(self, reason=""):
         """
@@ -210,11 +212,11 @@ def privmsg(self, user, channel, msg):
         """
         if channel == self.nickname:
             # private message
-            user = user.split('!', 1)[0]
+            user = user.split("!", 1)[0]
             self.data_in(text=msg, type="privmsg", user=user, channel=channel)
-        elif not msg.startswith('***'):
+        elif not msg.startswith("***"):
             # channel message
-            user = user.split('!', 1)[0]
+            user = user.split("!", 1)[0]
             user = ansi.raw(user)
             self.data_in(text=msg, type="msg", user=user, channel=channel)
 
@@ -228,8 +230,8 @@ def action(self, user, channel, msg):
             msg (str): The message arriving from channel.
 
         """
-        if not msg.startswith('**'):
-            user = user.split('!', 1)[0]
+        if not msg.startswith("**"):
+            user = user.split("!", 1)[0]
             self.data_in(text=msg, type="action", user=user, channel=channel)
 
     def get_nicklist(self):
@@ -246,14 +248,16 @@ def irc_RPL_NAMREPLY(self, prefix, params):
         channel = params[2].lower()
         if channel != self.channel.lower():
             return
-        self.nicklist += params[3].split(' ')
+        self.nicklist += params[3].split(" ")
 
     def irc_RPL_ENDOFNAMES(self, prefix, params):
         """Called when the nicklist has finished being returned."""
         channel = params[1].lower()
         if channel != self.channel.lower():
             return
-        self.data_in(text="", type="nicklist", user="server", channel=channel, nicklist=self.nicklist)
+        self.data_in(
+            text="", type="nicklist", user="server", channel=channel, nicklist=self.nicklist
+        )
         self.nicklist = []
 
     def pong(self, user, time):
@@ -349,12 +353,22 @@ class IRCBotFactory(protocol.ReconnectingClientFactory):
     increase in delay
 
     """
+
     # scaling reconnect time
     initialDelay = 1
     factor = 1.5
     maxDelay = 60
 
-    def __init__(self, sessionhandler, uid=None, botname=None, channel=None, network=None, port=None, ssl=None):
+    def __init__(
+        self,
+        sessionhandler,
+        uid=None,
+        botname=None,
+        channel=None,
+        network=None,
+        port=None,
+        ssl=None,
+    ):
         """
         Storing some important protocol properties.
 
@@ -453,7 +467,10 @@ def start(self):
             if self.ssl:
                 try:
                     from twisted.internet import ssl
-                    service = reactor.connectSSL(self.network, int(self.port), self, ssl.ClientContextFactory())
+
+                    service = reactor.connectSSL(
+                        self.network, int(self.port), self, ssl.ClientContextFactory()
+                    )
                 except ImportError:
                     logger.log_err("To use SSL, the PyOpenSSL module must be installed.")
             else:
diff --git a/evennia/server/portal/mccp.py b/evennia/server/portal/mccp.py
index 7890c5cf8f9..3ca35ff4dea 100644
--- a/evennia/server/portal/mccp.py
+++ b/evennia/server/portal/mccp.py
@@ -14,11 +14,10 @@
 This protocol is implemented by the telnet protocol importing
 mccp_compress and calling it from its write methods.
 """
-from builtins import object
 import zlib
 
 # negotiations for v1 and v2 of the protocol
-MCCP = b'\x56'
+MCCP = b"\x56"
 FLUSH = zlib.Z_SYNC_FLUSH
 
 
@@ -33,7 +32,7 @@ def mccp_compress(protocol, data):
         stream (binary): Zlib-compressed data.
 
     """
-    if hasattr(protocol, 'zlib'):
+    if hasattr(protocol, "zlib"):
         return protocol.zlib.compress(data) + protocol.zlib.flush(FLUSH)
     return data
 
@@ -58,7 +57,7 @@ def __init__(self, protocol):
         """
 
         self.protocol = protocol
-        self.protocol.protocol_flags['MCCP'] = False
+        self.protocol.protocol_flags["MCCP"] = False
         # ask if client will mccp, connect callbacks to handle answer
         self.protocol.will(MCCP).addCallbacks(self.do_mccp, self.no_mccp)
 
@@ -70,9 +69,9 @@ def no_mccp(self, option):
             option (Option): Option dict (not used).
 
         """
-        if hasattr(self.protocol, 'zlib'):
+        if hasattr(self.protocol, "zlib"):
             del self.protocol.zlib
-        self.protocol.protocol_flags['MCCP'] = False
+        self.protocol.protocol_flags["MCCP"] = False
         self.protocol.handshake_done()
 
     def do_mccp(self, option):
@@ -84,7 +83,7 @@ def do_mccp(self, option):
             option (Option): Option dict (not used).
 
         """
-        self.protocol.protocol_flags['MCCP'] = True
-        self.protocol.requestNegotiation(MCCP, b'')
+        self.protocol.protocol_flags["MCCP"] = True
+        self.protocol.requestNegotiation(MCCP, b"")
         self.protocol.zlib = zlib.compressobj(9)
         self.protocol.handshake_done()
diff --git a/evennia/server/portal/mssp.py b/evennia/server/portal/mssp.py
index 78dd12b699a..20331741ed1 100644
--- a/evennia/server/portal/mssp.py
+++ b/evennia/server/portal/mssp.py
@@ -10,13 +10,12 @@
 
 
 """
-from builtins import object
 from django.conf import settings
 from evennia.utils import utils
 
-MSSP = b'\x46'
-MSSP_VAR = b'\x01'
-MSSP_VAL = b'\x02'
+MSSP = b"\x46"
+MSSP_VAR = b"\x01"
+MSSP_VAL = b"\x02"
 
 # try to get the customized mssp info, if it exists.
 MSSPTable_CUSTOM = utils.variable_from_module(settings.MSSP_META_MODULE, "MSSPTable", default={})
@@ -82,18 +81,16 @@ def do_mssp(self, option):
         """
 
         self.mssp_table = {
-
             # Required fields
-
             "NAME": settings.SERVERNAME,
             "PLAYERS": self.get_player_count,
             "UPTIME": self.get_uptime,
-
-            "PORT": list(reversed(settings.TELNET_PORTS)),  # most important port should be last in list
-
+            "PORT": list(
+                reversed(settings.TELNET_PORTS)
+            ),  # most important port should be last in list
             # Evennia auto-filled
             "CRAWL DELAY": "-1",
-            "CODEBASE": utils.get_evennia_version(mode='pretty'),
+            "CODEBASE": utils.get_evennia_version(mode="pretty"),
             "FAMILY": "Custom",
             "ANSI": "1",
             "GMCP": "1" if settings.TELNET_OOB_ENABLED else "0",
@@ -115,16 +112,17 @@ def do_mssp(self, option):
         if MSSPTable_CUSTOM:
             self.mssp_table.update(MSSPTable_CUSTOM)
 
-        varlist = ''
+        varlist = b""
         for variable, value in self.mssp_table.items():
             if callable(value):
                 value = value()
             if utils.is_iter(value):
                 for partval in value:
-                    varlist += (MSSP_VAR + bytes(variable, 'utf-8') +
-                                MSSP_VAL + bytes(partval, 'utf-8'))
+                    varlist += (
+                        MSSP_VAR + bytes(variable, "utf-8") + MSSP_VAL + bytes(partval, "utf-8")
+                    )
             else:
-                varlist += MSSP_VAR + bytes(variable, 'utf-8') + MSSP_VAL + bytes(value, 'utf-8')
+                varlist += MSSP_VAR + bytes(variable, "utf-8") + MSSP_VAL + bytes(value, "utf-8")
 
         # send to crawler by subnegotiation
         self.protocol.requestNegotiation(MSSP, varlist)
diff --git a/evennia/server/portal/mxp.py b/evennia/server/portal/mxp.py
index 30c3ce99498..c1d9e7422cf 100644
--- a/evennia/server/portal/mxp.py
+++ b/evennia/server/portal/mxp.py
@@ -13,20 +13,15 @@
 http://www.gammon.com.au/mushclient/addingservermxp.htm
 
 """
-from builtins import object
 import re
 
-LINKS_SUB = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL)
+LINKS_SUB = re.compile(r"\|lc(.*?)\|lt(.*?)\|le", re.DOTALL)
 
 # MXP Telnet option
-MXP = b'\x5b'
+MXP = b"\x5b"
 
 MXP_TEMPSECURE = "\x1B[4z"
-MXP_SEND = MXP_TEMPSECURE + \
-    "<SEND HREF=\"\\1\">" + \
-    "\\2" + \
-    MXP_TEMPSECURE + \
-    "</SEND>"
+MXP_SEND = MXP_TEMPSECURE + '<SEND HREF="\\1">' + "\\2" + MXP_TEMPSECURE + "</SEND>"
 
 
 def mxp_parse(text):
@@ -40,9 +35,7 @@ def mxp_parse(text):
         parsed (str): The parsed text.
 
     """
-    text = text.replace("&", "&amp;") \
-               .replace("<", "&lt;") \
-               .replace(">", "&gt;")
+    text = text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;")
 
     text = LINKS_SUB.sub(MXP_SEND, text)
     return text
@@ -86,5 +79,5 @@ def do_mxp(self, option):
 
         """
         self.protocol.protocol_flags["MXP"] = True
-        self.protocol.requestNegotiation(MXP, b'')
+        self.protocol.requestNegotiation(MXP, b"")
         self.protocol.handshake_done()
diff --git a/evennia/server/portal/naws.py b/evennia/server/portal/naws.py
index 0663231d6b5..737ba748455 100644
--- a/evennia/server/portal/naws.py
+++ b/evennia/server/portal/naws.py
@@ -10,11 +10,10 @@
 
 """
 from codecs import encode as codecs_encode
-from builtins import object
 from django.conf import settings
 
-NAWS = b'\x1f'
-IS = b'\x00'
+NAWS = b"\x1f"
+IS = b"\x00"
 # default taken from telnet specification
 DEFAULT_WIDTH = settings.CLIENT_DEFAULT_WIDTH
 DEFAULT_HEIGHT = settings.CLIENT_DEFAULT_HEIGHT
@@ -40,8 +39,10 @@ def __init__(self, protocol):
         """
         self.naws_step = 0
         self.protocol = protocol
-        self.protocol.protocol_flags['SCREENWIDTH'] = {0: DEFAULT_WIDTH}  # windowID (0 is root):width
-        self.protocol.protocol_flags['SCREENHEIGHT'] = {0: DEFAULT_HEIGHT}  # windowID:width
+        self.protocol.protocol_flags["SCREENWIDTH"] = {
+            0: DEFAULT_WIDTH
+        }  # windowID (0 is root):width
+        self.protocol.protocol_flags["SCREENHEIGHT"] = {0: DEFAULT_HEIGHT}  # windowID:width
         self.protocol.negotiationMap[NAWS] = self.negotiate_sizes
         self.protocol.do(NAWS).addCallbacks(self.do_naws, self.no_naws)
 
@@ -77,6 +78,6 @@ def negotiate_sizes(self, options):
         if len(options) == 4:
             # NAWS is negotiated with 16bit words
             width = options[0] + options[1]
-            self.protocol.protocol_flags['SCREENWIDTH'][0] = int(codecs_encode(width, 'hex'), 16)
+            self.protocol.protocol_flags["SCREENWIDTH"][0] = int(codecs_encode(width, "hex"), 16)
             height = options[2] + options[3]
-            self.protocol.protocol_flags['SCREENHEIGHT'][0] = int(codecs_encode(height, 'hex'), 16)
+            self.protocol.protocol_flags["SCREENHEIGHT"][0] = int(codecs_encode(height, "hex"), 16)
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index 3a632d23b8d..ebf321a5663 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -7,8 +7,6 @@
 by game/evennia.py).
 
 """
-from builtins import object
-
 import sys
 import os
 import time
@@ -19,10 +17,12 @@
 from twisted.python.log import ILogObserver
 
 import django
+
 django.setup()
 from django.conf import settings
 
 import evennia
+
 evennia._init()
 
 from evennia.utils.utils import get_evennia_version, mod_import, make_iter
@@ -38,7 +38,9 @@
 except Exception:
     pass
 
-PORTAL_SERVICES_PLUGIN_MODULES = [mod_import(module) for module in make_iter(settings.PORTAL_SERVICES_PLUGIN_MODULES)]
+PORTAL_SERVICES_PLUGIN_MODULES = [
+    mod_import(module) for module in make_iter(settings.PORTAL_SERVICES_PLUGIN_MODULES)
+]
 LOCKDOWN_MODE = settings.LOCKDOWN_MODE
 
 # -------------------------------------------------------------
@@ -49,7 +51,7 @@
 
 SERVERNAME = settings.SERVERNAME
 
-PORTAL_RESTART = os.path.join(settings.GAME_DIR, "server", 'portal.restart')
+PORTAL_RESTART = os.path.join(settings.GAME_DIR, "server", "portal.restart")
 
 TELNET_PORTS = settings.TELNET_PORTS
 SSL_PORTS = settings.SSL_PORTS
@@ -57,11 +59,11 @@
 WEBSERVER_PORTS = settings.WEBSERVER_PORTS
 WEBSOCKET_CLIENT_PORT = settings.WEBSOCKET_CLIENT_PORT
 
-TELNET_INTERFACES = ['127.0.0.1'] if LOCKDOWN_MODE else settings.TELNET_INTERFACES
-SSL_INTERFACES = ['127.0.0.1'] if LOCKDOWN_MODE else settings.SSL_INTERFACES
-SSH_INTERFACES = ['127.0.0.1'] if LOCKDOWN_MODE else settings.SSH_INTERFACES
-WEBSERVER_INTERFACES = ['127.0.0.1'] if LOCKDOWN_MODE else settings.WEBSERVER_INTERFACES
-WEBSOCKET_CLIENT_INTERFACE = '127.0.0.1' if LOCKDOWN_MODE else settings.WEBSOCKET_CLIENT_INTERFACE
+TELNET_INTERFACES = ["127.0.0.1"] if LOCKDOWN_MODE else settings.TELNET_INTERFACES
+SSL_INTERFACES = ["127.0.0.1"] if LOCKDOWN_MODE else settings.SSL_INTERFACES
+SSH_INTERFACES = ["127.0.0.1"] if LOCKDOWN_MODE else settings.SSH_INTERFACES
+WEBSERVER_INTERFACES = ["127.0.0.1"] if LOCKDOWN_MODE else settings.WEBSERVER_INTERFACES
+WEBSOCKET_CLIENT_INTERFACE = "127.0.0.1" if LOCKDOWN_MODE else settings.WEBSOCKET_CLIENT_INTERFACE
 WEBSOCKET_CLIENT_URL = settings.WEBSOCKET_CLIENT_URL
 
 TELNET_ENABLED = settings.TELNET_ENABLED and TELNET_PORTS and TELNET_INTERFACES
@@ -69,16 +71,29 @@
 SSH_ENABLED = settings.SSH_ENABLED and SSH_PORTS and SSH_INTERFACES
 WEBSERVER_ENABLED = settings.WEBSERVER_ENABLED and WEBSERVER_PORTS and WEBSERVER_INTERFACES
 WEBCLIENT_ENABLED = settings.WEBCLIENT_ENABLED
-WEBSOCKET_CLIENT_ENABLED = settings.WEBSOCKET_CLIENT_ENABLED and WEBSOCKET_CLIENT_PORT and WEBSOCKET_CLIENT_INTERFACE
+WEBSOCKET_CLIENT_ENABLED = (
+    settings.WEBSOCKET_CLIENT_ENABLED and WEBSOCKET_CLIENT_PORT and WEBSOCKET_CLIENT_INTERFACE
+)
 
 AMP_HOST = settings.AMP_HOST
 AMP_PORT = settings.AMP_PORT
 AMP_INTERFACE = settings.AMP_INTERFACE
 AMP_ENABLED = AMP_HOST and AMP_PORT and AMP_INTERFACE
 
-INFO_DICT = {"servername": SERVERNAME, "version": VERSION, "errors": "", "info": "",
-             "lockdown_mode": "", "amp": "", "telnet": [], "telnet_ssl": [], "ssh": [],
-             "webclient": [], "webserver_proxy": [], "webserver_internal": []}
+INFO_DICT = {
+    "servername": SERVERNAME,
+    "version": VERSION,
+    "errors": "",
+    "info": "",
+    "lockdown_mode": "",
+    "amp": "",
+    "telnet": [],
+    "telnet_ssl": [],
+    "ssh": [],
+    "webclient": [],
+    "webserver_proxy": [],
+    "webserver_internal": [],
+}
 
 # -------------------------------------------------------------
 # Portal Service object
@@ -102,7 +117,7 @@ def __init__(self, application):
             application (Application): An instantiated Twisted application
 
         """
-        sys.path.append('.')
+        sys.path.append(".")
 
         # create a store of services
         self.services = service.MultiService()
@@ -124,8 +139,9 @@ def __init__(self, application):
 
         # set a callback if the server is killed abruptly,
         # by Ctrl-C, reboot etc.
-        reactor.addSystemEventTrigger('before', 'shutdown',
-                                      self.shutdown, _reactor_stopping=True, _stop_server=True)
+        reactor.addSystemEventTrigger(
+            "before", "shutdown", self.shutdown, _reactor_stopping=True, _stop_server=True
+        )
 
     def _get_backup_server_twistd_cmd(self):
         """
@@ -137,11 +153,13 @@ def _get_backup_server_twistd_cmd(self):
         """
         server_twistd_cmd = [
             "twistd",
-            "--python={}".format(os.path.join(dirname(dirname(abspath(__file__))), "server.py"))]
-        if os.name != 'nt':
+            "--python={}".format(os.path.join(dirname(dirname(abspath(__file__))), "server.py")),
+        ]
+        if os.name != "nt":
             gamedir = os.getcwd()
-            server_twistd_cmd.append("--pidfile={}".format(
-                os.path.join(gamedir, "server", "server.pid")))
+            server_twistd_cmd.append(
+                "--pidfile={}".format(os.path.join(gamedir, "server", "server.pid"))
+            )
         return server_twistd_cmd
 
     def get_info_dict(self):
@@ -171,7 +189,7 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
         self.sessions.disconnect_all()
         if _stop_server:
-            self.amp_protocol.stop_server(mode='shutdown')
+            self.amp_protocol.stop_server(mode="shutdown")
 
         if not _reactor_stopping:
             # shutting down the reactor will trigger another signal. We set
@@ -179,6 +197,7 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
             self.shutdown_complete = True
             reactor.callLater(0, reactor.stop)
 
+
 # -------------------------------------------------------------
 #
 # Start the Portal proxy server and add all active services
@@ -188,13 +207,14 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
 # twistd requires us to define the variable 'application' so it knows
 # what to execute from.
-application = service.Application('Portal')
+application = service.Application("Portal")
 
 # custom logging
 
 if "--nodaemon" not in sys.argv:
-    logfile = logger.WeeklyLogFile(os.path.basename(settings.PORTAL_LOG_FILE),
-                                   os.path.dirname(settings.PORTAL_LOG_FILE))
+    logfile = logger.WeeklyLogFile(
+        os.path.basename(settings.PORTAL_LOG_FILE), os.path.dirname(settings.PORTAL_LOG_FILE)
+    )
     application.setComponent(ILogObserver, logger.PortalLogObserver(logfile).emit)
 
 # The main Portal server program. This sets up the database
@@ -203,7 +223,7 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
 if LOCKDOWN_MODE:
 
-    INFO_DICT["lockdown_mode"] = '  LOCKDOWN_MODE active: Only local connections.'
+    INFO_DICT["lockdown_mode"] = "  LOCKDOWN_MODE active: Only local connections."
 
 if AMP_ENABLED:
 
@@ -213,7 +233,7 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
     from evennia.server.portal import amp_server
 
-    INFO_DICT["amp"] = 'amp: %s' % AMP_PORT
+    INFO_DICT["amp"] = "amp: %s" % AMP_PORT
 
     factory = amp_server.AMPServerFactory(PORTAL)
     amp_service = internet.TCPServer(AMP_PORT, factory, interface=AMP_INTERFACE)
@@ -232,7 +252,7 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
     for interface in TELNET_INTERFACES:
         ifacestr = ""
-        if interface not in ('0.0.0.0', '::') or len(TELNET_INTERFACES) > 1:
+        if interface not in ("0.0.0.0", "::") or len(TELNET_INTERFACES) > 1:
             ifacestr = "-%s" % interface
         for port in TELNET_PORTS:
             pstring = "%s:%s" % (ifacestr, port)
@@ -241,10 +261,10 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
             factory.protocol = telnet.TelnetProtocol
             factory.sessionhandler = PORTAL_SESSIONS
             telnet_service = internet.TCPServer(port, factory, interface=interface)
-            telnet_service.setName('EvenniaTelnet%s' % pstring)
+            telnet_service.setName("EvenniaTelnet%s" % pstring)
             PORTAL.services.addService(telnet_service)
 
-            INFO_DICT["telnet"].append('telnet%s: %s' % (ifacestr, port))
+            INFO_DICT["telnet"].append("telnet%s: %s" % (ifacestr, port))
 
 
 if SSL_ENABLED:
@@ -255,7 +275,7 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
     for interface in SSL_INTERFACES:
         ifacestr = ""
-        if interface not in ('0.0.0.0', '::') or len(SSL_INTERFACES) > 1:
+        if interface not in ("0.0.0.0", "::") or len(SSL_INTERFACES) > 1:
             ifacestr = "-%s" % interface
         for port in SSL_PORTS:
             pstring = "%s:%s" % (ifacestr, port)
@@ -266,17 +286,17 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
             ssl_context = telnet_ssl.getSSLContext()
             if ssl_context:
-                ssl_service = internet.SSLServer(port,
-                                                 factory,
-                                                 telnet_ssl.getSSLContext(),
-                                                 interface=interface)
-                ssl_service.setName('EvenniaSSL%s' % pstring)
+                ssl_service = internet.SSLServer(
+                    port, factory, telnet_ssl.getSSLContext(), interface=interface
+                )
+                ssl_service.setName("EvenniaSSL%s" % pstring)
                 PORTAL.services.addService(ssl_service)
 
                 INFO_DICT["telnet_ssl"].append("telnet+ssl%s: %s" % (ifacestr, port))
             else:
                 INFO_DICT["telnet_ssl"].append(
-                        "telnet+ssl%s: %s (deactivated - keys/cert unset)" % (ifacestr, port))
+                    "telnet+ssl%s: %s (deactivated - keys/cert unset)" % (ifacestr, port)
+                )
 
 
 if SSH_ENABLED:
@@ -288,16 +308,20 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
 
     for interface in SSH_INTERFACES:
         ifacestr = ""
-        if interface not in ('0.0.0.0', '::') or len(SSH_INTERFACES) > 1:
+        if interface not in ("0.0.0.0", "::") or len(SSH_INTERFACES) > 1:
             ifacestr = "-%s" % interface
         for port in SSH_PORTS:
             pstring = "%s:%s" % (ifacestr, port)
-            factory = ssh.makeFactory({'protocolFactory': ssh.SshProtocol,
-                                       'protocolArgs': (),
-                                       'sessions': PORTAL_SESSIONS})
+            factory = ssh.makeFactory(
+                {
+                    "protocolFactory": ssh.SshProtocol,
+                    "protocolArgs": (),
+                    "sessions": PORTAL_SESSIONS,
+                }
+            )
             factory.noisy = False
             ssh_service = internet.TCPServer(port, factory, interface=interface)
-            ssh_service.setName('EvenniaSSH%s' % pstring)
+            ssh_service.setName("EvenniaSSH%s" % pstring)
             PORTAL.services.addService(ssh_service)
 
             INFO_DICT["ssh"].append("ssh%s: %s" % (ifacestr, port))
@@ -311,10 +335,10 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
     websocket_started = False
     for interface in WEBSERVER_INTERFACES:
         ifacestr = ""
-        if interface not in ('0.0.0.0', '::') or len(WEBSERVER_INTERFACES) > 1:
+        if interface not in ("0.0.0.0", "::") or len(WEBSERVER_INTERFACES) > 1:
             ifacestr = "-%s" % interface
         for proxyport, serverport in WEBSERVER_PORTS:
-            web_root = EvenniaReverseProxyResource('127.0.0.1', serverport, '')
+            web_root = EvenniaReverseProxyResource("127.0.0.1", serverport, "")
             webclientstr = ""
             if WEBCLIENT_ENABLED:
                 # create ajax client processes at /webclientdata
@@ -332,8 +356,8 @@ def shutdown(self, _reactor_stopping=False, _stop_server=False):
                     from autobahn.twisted.websocket import WebSocketServerFactory
 
                     w_interface = WEBSOCKET_CLIENT_INTERFACE
-                    w_ifacestr = ''
-                    if w_interface not in ('0.0.0.0', '::') or len(WEBSERVER_INTERFACES) > 1:
+                    w_ifacestr = ""
+                    if w_interface not in ("0.0.0.0", "::") or len(WEBSERVER_INTERFACES) > 1:
                         w_ifacestr = "-%s" % interface
                     port = WEBSOCKET_CLIENT_PORT
 
@@ -346,7 +370,7 @@ class Websocket(WebSocketServerFactory):
                     factory.protocol = webclient.WebSocketClient
                     factory.sessionhandler = PORTAL_SESSIONS
                     websocket_service = internet.TCPServer(port, factory, interface=w_interface)
-                    websocket_service.setName('EvenniaWebSocket%s:%s' % (w_ifacestr, port))
+                    websocket_service.setName("EvenniaWebSocket%s:%s" % (w_ifacestr, port))
                     PORTAL.services.addService(websocket_service)
                     websocket_started = True
                     webclientstr = "webclient-websocket%s: %s" % (w_ifacestr, port)
@@ -354,10 +378,8 @@ class Websocket(WebSocketServerFactory):
 
             web_root = Website(web_root, logPath=settings.HTTP_LOG_FILE)
             web_root.is_portal = True
-            proxy_service = internet.TCPServer(proxyport,
-                                               web_root,
-                                               interface=interface)
-            proxy_service.setName('EvenniaWebProxy%s:%s' % (ifacestr, proxyport))
+            proxy_service = internet.TCPServer(proxyport, web_root, interface=interface)
+            proxy_service.setName("EvenniaWebProxy%s:%s" % (ifacestr, proxyport))
             PORTAL.services.addService(proxy_service)
             INFO_DICT["webserver_proxy"].append("webserver-proxy%s: %s" % (ifacestr, proxyport))
             INFO_DICT["webserver_internal"].append("webserver: %s" % serverport)
diff --git a/evennia/server/portal/portalsessionhandler.py b/evennia/server/portal/portalsessionhandler.py
index ed3766af598..0f4c6cb5604 100644
--- a/evennia/server/portal/portalsessionhandler.py
+++ b/evennia/server/portal/portalsessionhandler.py
@@ -3,13 +3,11 @@
 """
 
 
-
 import time
 from collections import deque, namedtuple
 from twisted.internet import reactor
 from django.conf import settings
-from evennia.server.sessionhandler import SessionHandler, PCONN, PDISCONN, \
-    PCONNSYNC, PDISCONNALL
+from evennia.server.sessionhandler import SessionHandler, PCONN, PDISCONN, PCONNSYNC, PDISCONNALL
 from evennia.utils.logger import log_trace
 
 # module import
@@ -29,7 +27,7 @@
 
 _CONNECTION_QUEUE = deque()
 
-DUMMYSESSION = namedtuple('DummySession', ['sessid'])(0)
+DUMMYSESSION = namedtuple("DummySession", ["sessid"])(0)
 
 # -------------------------------------------------------------
 # Portal-SessionHandler class
@@ -98,19 +96,34 @@ def connect(self, session):
             session.server_connected = False
             _CONNECTION_QUEUE.appendleft(session)
             if len(_CONNECTION_QUEUE) > 1:
-                session.data_out(text=[["%s DoS protection is active. You are queued to connect in %g seconds ..." % (
-                                 settings.SERVERNAME,
-                                 len(_CONNECTION_QUEUE) * _MIN_TIME_BETWEEN_CONNECTS)], {}])
+                session.data_out(
+                    text=[
+                        [
+                            "%s DoS protection is active. You are queued to connect in %g seconds ..."
+                            % (
+                                settings.SERVERNAME,
+                                len(_CONNECTION_QUEUE) * _MIN_TIME_BETWEEN_CONNECTS,
+                            )
+                        ],
+                        {},
+                    ]
+                )
         now = time.time()
-        if (now - self.connection_last < _MIN_TIME_BETWEEN_CONNECTS) or not self.portal.amp_protocol:
+        if (
+            now - self.connection_last < _MIN_TIME_BETWEEN_CONNECTS
+        ) or not self.portal.amp_protocol:
             if not session or not self.connection_task:
-                self.connection_task = reactor.callLater(_MIN_TIME_BETWEEN_CONNECTS, self.connect, None)
+                self.connection_task = reactor.callLater(
+                    _MIN_TIME_BETWEEN_CONNECTS, self.connect, None
+                )
             self.connection_last = now
             return
         elif not session:
             if _CONNECTION_QUEUE:
                 # keep launching tasks until queue is empty
-                self.connection_task = reactor.callLater(_MIN_TIME_BETWEEN_CONNECTS, self.connect, None)
+                self.connection_task = reactor.callLater(
+                    _MIN_TIME_BETWEEN_CONNECTS, self.connect, None
+                )
             else:
                 self.connection_task = None
         self.connection_last = now
@@ -122,9 +135,9 @@ def connect(self, session):
 
             self[session.sessid] = session
             session.server_connected = True
-            self.portal.amp_protocol.send_AdminPortal2Server(session,
-                                                             operation=PCONN,
-                                                             sessiondata=sessdata)
+            self.portal.amp_protocol.send_AdminPortal2Server(
+                session, operation=PCONN, sessiondata=sessdata
+            )
 
     def sync(self, session):
         """
@@ -144,16 +157,23 @@ def sync(self, session):
             if self.portal.amp_protocol:
                 # we only send sessdata that should not have changed
                 # at the server level at this point
-                sessdata = dict((key, val) for key, val in sessdata.items() if key in ("protocol_key",
-                                                                                       "address",
-                                                                                       "sessid",
-                                                                                       "csessid",
-                                                                                       "conn_time",
-                                                                                       "protocol_flags",
-                                                                                       "server_data",))
-                self.portal.amp_protocol.send_AdminPortal2Server(session,
-                                                                 operation=PCONNSYNC,
-                                                                 sessiondata=sessdata)
+                sessdata = dict(
+                    (key, val)
+                    for key, val in sessdata.items()
+                    if key
+                    in (
+                        "protocol_key",
+                        "address",
+                        "sessid",
+                        "csessid",
+                        "conn_time",
+                        "protocol_flags",
+                        "server_data",
+                    )
+                )
+                self.portal.amp_protocol.send_AdminPortal2Server(
+                    session, operation=PCONNSYNC, sessiondata=sessdata
+                )
 
     def disconnect(self, session):
         """
@@ -187,6 +207,7 @@ def disconnect_all(self):
         """
         Disconnect all sessions, informing the Server.
         """
+
         def _callback(result, sessionhandler):
             # we set a watchdog to stop self.disconnect from deleting
             # sessions while we are looping over them.
@@ -197,8 +218,9 @@ def _callback(result, sessionhandler):
 
         # inform Server; wait until finished sending before we continue
         # removing all the sessions.
-        self.portal.amp_protocol.send_AdminPortal2Server(DUMMYSESSION,
-                                                         operation=PDISCONNALL).addCallback(_callback, self)
+        self.portal.amp_protocol.send_AdminPortal2Server(
+            DUMMYSESSION, operation=PDISCONNALL
+        ).addCallback(_callback, self)
 
     def server_connect(self, protocol_path="", config=dict()):
         """
@@ -324,8 +346,11 @@ def sessions_from_csessid(self, csessid):
             session (list): The matching session, if found.
 
         """
-        return [sess for sess in self.get_sessions(include_unloggedin=True)
-                if hasattr(sess, 'csessid') and sess.csessid and sess.csessid == csessid]
+        return [
+            sess
+            for sess in self.get_sessions(include_unloggedin=True)
+            if hasattr(sess, "csessid") and sess.csessid and sess.csessid == csessid
+        ]
 
     def announce_all(self, message):
         """
@@ -358,7 +383,7 @@ def data_in(self, session, **kwargs):
 
         """
         try:
-            text = kwargs['text']
+            text = kwargs["text"]
             if (_MAX_CHAR_LIMIT > 0) and len(text) > _MAX_CHAR_LIMIT:
                 if session:
                     self.data_out(session, text=[[_ERROR_MAX_CHAR], {}])
@@ -398,8 +423,7 @@ def data_in(self, session, **kwargs):
 
             # relay data to Server
             session.cmd_last = now
-            self.portal.amp_protocol.send_MsgPortal2Server(session,
-                                                           **kwargs)
+            self.portal.amp_protocol.send_MsgPortal2Server(session, **kwargs)
 
     def data_out(self, session, **kwargs):
         """
diff --git a/evennia/server/portal/rss.py b/evennia/server/portal/rss.py
index 351a5d3f5fc..21772cd09ed 100644
--- a/evennia/server/portal/rss.py
+++ b/evennia/server/portal/rss.py
@@ -5,21 +5,21 @@
 to the channel whenever the feed updates.
 
 """
-from builtins import object
-
 from twisted.internet import task, threads
 from django.conf import settings
 from evennia.server.session import Session
 from evennia.utils import logger
 
 RSS_ENABLED = settings.RSS_ENABLED
-#RETAG = re.compile(r'<[^>]*?>')
+# RETAG = re.compile(r'<[^>]*?>')
 
 if RSS_ENABLED:
     try:
         import feedparser
     except ImportError:
-        raise ImportError("RSS requires python-feedparser to be installed. Install or set RSS_ENABLED=False.")
+        raise ImportError(
+            "RSS requires python-feedparser to be installed. Install or set RSS_ENABLED=False."
+        )
 
 
 class RSSReader(Session):
@@ -50,8 +50,8 @@ def get_new(self):
         """
         feed = feedparser.parse(self.url)
         new_entries = []
-        for entry in feed['entries']:
-            idval = entry['id'] + entry.get("updated", "")
+        for entry in feed["entries"]:
+            idval = entry["id"] + entry.get("updated", "")
             if idval not in self.old_entries:
                 self.old_entries[idval] = entry
                 new_entries.append(entry)
@@ -112,7 +112,11 @@ def update(self, init=False):
             on slow connections.
 
         """
-        return threads.deferToThread(self.get_new).addCallback(self._callback, init).addErrback(self._errback)
+        return (
+            threads.deferToThread(self.get_new)
+            .addCallback(self._callback, init)
+            .addErrback(self._errback)
+        )
 
 
 class RSSBotFactory(object):
@@ -142,6 +146,7 @@ def start(self):
         """
         Called by portalsessionhandler. Starts the bot.
         """
+
         def errback(fail):
             logger.log_err(fail.value)
 
diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py
index 7701cc9a0d6..b2a891710fb 100644
--- a/evennia/server/portal/ssh.py
+++ b/evennia/server/portal/ssh.py
@@ -9,7 +9,6 @@
 
 """
 
-from builtins import object
 import os
 import re
 
@@ -20,7 +19,7 @@
 _SSH_IMPORT_ERROR = """
 ERROR: Missing crypto library for SSH. Install it with
 
-       pip install cryptography pyasn1
+       pip install cryptography pyasn1 bcrypt
 
 (On older Twisted versions you may have to do 'pip install pycrypto pyasn1' instead).
 
@@ -50,16 +49,18 @@
 from evennia.utils.utils import to_str
 
 _RE_N = re.compile(r"\|n$")
-_RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE)
+_RE_SCREENREADER_REGEX = re.compile(
+    r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE
+)
 _GAME_DIR = settings.GAME_DIR
 _PRIVATE_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssh-private.key")
 _PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssh-public.key")
 _KEY_LENGTH = 2048
 
-CTRL_C = '\x03'
-CTRL_D = '\x04'
-CTRL_BACKSLASH = '\x1c'
-CTRL_L = '\x0c'
+CTRL_C = "\x03"
+CTRL_D = "\x04"
+CTRL_BACKSLASH = "\x1c"
+CTRL_L = "\x0c"
 
 _NO_AUTOGEN = """
 Evennia could not generate SSH private- and public keys ({{err}})
@@ -69,7 +70,9 @@
 and put them here:
     {}
     {}
-""".format(_PRIVATE_KEY_FILE, _PUBLIC_KEY_FILE)
+""".format(
+    _PRIVATE_KEY_FILE, _PUBLIC_KEY_FILE
+)
 
 
 # not used atm
@@ -88,6 +91,7 @@ class SshProtocol(Manhole, session.Session):
     here.
 
     """
+
     noisy = False
 
     def __init__(self, starttuple):
@@ -163,7 +167,7 @@ def handle_EOF(self):
 
         """
         if self.lineBuffer:
-            self.terminal.write('\a')
+            self.terminal.write("\a")
         else:
             self.handle_QUIT()
 
@@ -230,7 +234,7 @@ def sendLine(self, string):
             string (str): Output text.
 
         """
-        for line in string.split('\n'):
+        for line in string.split("\n"):
             # the telnet-specific method for sending
             self.terminal.write(line)
             self.terminal.nextLine()
@@ -252,7 +256,7 @@ def disconnect(self, reason="Connection closed. Goodbye for now."):
 
         """
         if reason:
-            self.data_out(text=((reason, ), {}))
+            self.data_out(text=((reason,), {}))
         self.connectionLost(reason)
 
     def data_out(self, **kwargs):
@@ -295,8 +299,8 @@ def send_text(self, *args, **kwargs):
         # handle arguments
         options = kwargs.get("options", {})
         flags = self.protocol_flags
-        xterm256 = options.get("xterm256", flags.get('XTERM256', True))
-        useansi = options.get("ansi", flags.get('ANSI', True))
+        xterm256 = options.get("xterm256", flags.get("XTERM256", True))
+        useansi = options.get("ansi", flags.get("ANSI", True))
         raw = options.get("raw", flags.get("RAW", False))
         nocolor = options.get("nocolor", flags.get("NOCOLOR") or not (xterm256 or useansi))
         # echo = options.get("echo", None)  # DEBUG
@@ -314,8 +318,12 @@ def send_text(self, *args, **kwargs):
         else:
             # we need to make sure to kill the color at the end in order
             # to match the webclient output.
-            linetosend = ansi.parse_ansi(_RE_N.sub("", text) + ("||n" if text.endswith("|") else "|n"),
-                                         strip_ansi=nocolor, xterm256=xterm256, mxp=False)
+            linetosend = ansi.parse_ansi(
+                _RE_N.sub("", text) + ("||n" if text.endswith("|") else "|n"),
+                strip_ansi=nocolor,
+                xterm256=xterm256,
+                mxp=False,
+            )
             self.sendLine(linetosend)
 
     def send_prompt(self, *args, **kwargs):
@@ -343,8 +351,7 @@ def auth_password(self, packet):
         password = common.getNS(packet[1:])[0]
         c = credentials.UsernamePassword(self.user, password)
         c.transport = self.transport
-        return self.portal.login(c, None, IConchUser).addErrback(
-            self._ebPassword)
+        return self.portal.login(c, None, IConchUser).addErrback(self._ebPassword)
 
 
 class AccountDBPasswordChecker(object):
@@ -354,6 +361,7 @@ class AccountDBPasswordChecker(object):
     useful for the Realm.
 
     """
+
     noisy = False
     credentialInterfaces = (credentials.IUsernamePassword,)
 
@@ -423,9 +431,12 @@ def __init__(self, proto, chainedProtocol, avatar, width, height):
         session = self.proto.session
 
         self.proto.makeConnection(
-            _Glue(write=self.chainedProtocol.dataReceived,
-                  loseConnection=lambda: avatar.conn.sendClose(session),
-                  name="SSH Proto Transport"))
+            _Glue(
+                write=self.chainedProtocol.dataReceived,
+                loseConnection=lambda: avatar.conn.sendClose(session),
+                name="SSH Proto Transport",
+            )
+        )
 
         def loseConnection():
             self.proto.loseConnection()
@@ -434,9 +445,13 @@ def getPeer():
             return session.conn.transport.transport.getPeer()
 
         self.chainedProtocol.makeConnection(
-            _Glue(getPeer=getPeer, write=self.proto.write,
-                  loseConnection=loseConnection,
-                  name="Chained Proto Transport"))
+            _Glue(
+                getPeer=getPeer,
+                write=self.proto.write,
+                loseConnection=loseConnection,
+                name="Chained Proto Transport",
+            )
+        )
 
         self.chainedProtocol.terminalProtocol.terminalSize(width, height)
 
@@ -456,10 +471,10 @@ def getKeyPair(pubkeyfile, privkeyfile):
         private_key_string = rsa_key.toString(type="OPENSSH")
 
         # save keys for the future.
-        with open(privkeyfile, 'wt') as pfile:
+        with open(privkeyfile, "wt") as pfile:
             pfile.write(private_key_string)
             print("Created SSH private key in '{}'".format(_PRIVATE_KEY_FILE))
-        with open(pubkeyfile, 'wt') as pfile:
+        with open(pubkeyfile, "wt") as pfile:
             pfile.write(public_key_string)
             print("Created SSH public key in '{}'".format(_PUBLIC_KEY_FILE))
     else:
@@ -475,28 +490,30 @@ def makeFactory(configdict):
     """
     Creates the ssh server factory.
     """
+
     def chainProtocolFactory(username=None):
         return insults.ServerProtocol(
-            configdict['protocolFactory'],
-            *configdict.get('protocolConfigdict', (username,)),
-            **configdict.get('protocolKwArgs', {}))
+            configdict["protocolFactory"],
+            *configdict.get("protocolConfigdict", (username,)),
+            **configdict.get("protocolKwArgs", {}),
+        )
 
     rlm = PassAvatarIdTerminalRealm()
     rlm.transportFactory = TerminalSessionTransport_getPeer
     rlm.chainedProtocolFactory = chainProtocolFactory
     factory = ConchFactory(Portal(rlm))
-    factory.sessionhandler = configdict['sessions']
+    factory.sessionhandler = configdict["sessions"]
 
     try:
         # create/get RSA keypair
         publicKey, privateKey = getKeyPair(_PUBLIC_KEY_FILE, _PRIVATE_KEY_FILE)
-        factory.publicKeys = {'ssh-rsa': publicKey}
-        factory.privateKeys = {'ssh-rsa': privateKey}
+        factory.publicKeys = {b"ssh-rsa": publicKey}
+        factory.privateKeys = {b"ssh-rsa": privateKey}
     except Exception as err:
         print(_NO_AUTOGEN.format(err=err))
 
     factory.services = factory.services.copy()
-    factory.services['ssh-userauth'] = ExtraInfoAuthServer
+    factory.services["ssh-userauth"] = ExtraInfoAuthServer
 
     factory.portal.registerChecker(AccountDBPasswordChecker(factory))
 
diff --git a/evennia/server/portal/ssl.py b/evennia/server/portal/ssl.py
index 2f57277fd64..44642bd9e9f 100644
--- a/evennia/server/portal/ssl.py
+++ b/evennia/server/portal/ssl.py
@@ -5,6 +5,7 @@
 """
 import os
 import sys
+
 try:
     import OpenSSL
     from twisted.internet import ssl as twisted_ssl
@@ -67,14 +68,14 @@ def verify_SSL_key_and_cert(keyfile, certfile):
         from Crypto.PublicKey import RSA
         from twisted.conch.ssh.keys import Key
 
-        print("  Creating SSL key and certificate ... ", end=' ')
+        print("  Creating SSL key and certificate ... ", end=" ")
 
         try:
             # create the RSA key and store it.
             KEY_LENGTH = 1024
             rsaKey = Key(RSA.generate(KEY_LENGTH))
             keyString = rsaKey.toString(type="OPENSSH")
-            file(keyfile, 'w+b').write(keyString)
+            file(keyfile, "w+b").write(keyString)
         except Exception as err:
             print(NO_AUTOGEN.format(err=err, keyfile=keyfile))
             sys.exit(5)
@@ -83,11 +84,17 @@ def verify_SSL_key_and_cert(keyfile, certfile):
         CERT_EXPIRE = 365 * 20  # twenty years validity
         # default:
         # openssl req -new -x509 -key ssl.key -out ssl.cert -days 7300
-        exestring = "openssl req -new -x509 -key %s -out %s -days %s" % (keyfile, certfile, CERT_EXPIRE)
+        exestring = "openssl req -new -x509 -key %s -out %s -days %s" % (
+            keyfile,
+            certfile,
+            CERT_EXPIRE,
+        )
         try:
             subprocess.call(exestring)
         except OSError as err:
-            raise OSError(NO_AUTOCERT.format(err=err, certfile=certfile, keyfile=keyfile, exestring=exestring))
+            raise OSError(
+                NO_AUTOCERT.format(err=err, certfile=certfile, keyfile=keyfile, exestring=exestring)
+            )
         print("done.")
 
 
diff --git a/evennia/server/portal/suppress_ga.py b/evennia/server/portal/suppress_ga.py
index bed633531e0..2e8f38808ad 100644
--- a/evennia/server/portal/suppress_ga.py
+++ b/evennia/server/portal/suppress_ga.py
@@ -13,8 +13,7 @@
 http://www.faqs.org/rfcs/rfc858.html
 
 """
-from builtins import object
-SUPPRESS_GA = b'\x03'
+SUPPRESS_GA = b"\x03"
 
 # default taken from telnet specification
 
diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py
index b82754f37a8..1d5afcfcbc8 100644
--- a/evennia/server/portal/telnet.py
+++ b/evennia/server/portal/telnet.py
@@ -11,7 +11,19 @@
 from twisted.internet import protocol
 from twisted.internet.task import LoopingCall
 from twisted.conch.telnet import Telnet, StatefulTelnetProtocol
-from twisted.conch.telnet import IAC, NOP, LINEMODE, GA, WILL, WONT, ECHO, NULL
+from twisted.conch.telnet import (
+    IAC,
+    NOP,
+    LINEMODE,
+    GA,
+    WILL,
+    WONT,
+    ECHO,
+    NULL,
+    MODE,
+    LINEMODE_EDIT,
+    LINEMODE_TRAPSIG,
+)
 from django.conf import settings
 from evennia.server.session import Session
 from evennia.server.portal import ttype, mssp, telnet_oob, naws, suppress_ga
@@ -23,7 +35,9 @@
 _RE_N = re.compile(r"\|n$")
 _RE_LEND = re.compile(br"\n$|\r$|\r\n$|\r\x00$|", re.MULTILINE)
 _RE_LINEBREAK = re.compile(br"\n\r|\r\n|\n|\r", re.DOTALL + re.MULTILINE)
-_RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE)
+_RE_SCREENREADER_REGEX = re.compile(
+    r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE
+)
 _IDLE_COMMAND = str.encode(settings.IDLE_COMMAND + "\n")
 
 
@@ -51,6 +65,8 @@ def connectionMade(self):
         This is called when the connection is first established.
 
         """
+        # important in order to work normally with standard telnet
+        self.do(LINEMODE)
         # initialize the session
         self.line_buffer = b""
         client_address = self.transport.client
@@ -60,7 +76,7 @@ def connectionMade(self):
         self.handshakes = 8  # suppress-go-ahead, naws, ttype, mccp, mssp, msdp, gmcp, mxp
 
         self.init_session(self.protocol_key, client_address, self.factory.sessionhandler)
-        self.protocol_flags["ENCODING"] = settings.ENCODINGS[0] if settings.ENCODINGS else 'utf-8'
+        self.protocol_flags["ENCODING"] = settings.ENCODINGS[0] if settings.ENCODINGS else "utf-8"
         # add this new connection to sessionhandler so
         # the Server becomes aware of it.
         self.sessionhandler.connect(self)
@@ -83,6 +99,7 @@ def connectionMade(self):
         self.mxp = Mxp(self)
 
         from evennia.utils.utils import delay
+
         # timeout the handshakes in case the client doesn't reply at all
         self._handshake_delay = delay(2, callback=self.handshake_done, timeout=True)
 
@@ -146,12 +163,20 @@ def enableRemote(self, option):
             enable (bool): If this option should be enabled.
 
         """
-        return (option == LINEMODE or
-                option == ttype.TTYPE or
-                option == naws.NAWS or
-                option == MCCP or
-                option == mssp.MSSP or
-                option == suppress_ga.SUPPRESS_GA)
+        if option == LINEMODE:
+            # make sure to activate line mode with local editing for all clients
+            self.requestNegotiation(
+                LINEMODE, MODE + bytes(chr(ord(LINEMODE_EDIT) + ord(LINEMODE_TRAPSIG)), "ascii")
+            )
+            return True
+        else:
+            return (
+                option == ttype.TTYPE
+                or option == naws.NAWS
+                or option == MCCP
+                or option == mssp.MSSP
+                or option == suppress_ga.SUPPRESS_GA
+            )
 
     def enableLocal(self, option):
         """
@@ -164,9 +189,12 @@ def enableLocal(self, option):
             enable (bool): If this option should be enabled.
 
         """
-        return (option == MCCP or
-                option == ECHO or
-                option == suppress_ga.SUPPRESS_GA)
+        return (
+            option == LINEMODE
+            or option == MCCP
+            or option == ECHO
+            or option == suppress_ga.SUPPRESS_GA
+        )
 
     def disableLocal(self, option):
         """
@@ -232,7 +260,7 @@ def applicationDataReceived(self, data):
 
     def _write(self, data):
         """hook overloading the one used in plain telnet"""
-        data = data.replace(b'\n', b'\r\n').replace(b'\r\r\n', b'\r\n')
+        data = data.replace(b"\n", b"\r\n").replace(b"\r\r\n", b"\r\n")
         super()._write(mccp_compress(self, data))
 
     def sendLine(self, line):
@@ -246,7 +274,7 @@ def sendLine(self, line):
         line = to_bytes(line, self)
         # escape IAC in line mode, and correctly add \r\n (the TELNET end-of-line)
         line = line.replace(IAC, IAC + IAC)
-        line = line.replace(b'\n', b'\r\n')
+        line = line.replace(b"\n", b"\r\n")
         if not line.endswith(b"\r\n") and self.protocol_flags.get("FORCEDENDLINE", True):
             line += b"\r\n"
         if not self.protocol_flags.get("NOGOAHEAD", True):
@@ -320,8 +348,12 @@ def send_text(self, *args, **kwargs):
         # handle arguments
         options = kwargs.get("options", {})
         flags = self.protocol_flags
-        xterm256 = options.get("xterm256", flags.get('XTERM256', False) if flags.get("TTYPE", False) else True)
-        useansi = options.get("ansi", flags.get('ANSI', False) if flags.get("TTYPE", False) else True)
+        xterm256 = options.get(
+            "xterm256", flags.get("XTERM256", False) if flags.get("TTYPE", False) else True
+        )
+        useansi = options.get(
+            "ansi", flags.get("ANSI", False) if flags.get("TTYPE", False) else True
+        )
         raw = options.get("raw", flags.get("RAW", False))
         nocolor = options.get("nocolor", flags.get("NOCOLOR") or not (xterm256 or useansi))
         echo = options.get("echo", None)
@@ -338,12 +370,15 @@ def send_text(self, *args, **kwargs):
             prompt = text
             if not raw:
                 # processing
-                prompt = ansi.parse_ansi(_RE_N.sub("", prompt) + ("||n" if prompt.endswith("|") else "|n"),
-                                         strip_ansi=nocolor, xterm256=xterm256)
+                prompt = ansi.parse_ansi(
+                    _RE_N.sub("", prompt) + ("||n" if prompt.endswith("|") else "|n"),
+                    strip_ansi=nocolor,
+                    xterm256=xterm256,
+                )
                 if mxp:
                     prompt = mxp_parse(prompt)
             prompt = to_bytes(prompt, self)
-            prompt = prompt.replace(IAC, IAC + IAC).replace(b'\n', b'\r\n')
+            prompt = prompt.replace(IAC, IAC + IAC).replace(b"\n", b"\r\n")
             prompt += IAC + GA
             self.transport.write(mccp_compress(self, prompt))
         else:
@@ -367,8 +402,12 @@ def send_text(self, *args, **kwargs):
             else:
                 # we need to make sure to kill the color at the end in order
                 # to match the webclient output.
-                linetosend = ansi.parse_ansi(_RE_N.sub("", text) + ("||n" if text.endswith("|") else "|n"),
-                                             strip_ansi=nocolor, xterm256=xterm256, mxp=mxp)
+                linetosend = ansi.parse_ansi(
+                    _RE_N.sub("", text) + ("||n" if text.endswith("|") else "|n"),
+                    strip_ansi=nocolor,
+                    xterm256=xterm256,
+                    mxp=mxp,
+                )
                 if mxp:
                     linetosend = mxp_parse(linetosend)
                 self.sendLine(linetosend)
diff --git a/evennia/server/portal/telnet_oob.py b/evennia/server/portal/telnet_oob.py
index f8a11d1beee..f6e156f5a42 100644
--- a/evennia/server/portal/telnet_oob.py
+++ b/evennia/server/portal/telnet_oob.py
@@ -25,22 +25,21 @@
 header where applicable.
 
 """
-from builtins import object
 import re
 import json
 from evennia.utils.utils import is_iter
 
 # MSDP-relevant telnet cmd/opt-codes
-MSDP = b'\x45'
-MSDP_VAR = b'\x01'          # ^A
-MSDP_VAL = b'\x02'          # ^B
-MSDP_TABLE_OPEN = b'\x03'   # ^C
-MSDP_TABLE_CLOSE = b'\x04'  # ^D
-MSDP_ARRAY_OPEN = b'\x05'   # ^E
-MSDP_ARRAY_CLOSE = b'\x06'  # ^F
+MSDP = b"\x45"
+MSDP_VAR = b"\x01"  # ^A
+MSDP_VAL = b"\x02"  # ^B
+MSDP_TABLE_OPEN = b"\x03"  # ^C
+MSDP_TABLE_CLOSE = b"\x04"  # ^D
+MSDP_ARRAY_OPEN = b"\x05"  # ^E
+MSDP_ARRAY_CLOSE = b"\x06"  # ^F
 
 # GMCP
-GMCP = b'\xc9'
+GMCP = b"\xc9"
 
 # General Telnet
 from twisted.conch.telnet import IAC, SB, SE
@@ -48,27 +47,28 @@
 
 # pre-compiled regexes
 # returns 2-tuple
-msdp_regex_table = re.compile(br"%s\s*(\w*?)\s*%s\s*%s(.*?)%s"
-                              % (MSDP_VAR, MSDP_VAL,
-                                 MSDP_TABLE_OPEN,
-                                 MSDP_TABLE_CLOSE))
+msdp_regex_table = re.compile(
+    br"%s\s*(\w*?)\s*%s\s*%s(.*?)%s" % (MSDP_VAR, MSDP_VAL, MSDP_TABLE_OPEN, MSDP_TABLE_CLOSE)
+)
 # returns 2-tuple
-msdp_regex_array = re.compile(br"%s\s*(\w*?)\s*%s\s*%s(.*?)%s"
-                              % (MSDP_VAR, MSDP_VAL,
-                                 MSDP_ARRAY_OPEN,
-                                 MSDP_ARRAY_CLOSE))
+msdp_regex_array = re.compile(
+    br"%s\s*(\w*?)\s*%s\s*%s(.*?)%s" % (MSDP_VAR, MSDP_VAL, MSDP_ARRAY_OPEN, MSDP_ARRAY_CLOSE)
+)
 msdp_regex_var = re.compile(br"%s" % MSDP_VAR)
 msdp_regex_val = re.compile(br"%s" % MSDP_VAL)
 
-EVENNIA_TO_GMCP = {"client_options": "Core.Supports.Get",
-                   "get_inputfuncs": "Core.Commands.Get",
-                   "get_value": "Char.Value.Get",
-                   "repeat": "Char.Repeat.Update",
-                   "monitor": "Char.Monitor.Update"}
+EVENNIA_TO_GMCP = {
+    "client_options": "Core.Supports.Get",
+    "get_inputfuncs": "Core.Commands.Get",
+    "get_value": "Char.Value.Get",
+    "repeat": "Char.Repeat.Update",
+    "monitor": "Char.Monitor.Update",
+}
 
 
 # MSDP/GMCP communication handler
 
+
 class TelnetOOB(object):
     """
     Implements the MSDP and GMCP protocols.
@@ -84,7 +84,7 @@ def __init__(self, protocol):
 
         """
         self.protocol = protocol
-        self.protocol.protocol_flags['OOB'] = False
+        self.protocol.protocol_flags["OOB"] = False
         self.MSDP = False
         self.GMCP = False
         # ask for the available protocols and assign decoders
@@ -115,7 +115,7 @@ def do_msdp(self, option):
 
         """
         self.MSDP = True
-        self.protocol.protocol_flags['OOB'] = True
+        self.protocol.protocol_flags["OOB"] = True
         self.protocol.handshake_done()
 
     def no_gmcp(self, option):
@@ -138,7 +138,7 @@ def do_gmcp(self, option):
 
         """
         self.GMCP = True
-        self.protocol.protocol_flags['OOB'] = True
+        self.protocol.protocol_flags["OOB"] = True
         self.protocol.handshake_done()
 
     # encoders
@@ -168,40 +168,45 @@ def encode_msdp(self, cmdname, *args, **kwargs):
 
         """
         msdp_cmdname = "{msdp_var}{msdp_cmdname}{msdp_val}".format(
-            msdp_var=MSDP_VAR, msdp_cmdname=cmdname, msdp_val=MSDP_VAL)
+            msdp_var=MSDP_VAR, msdp_cmdname=cmdname, msdp_val=MSDP_VAL
+        )
 
         if not (args or kwargs):
             return msdp_cmdname.encode()
 
         # print("encode_msdp in:", cmdname, args, kwargs)  # DEBUG
 
-        msdp_args = ''
+        msdp_args = ""
         if args:
             msdp_args = msdp_cmdname
             if len(args) == 1:
                 msdp_args += args[0]
             else:
-                msdp_args += "{msdp_array_open}" \
-                             "{msdp_args}" \
-                             "{msdp_array_close}".format(
-                                 msdp_array_open=MSDP_ARRAY_OPEN,
-                                 msdp_array_close=MSDP_ARRAY_CLOSE,
-                                 msdp_args="".join("%s%s"
-                                                   % (MSDP_VAL, json.dumps(val))
-                                                   for val in args))
+                msdp_args += (
+                    "{msdp_array_open}"
+                    "{msdp_args}"
+                    "{msdp_array_close}".format(
+                        msdp_array_open=MSDP_ARRAY_OPEN,
+                        msdp_array_close=MSDP_ARRAY_CLOSE,
+                        msdp_args="".join("%s%s" % (MSDP_VAL, json.dumps(val)) for val in args),
+                    )
+                )
 
         msdp_kwargs = ""
         if kwargs:
             msdp_kwargs = msdp_cmdname
-            msdp_kwargs += "{msdp_table_open}" \
-                           "{msdp_kwargs}" \
-                           "{msdp_table_close}".format(
-                               msdp_table_open=MSDP_TABLE_OPEN,
-                               msdp_table_close=MSDP_TABLE_CLOSE,
-                               msdp_kwargs="".join("%s%s%s%s"
-                                                   % (MSDP_VAR, key, MSDP_VAL,
-                                                      json.dumps(val))
-                                                   for key, val in kwargs.items()))
+            msdp_kwargs += (
+                "{msdp_table_open}"
+                "{msdp_kwargs}"
+                "{msdp_table_close}".format(
+                    msdp_table_open=MSDP_TABLE_OPEN,
+                    msdp_table_close=MSDP_TABLE_CLOSE,
+                    msdp_kwargs="".join(
+                        "%s%s%s%s" % (MSDP_VAR, key, MSDP_VAL, json.dumps(val))
+                        for key, val in kwargs.items()
+                    ),
+                )
+            )
 
         msdp_string = msdp_args + msdp_kwargs
 
diff --git a/evennia/server/portal/telnet_ssl.py b/evennia/server/portal/telnet_ssl.py
index bda0bf27856..1698d4faace 100644
--- a/evennia/server/portal/telnet_ssl.py
+++ b/evennia/server/portal/telnet_ssl.py
@@ -8,6 +8,7 @@
 
 """
 import os
+
 try:
     from OpenSSL import crypto
     from twisted.internet import ssl as twisted_ssl
@@ -34,8 +35,14 @@
 _PUBLIC_KEY_FILE = os.path.join(_GAME_DIR, "server", "ssl-public.key")
 _CERTIFICATE_FILE = os.path.join(_GAME_DIR, "server", "ssl.cert")
 _CERTIFICATE_EXPIRE = 365 * 24 * 60 * 60 * 20  # 20 years
-_CERTIFICATE_ISSUER = {"C": "EV", "ST": "Evennia", "L": "Evennia", "O":
-                       "Evennia Security", "OU": "Evennia Department", "CN": "evennia"}
+_CERTIFICATE_ISSUER = {
+    "C": "EV",
+    "ST": "Evennia",
+    "L": "Evennia",
+    "O": "Evennia Security",
+    "OU": "Evennia Department",
+    "CN": "evennia",
+}
 
 # messages
 
@@ -45,7 +52,9 @@
 should be placed and named like this:
     {}
     {}
-""".format(_PRIVATE_KEY_FILE, _PUBLIC_KEY_FILE)
+""".format(
+    _PRIVATE_KEY_FILE, _PUBLIC_KEY_FILE
+)
 
 NO_AUTOCERT = """
 Evennia's could not auto-generate the SSL certificate ({{err}}).
@@ -54,7 +63,9 @@
 If this error persists, create the certificate manually (using the private key and
 the tools for your OS). The file should be placed and named like this:
     {}
-""".format(_PRIVATE_KEY_FILE, _CERTIFICATE_FILE)
+""".format(
+    _PRIVATE_KEY_FILE, _CERTIFICATE_FILE
+)
 
 
 class SSLProtocol(TelnetProtocol):
@@ -88,11 +99,11 @@ def verify_or_create_SSL_key_and_cert(keyfile, certfile):
             keypair = crypto.PKey()
             keypair.generate_key(crypto.TYPE_RSA, _PRIVATE_KEY_LENGTH)
 
-            with open(_PRIVATE_KEY_FILE, 'wt') as pfile:
+            with open(_PRIVATE_KEY_FILE, "wt") as pfile:
                 pfile.write(crypto.dump_privatekey(crypto.FILETYPE_PEM, keypair))
                 print("Created SSL private key in '{}'.".format(_PRIVATE_KEY_FILE))
 
-            with open(_PUBLIC_KEY_FILE, 'wt') as pfile:
+            with open(_PUBLIC_KEY_FILE, "wt") as pfile:
                 pfile.write(crypto.dump_publickey(crypto.FILETYPE_PEM, keypair))
                 print("Created SSL public key in '{}'.".format(_PUBLIC_KEY_FILE))
 
@@ -114,9 +125,9 @@ def verify_or_create_SSL_key_and_cert(keyfile, certfile):
                 cert.gmtime_adj_notBefore(0)
                 cert.gmtime_adj_notAfter(_CERTIFICATE_EXPIRE)
                 cert.set_pubkey(keypair)
-                cert.sign(keypair, 'sha1')
+                cert.sign(keypair, "sha1")
 
-                with open(_CERTIFICATE_FILE, 'wt') as cfile:
+                with open(_CERTIFICATE_FILE, "wt") as cfile:
                     cfile.write(crypto.dump_certificate(crypto.FILETYPE_PEM, cert))
                     print("Created SSL certificate in '{}'.".format(_CERTIFICATE_FILE))
 
diff --git a/evennia/server/portal/tests.py b/evennia/server/portal/tests.py
index 1ecbd219260..c9b4c1456fa 100644
--- a/evennia/server/portal/tests.py
+++ b/evennia/server/portal/tests.py
@@ -36,6 +36,7 @@ class TestAMPServer(TwistedTestCase):
     """
     Test AMP communication
     """
+
     def setUp(self):
         super(TestAMPServer, self).setUp()
         portal = Mock()
@@ -49,9 +50,11 @@ def test_amp_out(self):
         self.proto.makeConnection(self.transport)
 
         self.proto.data_to_server(MsgServer2Portal, 1, test=2)
-        byte_out = (b'\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgServer2Portal\x00\x0b'
-                    b'packed_data\x00 x\xdak`\x99*\xc8\x00\x01\xde\x8c\xb5SzXJR'
-                    b'\x8bK\xa6x3\x15\xb7M\xd1\x03\x00V:\x07t\x00\x00')
+        byte_out = (
+            b"\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgServer2Portal\x00\x0b"
+            b"packed_data\x00 x\xdak`\x99*\xc8\x00\x01\xde\x8c\xb5SzXJR"
+            b"\x8bK\xa6x3\x15\xb7M\xd1\x03\x00V:\x07t\x00\x00"
+        )
         self.transport.write.assert_called_with(byte_out)
         with mock.patch("evennia.server.portal.amp.amp.AMP.dataReceived") as mocked_amprecv:
             self.proto.dataReceived(byte_out)
@@ -61,9 +64,11 @@ def test_amp_in(self):
         self.proto.makeConnection(self.transport)
 
         self.proto.data_to_server(MsgPortal2Server, 1, test=2)
-        byte_out = (b'\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgPortal2Server\x00\x0b'
-                    b'packed_data\x00 x\xdak`\x99*\xc8\x00\x01\xde\x8c\xb5SzXJR'
-                    b'\x8bK\xa6x3\x15\xb7M\xd1\x03\x00V:\x07t\x00\x00')
+        byte_out = (
+            b"\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgPortal2Server\x00\x0b"
+            b"packed_data\x00 x\xdak`\x99*\xc8\x00\x01\xde\x8c\xb5SzXJR"
+            b"\x8bK\xa6x3\x15\xb7M\xd1\x03\x00V:\x07t\x00\x00"
+        )
         self.transport.write.assert_called_with(byte_out)
         with mock.patch("evennia.server.portal.amp.amp.AMP.dataReceived") as mocked_amprecv:
             self.proto.dataReceived(byte_out)
@@ -74,52 +79,52 @@ def test_large_msg(self):
         Send message larger than AMP_MAXLEN - should be split into several
         """
         self.proto.makeConnection(self.transport)
-        outstr = 'test' * AMP_MAXLEN
+        outstr = "test" * AMP_MAXLEN
         self.proto.data_to_server(MsgServer2Portal, 1, test=outstr)
 
         if sys.version < "3.7":
             self.transport.write.assert_called_with(
-                b'\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgServer2Portal\x00\x0bpacked_data'
-                b'\x00xx\xda\xed\xc6\xc1\t\x800\x10\x00\xc1\x13\xaf\x01\xeb\xb2\x01\x1bH'
+                b"\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgServer2Portal\x00\x0bpacked_data"
+                b"\x00xx\xda\xed\xc6\xc1\t\x800\x10\x00\xc1\x13\xaf\x01\xeb\xb2\x01\x1bH"
                 b'\x05\xe6+X\x80\xcf\xd8m@I\x1d\x99\x85\x81\xbd\xf3\xdd"c\xb4/W{'
-                b'\xb2\x96\xb3\xb6\xa3\x7fk\x8c\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00`\x0e?Pv\x02\x16\x00\r'
-                b'packed_data.2\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08\xc0\xa0\xb4&\xf0\xfdg\x10a'
-                b'\xa3\xd9RUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU\xf5\xfb'
-                b'\x03m\xe0\x06\x1d\x00\rpacked_data.3\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08\xc0\xa0'
-                b'\xb4&\xf0\xfdg\x10a\xa3fSUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU'
-                b'UUUUU\xf5\xfb\x03n\x1c\x06\x1e\x00\rpacked_data.4\x00Zx\xda\xed\xc3\x01\t\x00'
-                b'\x00\x0c\x03\xa0\xb4O\xb0\xf5gA\xae`\xda\x8b\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
-                b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
-                b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
-                b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xdf\x0fnI'
-                b'\x06,\x00\rpacked_data.5\x00\x14x\xdaK-.)I\xc5\x8e\xa7\x14\xb7M\xd1\x03\x00'
-                b'\xe7s\x0e\x1c\x00\x00')
+                b"\xb2\x96\xb3\xb6\xa3\x7fk\x8c\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+                b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+                b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+                b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00`\x0e?Pv\x02\x16\x00\r"
+                b"packed_data.2\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08\xc0\xa0\xb4&\xf0\xfdg\x10a"
+                b"\xa3\xd9RUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU\xf5\xfb"
+                b"\x03m\xe0\x06\x1d\x00\rpacked_data.3\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08\xc0\xa0"
+                b"\xb4&\xf0\xfdg\x10a\xa3fSUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU"
+                b"UUUUU\xf5\xfb\x03n\x1c\x06\x1e\x00\rpacked_data.4\x00Zx\xda\xed\xc3\x01\t\x00"
+                b"\x00\x0c\x03\xa0\xb4O\xb0\xf5gA\xae`\xda\x8b\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xdf\x0fnI"
+                b"\x06,\x00\rpacked_data.5\x00\x14x\xdaK-.)I\xc5\x8e\xa7\x14\xb7M\xd1\x03\x00"
+                b"\xe7s\x0e\x1c\x00\x00"
+            )
         else:
             self.transport.write.assert_called_with(
-                b'\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgServer2Portal\x00\x0bpacked_data'
-                b'\x00wx\xda\xed\xc6\xc1\t\x80 \x00@Q#o\x8e\xd6\x02-\xe0\x04z\r\x1a\xa0\xa3m+$\xd2'
-                b'\x18\xbe\x0f\x0f\xfe\x1d\xdf\x14\xfe\x8e\xedjO\xac\xb9\xd4v\xf6o\x0f\xf3\x00\x00'
-                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                b'\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00'
-                b'\x00X\xc3\x00P\x10\x02\x0c\x00\rpacked_data.2\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08'
-                b'\xc0\xa0\xb4&\xf0\xfdg\x10a\xa3\xd9RUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU'
-                b'\xf5\xfb\x03m\xe0\x06\x1d\x00\rpacked_data.3\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08'
-                b'\xc0\xa0\xb4&\xf0\xfdg\x10a\xa3fSUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU'
-                b'\xf5\xfb\x03n\x1c\x06\x1e\x00\rpacked_data.4\x00Zx\xda\xed\xc3\x01\t\x00\x00\x0c'
-                b'\x03\xa0\xb4O\xb0\xf5gA\xae`\xda\x8b\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
-                b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
-                b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa'
-                b'\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xdf\x0fnI\x06,\x00\rpacked_data.5'
-                b'\x00\x18x\xdaK-.)I\xc5\x8e\xa7\xb22@\xc0\x94\xe2\xb6)z\x00Z\x1e\x0e\xb6\x00\x00')
-
+                b"\x00\x04_ask\x00\x011\x00\x08_command\x00\x10MsgServer2Portal\x00\x0bpacked_data"
+                b"\x00wx\xda\xed\xc6\xc1\t\x80 \x00@Q#o\x8e\xd6\x02-\xe0\x04z\r\x1a\xa0\xa3m+$\xd2"
+                b"\x18\xbe\x0f\x0f\xfe\x1d\xdf\x14\xfe\x8e\xedjO\xac\xb9\xd4v\xf6o\x0f\xf3\x00\x00"
+                b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+                b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+                b"\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
+                b"\x00X\xc3\x00P\x10\x02\x0c\x00\rpacked_data.2\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08"
+                b"\xc0\xa0\xb4&\xf0\xfdg\x10a\xa3\xd9RUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU"
+                b"\xf5\xfb\x03m\xe0\x06\x1d\x00\rpacked_data.3\x00Zx\xda\xed\xc3\x01\r\x00\x00\x08"
+                b"\xc0\xa0\xb4&\xf0\xfdg\x10a\xa3fSUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUU"
+                b"\xf5\xfb\x03n\x1c\x06\x1e\x00\rpacked_data.4\x00Zx\xda\xed\xc3\x01\t\x00\x00\x0c"
+                b"\x03\xa0\xb4O\xb0\xf5gA\xae`\xda\x8b\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+                b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xdf\x0fnI\x06,\x00\rpacked_data.5"
+                b"\x00\x18x\xdaK-.)I\xc5\x8e\xa7\xb22@\xc0\x94\xe2\xb6)z\x00Z\x1e\x0e\xb6\x00\x00"
+            )
 
 
 class TestIRC(TestCase):
-
     def test_plain_ansi(self):
         """
         Test that printable characters do not get mangled.
@@ -131,40 +136,42 @@ def test_plain_ansi(self):
 
     def test_bold(self):
         s_irc = "\x02thisisatest"
-        s_eve = r'|hthisisatest'
+        s_eve = r"|hthisisatest"
         self.assertEqual(irc.parse_ansi_to_irc(s_eve), s_irc)
         self.assertEqual(s_eve, irc.parse_irc_to_ansi(s_irc))
 
     def test_italic(self):
         s_irc = "\x02thisisatest"
-        s_eve = r'|hthisisatest'
+        s_eve = r"|hthisisatest"
         self.assertEqual(irc.parse_ansi_to_irc(s_eve), s_irc)
 
     def test_colors(self):
-        color_map = (("\0030",     r'|w'),
-                     ("\0031",     r'|X'),
-                     ("\0032",     r'|B'),
-                     ("\0033",     r'|G'),
-                     ("\0034",     r'|r'),
-                     ("\0035",     r'|R'),
-                     ("\0036",     r'|M'),
-                     ("\0037",     r'|Y'),
-                     ("\0038",     r'|y'),
-                     ("\0039",     r'|g'),
-                     ("\00310",    r'|C'),
-                     ("\00311",    r'|c'),
-                     ("\00312",    r'|b'),
-                     ("\00313",    r'|m'),
-                     ("\00314",    r'|x'),
-                     ("\00315",    r'|W'),
-                     ("\00399,5",  r'|[r'),
-                     ("\00399,3",  r'|[g'),
-                     ("\00399,7",  r'|[y'),
-                     ("\00399,2",  r'|[b'),
-                     ("\00399,6",  r'|[m'),
-                     ("\00399,10", r'|[c'),
-                     ("\00399,15", r'|[w'),
-                     ("\00399,1",  r'|[x'))
+        color_map = (
+            ("\0030", r"|w"),
+            ("\0031", r"|X"),
+            ("\0032", r"|B"),
+            ("\0033", r"|G"),
+            ("\0034", r"|r"),
+            ("\0035", r"|R"),
+            ("\0036", r"|M"),
+            ("\0037", r"|Y"),
+            ("\0038", r"|y"),
+            ("\0039", r"|g"),
+            ("\00310", r"|C"),
+            ("\00311", r"|c"),
+            ("\00312", r"|b"),
+            ("\00313", r"|m"),
+            ("\00314", r"|x"),
+            ("\00315", r"|W"),
+            ("\00399,5", r"|[r"),
+            ("\00399,3", r"|[g"),
+            ("\00399,7", r"|[y"),
+            ("\00399,2", r"|[b"),
+            ("\00399,6", r"|[m"),
+            ("\00399,10", r"|[c"),
+            ("\00399,15", r"|[w"),
+            ("\00399,1", r"|[x"),
+        )
 
         for m in color_map:
             self.assertEqual(irc.parse_irc_to_ansi(m[0]), m[1])
@@ -176,7 +183,7 @@ def test_identity(self):
         its inverse gives the correct string.
         """
 
-        s = r'|wthis|Xis|gis|Ma|C|complex|*string'
+        s = r"|wthis|Xis|gis|Ma|C|complex|*string"
 
         self.assertEqual(irc.parse_irc_to_ansi(irc.parse_ansi_to_irc(s)), s)
 
@@ -202,12 +209,12 @@ def test_mudlet_ttype(self):
         self.assertFalse(self.proto.protocol_flags["NOGOAHEAD"])
         self.assertEqual(self.proto.handshakes, 7)
         # test naws
-        self.assertEqual(self.proto.protocol_flags['SCREENWIDTH'], {0: DEFAULT_WIDTH})
-        self.assertEqual(self.proto.protocol_flags['SCREENHEIGHT'], {0: DEFAULT_HEIGHT})
+        self.assertEqual(self.proto.protocol_flags["SCREENWIDTH"], {0: DEFAULT_WIDTH})
+        self.assertEqual(self.proto.protocol_flags["SCREENHEIGHT"], {0: DEFAULT_HEIGHT})
         self.proto.dataReceived(IAC + WILL + NAWS)
-        self.proto.dataReceived(b"".join([IAC, SB, NAWS, b'', b'x', b'', b'd', IAC, SE]))
-        self.assertEqual(self.proto.protocol_flags['SCREENWIDTH'][0], 78)
-        self.assertEqual(self.proto.protocol_flags['SCREENHEIGHT'][0], 45)
+        self.proto.dataReceived(b"".join([IAC, SB, NAWS, b"", b"x", b"", b"d", IAC, SE]))
+        self.assertEqual(self.proto.protocol_flags["SCREENWIDTH"][0], 78)
+        self.assertEqual(self.proto.protocol_flags["SCREENHEIGHT"][0], 45)
         self.assertEqual(self.proto.handshakes, 6)
         # test ttype
         self.assertTrue(self.proto.protocol_flags["FORCEDENDLINE"])
@@ -222,19 +229,21 @@ def test_mudlet_ttype(self):
         self.assertEqual(self.proto.handshakes, 5)
         # test mccp
         self.proto.dataReceived(IAC + DONT + MCCP)
-        self.assertFalse(self.proto.protocol_flags['MCCP'])
+        self.assertFalse(self.proto.protocol_flags["MCCP"])
         self.assertEqual(self.proto.handshakes, 4)
         # test mssp
         self.proto.dataReceived(IAC + DONT + MSSP)
         self.assertEqual(self.proto.handshakes, 3)
         # test oob
         self.proto.dataReceived(IAC + DO + MSDP)
-        self.proto.dataReceived(b"".join([IAC, SB, MSDP, MSDP_VAR, b"LIST", MSDP_VAL, b"COMMANDS", IAC, SE]))
-        self.assertTrue(self.proto.protocol_flags['OOB'])
+        self.proto.dataReceived(
+            b"".join([IAC, SB, MSDP, MSDP_VAR, b"LIST", MSDP_VAL, b"COMMANDS", IAC, SE])
+        )
+        self.assertTrue(self.proto.protocol_flags["OOB"])
         self.assertEqual(self.proto.handshakes, 2)
         # test mxp
         self.proto.dataReceived(IAC + DONT + MXP)
-        self.assertFalse(self.proto.protocol_flags['MXP'])
+        self.assertFalse(self.proto.protocol_flags["MXP"])
         self.assertEqual(self.proto.handshakes, 1)
         # clean up to prevent Unclean reactor
         self.proto.nop_keep_alive.stop()
diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py
index 4e37d8eaaf6..fb946bf9a27 100644
--- a/evennia/server/portal/ttype.py
+++ b/evennia/server/portal/ttype.py
@@ -10,22 +10,23 @@
 All data will be stored on the protocol's protocol_flags dictionary,
 under the 'TTYPE' key.
 """
-from builtins import object
 
 # telnet option codes
-TTYPE = b'\x18'
-IS = b'\x00'
-SEND = b'\x01'
+TTYPE = b"\x18"
+IS = b"\x00"
+SEND = b"\x01"
 
 # terminal capabilities and their codes
-MTTS = [(128, 'PROXY'),
-        (64, 'SCREENREADER'),
-        (32, 'OSC_COLOR_PALETTE'),
-        (16, 'MOUSE_TRACKING'),
-        (8, 'XTERM256'),
-        (4, 'UTF-8'),
-        (2, 'VT100'),
-        (1, 'ANSI')]
+MTTS = [
+    (128, "PROXY"),
+    (64, "SCREENREADER"),
+    (32, "OSC_COLOR_PALETTE"),
+    (16, "MOUSE_TRACKING"),
+    (8, "XTERM256"),
+    (4, "UTF-8"),
+    (2, "VT100"),
+    (1, "ANSI"),
+]
 
 
 class Ttype(object):
@@ -52,9 +53,9 @@ def __init__(self, protocol):
         self.protocol = protocol
         # we set FORCEDENDLINE for clients not supporting ttype
         self.protocol.protocol_flags["FORCEDENDLINE"] = True
-        self.protocol.protocol_flags['TTYPE'] = False
+        self.protocol.protocol_flags["TTYPE"] = False
         # is it a safe bet to assume ANSI is always supported?
-        self.protocol.protocol_flags['ANSI'] = True
+        self.protocol.protocol_flags["ANSI"] = True
         # setup protocol to handle ttype initialization and negotiation
         self.protocol.negotiationMap[TTYPE] = self.will_ttype
         # ask if client will ttype, connect callback if it does.
@@ -68,7 +69,7 @@ def wont_ttype(self, option):
             option (Option): Not used.
 
         """
-        self.protocol.protocol_flags['TTYPE'] = False
+        self.protocol.protocol_flags["TTYPE"] = False
         self.protocol.handshake_done()
 
     def will_ttype(self, option):
@@ -87,7 +88,7 @@ def will_ttype(self, option):
         """
         options = self.protocol.protocol_flags
 
-        if options and options.get('TTYPE', False) or self.ttype_step > 3:
+        if options and options.get("TTYPE", False) or self.ttype_step > 3:
             return
 
         try:
@@ -122,25 +123,28 @@ def will_ttype(self, option):
             if clientname.startswith("TINTIN++"):
                 self.protocol.protocol_flags["FORCEDENDLINE"] = True
 
-            if (clientname.startswith("XTERM") or
-                clientname.endswith("-256COLOR") or
-                clientname in (
-                           "ATLANTIS",      # > 0.9.9.0 (aug 2009)
-                           "CMUD",          # > 3.04 (mar 2009)
-                           "KILDCLIENT",    # > 2.2.0 (sep 2005)
-                           "MUDLET",        # > beta 15 (sep 2009)
-                           "MUSHCLIENT",    # > 4.02 (apr 2007)
-                           "PUTTY",         # > 0.58 (apr 2005)
-                           "BEIP",          # > 2.00.206 (late 2009) (BeipMu)
-                           "POTATO",        # > 2.00 (maybe earlier)
-                           "TINYFUGUE"      # > 4.x (maybe earlier)
-                           )):
-                    xterm256 = True
+            if (
+                clientname.startswith("XTERM")
+                or clientname.endswith("-256COLOR")
+                or clientname
+                in (
+                    "ATLANTIS",  # > 0.9.9.0 (aug 2009)
+                    "CMUD",  # > 3.04 (mar 2009)
+                    "KILDCLIENT",  # > 2.2.0 (sep 2005)
+                    "MUDLET",  # > beta 15 (sep 2009)
+                    "MUSHCLIENT",  # > 4.02 (apr 2007)
+                    "PUTTY",  # > 0.58 (apr 2005)
+                    "BEIP",  # > 2.00.206 (late 2009) (BeipMu)
+                    "POTATO",  # > 2.00 (maybe earlier)
+                    "TINYFUGUE",  # > 4.x (maybe earlier)
+                )
+            ):
+                xterm256 = True
 
             # all clients supporting TTYPE at all seem to support ANSI
-            self.protocol.protocol_flags['ANSI'] = True
-            self.protocol.protocol_flags['XTERM256'] = xterm256
-            self.protocol.protocol_flags['CLIENTNAME'] = clientname
+            self.protocol.protocol_flags["ANSI"] = True
+            self.protocol.protocol_flags["XTERM256"] = xterm256
+            self.protocol.protocol_flags["CLIENTNAME"] = clientname
             self.protocol.requestNegotiation(TTYPE, SEND)
 
         elif self.ttype_step == 2:
@@ -148,13 +152,15 @@ def will_ttype(self, option):
             term = option
             tupper = term.upper()
             # identify xterm256 based on flag
-            xterm256 = (tupper.endswith("-256COLOR") or        # Apple Terminal, old Tintin
-                        tupper.endswith("XTERM") and           # old Tintin, Putty
-                        not tupper.endswith("-COLOR"))
+            xterm256 = (
+                tupper.endswith("-256COLOR")
+                or tupper.endswith("XTERM")  # Apple Terminal, old Tintin
+                and not tupper.endswith("-COLOR")  # old Tintin, Putty
+            )
             if xterm256:
-                self.protocol.protocol_flags['ANSI'] = True
-                self.protocol.protocol_flags['XTERM256'] = xterm256
-            self.protocol.protocol_flags['TERM'] = term
+                self.protocol.protocol_flags["ANSI"] = True
+                self.protocol.protocol_flags["XTERM256"] = xterm256
+            self.protocol.protocol_flags["TERM"] = term
             # request next information
             self.protocol.requestNegotiation(TTYPE, SEND)
 
@@ -165,13 +171,15 @@ def will_ttype(self, option):
                 if option.isdigit():
                     # a number - determine the actual capabilities
                     option = int(option)
-                    support = dict((capability, True) for bitval, capability in MTTS if option & bitval > 0)
+                    support = dict(
+                        (capability, True) for bitval, capability in MTTS if option & bitval > 0
+                    )
                     self.protocol.protocol_flags.update(support)
                 else:
                     # some clients send erroneous MTTS as a string. Add directly.
                     self.protocol.protocol_flags[option.upper()] = True
 
-            self.protocol.protocol_flags['TTYPE'] = True
+            self.protocol.protocol_flags["TTYPE"] = True
             # we must sync ttype once it'd done
             self.protocol.handshake_done()
         self.ttype_step += 1
diff --git a/evennia/server/portal/webclient.py b/evennia/server/portal/webclient.py
index 43a3a7bf8ca..b501a3df2e2 100644
--- a/evennia/server/portal/webclient.py
+++ b/evennia/server/portal/webclient.py
@@ -25,7 +25,9 @@
 from evennia.utils.text2html import parse_html
 from autobahn.twisted.websocket import WebSocketServerProtocol
 
-_RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE)
+_RE_SCREENREADER_REGEX = re.compile(
+    r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE
+)
 _CLIENT_SESSIONS = mod_import(settings.SESSION_ENGINE).SessionStore
 
 
@@ -36,6 +38,7 @@ class WebSocketClient(WebSocketServerProtocol, Session):
     """
     Implements the server-side of the Websocket connection.
     """
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.protocol_key = "webclient/websocket"
@@ -58,6 +61,7 @@ def get_client_session(self):
             return None
         except AttributeError:
             from evennia.utils import logger
+
             self.csessid = None
             logger.log_trace(str(self))
             return None
@@ -82,8 +86,10 @@ def onOpen(self):
             self.logged_in = True
 
             for old_session in self.sessionhandler.sessions_from_csessid(csessid):
-                if (hasattr(old_session, "websocket_close_code") and
-                        old_session.websocket_close_code != CLOSE_NORMAL):
+                if (
+                    hasattr(old_session, "websocket_close_code")
+                    and old_session.websocket_close_code != CLOSE_NORMAL
+                ):
                     # if we have old sessions with the same csession, they are remnants
                     self.sessid = old_session.sessid
                     self.sessionhandler.disconnect(old_session)
@@ -143,7 +149,7 @@ def onMessage(self, payload, isBinary):
                              UTF-8 encoded text.
 
         """
-        cmdarray = json.loads(str(payload, 'utf-8'))
+        cmdarray = json.loads(str(payload, "utf-8"))
         if cmdarray:
             self.data_in(**{cmdarray[0]: [cmdarray[1], cmdarray[2]]})
 
diff --git a/evennia/server/portal/webclient_ajax.py b/evennia/server/portal/webclient_ajax.py
index 43782369c5f..1447c60805e 100644
--- a/evennia/server/portal/webclient_ajax.py
+++ b/evennia/server/portal/webclient_ajax.py
@@ -32,7 +32,9 @@
 from evennia.server import session
 
 _CLIENT_SESSIONS = utils.mod_import(settings.SESSION_ENGINE).SessionStore
-_RE_SCREENREADER_REGEX = re.compile(r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE)
+_RE_SCREENREADER_REGEX = re.compile(
+    r"%s" % settings.SCREENREADER_REGEX_STRIP, re.DOTALL + re.MULTILINE
+)
 _SERVERNAME = settings.SERVERNAME
 _KEEPALIVE = 30  # how often to check keepalive
 
@@ -42,6 +44,7 @@
 # extend this if one wants to send more
 # complex database objects too.
 
+
 class LazyEncoder(json.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, Promise):
@@ -58,13 +61,15 @@ def jsonify(obj):
 # using POST requests to /webclientdata.
 #
 
+
 class AjaxWebClient(resource.Resource):
     """
     An ajax/comet long-polling transport
 
     """
+
     isLeaf = True
-    allowedMethods = ('POST',)
+    allowedMethods = ("POST",)
 
     def __init__(self):
         self.requests = {}
@@ -87,8 +92,11 @@ def _keepalive(self):
         """
         now = time.time()
         to_remove = []
-        keep_alives = ((csessid, remove) for csessid, (t, remove)
-                       in self.last_alive.items() if now - t > _KEEPALIVE)
+        keep_alives = (
+            (csessid, remove)
+            for csessid, (t, remove) in self.last_alive.items()
+            if now - t > _KEEPALIVE
+        )
         for csessid, remove in keep_alives:
             if remove:
                 # keepalive timeout. Line is dead.
@@ -118,7 +126,7 @@ def get_client_sessid(self, request):
             csessid (int): The client-session id.
 
         """
-        return html.escape(request.args[b'csessid'][0].decode("utf-8"))
+        return html.escape(request.args[b"csessid"][0].decode("utf-8"))
 
     def at_login(self):
         """
@@ -174,9 +182,11 @@ def mode_init(self, request):
         csessid = self.get_client_sessid(request)
 
         remote_addr = request.getClientIP()
-        host_string = "%s (%s:%s)" % (_SERVERNAME,
-                                      request.getRequestHostname(),
-                                      request.getHost().port)
+        host_string = "%s (%s:%s)" % (
+            _SERVERNAME,
+            request.getRequestHostname(),
+            request.getHost().port,
+        )
 
         sess = AjaxWebClientSession()
         sess.client = self
@@ -200,7 +210,7 @@ def mode_init(self, request):
         # actually do the connection
         sess.sessionhandler.connect(sess)
 
-        return jsonify({'msg': host_string, 'csessid': csessid})
+        return jsonify({"msg": host_string, "csessid": csessid})
 
     def mode_keepalive(self, request):
 
@@ -223,7 +233,7 @@ def mode_input(self, request):
         """
         csessid = self.get_client_sessid(request)
         self.last_alive[csessid] = (time.time(), False)
-        cmdarray = json.loads(request.args.get(b'data')[0])
+        cmdarray = json.loads(request.args.get(b"data")[0])
         for sess in self.sessionhandler.sessions_from_csessid(csessid):
             sess.data_in(**{cmdarray[0]: [cmdarray[1], cmdarray[2]]})
         return b'""'
@@ -239,7 +249,7 @@ def mode_receive(self, request):
             request (Request): Incoming request.
 
         """
-        csessid = html.escape(request.args[b'csessid'][0].decode("utf-8"))
+        csessid = html.escape(request.args[b"csessid"][0].decode("utf-8"))
         self.last_alive[csessid] = (time.time(), False)
 
         dataentries = self.databuffer.get(csessid)
@@ -286,21 +296,21 @@ def render_POST(self, request):
             request (Request): Incoming request.
 
         """
-        dmode = request.args.get(b'mode', [b'None'])[0].decode("utf-8")
+        dmode = request.args.get(b"mode", [b"None"])[0].decode("utf-8")
 
-        if dmode == 'init':
+        if dmode == "init":
             # startup. Setup the server.
             return self.mode_init(request)
-        elif dmode == 'input':
+        elif dmode == "input":
             # input from the client to the server
             return self.mode_input(request)
-        elif dmode == 'receive':
+        elif dmode == "receive":
             # the client is waiting to receive data.
             return self.mode_receive(request)
-        elif dmode == 'close':
+        elif dmode == "close":
             # the client is closing
             return self.mode_close(request)
-        elif dmode == 'keepalive':
+        elif dmode == "keepalive":
             # A reply to our keepalive request - all is well
             return self.mode_keepalive(request)
         else:
@@ -313,6 +323,7 @@ def render_POST(self, request):
 # web client interface.
 #
 
+
 class AjaxWebClientSession(session.Session):
     """
     This represents a session running in an AjaxWebclient.
@@ -405,8 +416,8 @@ def send_text(self, *args, **kwargs):
 
         options = kwargs.pop("options", {})
         raw = options.get("raw", flags.get("RAW", False))
-        xterm256 = options.get("xterm256", flags.get('XTERM256', True))
-        useansi = options.get("ansi", flags.get('ANSI', True))
+        xterm256 = options.get("xterm256", flags.get("XTERM256", True))
+        useansi = options.get("ansi", flags.get("ANSI", True))
         nocolor = options.get("nocolor", flags.get("NOCOLOR") or not (xterm256 or useansi))
         screenreader = options.get("screenreader", flags.get("SCREENREADER", False))
         prompt = options.get("send_prompt", False)
diff --git a/evennia/server/profiling/dummyrunner.py b/evennia/server/profiling/dummyrunner.py
index 40bbb6785bf..3b13bb49f64 100644
--- a/evennia/server/profiling/dummyrunner.py
+++ b/evennia/server/profiling/dummyrunner.py
@@ -32,8 +32,6 @@
 """
 
 
-from builtins import range
-
 import sys
 import time
 import random
@@ -49,8 +47,10 @@
 
 DUMMYRUNNER_SETTINGS = mod_import(settings.DUMMYRUNNER_SETTINGS_MODULE)
 if not DUMMYRUNNER_SETTINGS:
-    raise IOError("Error: Dummyrunner could not find settings file at %s" %
-                  settings.DUMMYRUNNER_SETTINGS_MODULE)
+    raise IOError(
+        "Error: Dummyrunner could not find settings file at %s"
+        % settings.DUMMYRUNNER_SETTINGS_MODULE
+    )
 
 DATESTRING = "%Y%m%d%H%M%S"
 
@@ -77,8 +77,7 @@
 # Messages
 
 
-INFO_STARTING = \
-    """
+INFO_STARTING = """
     Dummyrunner starting using {N} dummy account(s). If you don't see
     any connection messages, make sure that the Evennia server is
     running.
@@ -86,8 +85,7 @@
     Use Ctrl-C to stop/disconnect clients.
     """
 
-ERROR_NO_MIXIN = \
-    """
+ERROR_NO_MIXIN = """
     Error: Evennia is not set up for dummyrunner. Before starting the
     server, make sure to include the following at *the end* of your
     settings file (remove when not using dummyrunner!):
@@ -110,8 +108,7 @@
     """
 
 
-ERROR_FEW_ACTIONS = \
-    """
+ERROR_FEW_ACTIONS = """
     Dummyrunner settings error: The ACTIONS tuple is too short: it must
     contain at least login- and logout functions.
     """
@@ -171,9 +168,9 @@
 
 """
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # Helper functions
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 ICOUNT = 0
@@ -218,11 +215,12 @@ def makeiter(obj):
     Returns:
         iterable (iterable): An iterable object.
     """
-    return obj if hasattr(obj, '__iter__') else [obj]
+    return obj if hasattr(obj, "__iter__") else [obj]
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 # Client classes
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class DummyClient(telnet.StatefulTelnetProtocol):
@@ -255,7 +253,7 @@ def connectionMade(self):
         self._logout = self.factory.actions[1]
         self._actions = self.factory.actions[2:]
 
-        reactor.addSystemEventTrigger('before', 'shutdown', self.logout)
+        reactor.addSystemEventTrigger("before", "shutdown", self.logout)
 
     def dataReceived(self, data):
         """
@@ -360,10 +358,11 @@ def __init__(self, actions):
         "Setup the factory base (shared by all clients)"
         self.actions = actions
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 # Access method:
 # Starts clients and connects them to a running server.
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 def start_all_dummy_clients(nclients):
@@ -384,7 +383,12 @@ def start_all_dummy_clients(nclients):
 
     # make sure the probabilities add up to 1
     pratio = 1.0 / sum(tup[0] for tup in actions[2:])
-    flogin, flogout, probs, cfuncs = actions[0], actions[1], [tup[0] * pratio for tup in actions[2:]], [tup[1] for tup in actions[2:]]
+    flogin, flogout, probs, cfuncs = (
+        actions[0],
+        actions[1],
+        [tup[0] * pratio for tup in actions[2:]],
+        [tup[1] for tup in actions[2:]],
+    )
     # create cumulative probabilies for the random actions
     cprobs = [sum(v for i, v in enumerate(probs) if i <= k) for k in range(len(probs))]
     # rebuild a new, optimized action structure
@@ -397,12 +401,13 @@ def start_all_dummy_clients(nclients):
     # start reactor
     reactor.run()
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 # Command line interface
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
     try:
         settings.DUMMYRUNNER_MIXIN
@@ -412,8 +417,9 @@ def start_all_dummy_clients(nclients):
 
     # parsing command line with default vals
     parser = ArgumentParser(description=HELPTEXT)
-    parser.add_argument("-N", nargs=1, default=1, dest="nclients",
-                        help="Number of clients to start")
+    parser.add_argument(
+        "-N", nargs=1, default=1, dest="nclients", help="Number of clients to start"
+    )
 
     args = parser.parse_args()
 
diff --git a/evennia/server/profiling/dummyrunner_settings.py b/evennia/server/profiling/dummyrunner_settings.py
index da729d80216..69f417f56c1 100644
--- a/evennia/server/profiling/dummyrunner_settings.py
+++ b/evennia/server/profiling/dummyrunner_settings.py
@@ -89,6 +89,7 @@
 
 # login/logout
 
+
 def c_login(client):
     "logins to the game"
     # we always use a new client name
@@ -102,12 +103,13 @@ def c_login(client):
     exitname2 = EXIT_TEMPLATE % client.counter()
     client.exits.extend([exitname1, exitname2])
 
-    cmds = ('create %s %s' % (cname, cpwd),
-            'connect %s %s' % (cname, cpwd),
-            '@dig %s' % START_ROOM % client.gid,
-            '@teleport %s' % START_ROOM % client.gid,
-            '@dig %s = %s, %s' % (roomname, exitname1, exitname2)
-            )
+    cmds = (
+        "create %s %s" % (cname, cpwd),
+        "connect %s %s" % (cname, cpwd),
+        "@dig %s" % START_ROOM % client.gid,
+        "@teleport %s" % START_ROOM % client.gid,
+        "@dig %s = %s, %s" % (roomname, exitname1, exitname2),
+    )
     return cmds
 
 
@@ -116,8 +118,7 @@ def c_login_nodig(client):
     cname = DUMMY_NAME % client.gid
     cpwd = DUMMY_PWD % client.gid
 
-    cmds = ('create %s %s' % (cname, cpwd),
-            'connect %s %s' % (cname, cpwd))
+    cmds = ("create %s %s" % (cname, cpwd), "connect %s %s" % (cname, cpwd))
     return cmds
 
 
@@ -125,6 +126,7 @@ def c_logout(client):
     "logouts of the game"
     return "@quit"
 
+
 # random commands
 
 
@@ -150,17 +152,13 @@ def c_examines(client):
 
 def c_idles(client):
     "idles"
-    cmds = ('idle', 'idle')
+    cmds = ("idle", "idle")
     return cmds
 
 
 def c_help(client):
     "reads help files"
-    cmds = ('help',
-            'help @teleport',
-            'help look',
-            'help @tunnel',
-            'help @dig')
+    cmds = ("help", "help @teleport", "help look", "help @tunnel", "help @dig")
     return cmds
 
 
@@ -170,17 +168,19 @@ def c_digs(client):
     exitname1 = EXIT_TEMPLATE % client.counter()
     exitname2 = EXIT_TEMPLATE % client.counter()
     client.exits.extend([exitname1, exitname2])
-    return '@dig/tel %s = %s, %s' % (roomname, exitname1, exitname2)
+    return "@dig/tel %s = %s, %s" % (roomname, exitname1, exitname2)
 
 
 def c_creates_obj(client):
     "creates normal objects, storing their name on client"
     objname = OBJ_TEMPLATE % client.counter()
     client.objs.append(objname)
-    cmds = ('@create %s' % objname,
-            '@desc %s = "this is a test object' % objname,
-            '@set %s/testattr = this is a test attribute value.' % objname,
-            '@set %s/testattr2 = this is a second test attribute.' % objname)
+    cmds = (
+        "@create %s" % objname,
+        '@desc %s = "this is a test object' % objname,
+        "@set %s/testattr = this is a test attribute value." % objname,
+        "@set %s/testattr2 = this is a second test attribute." % objname,
+    )
     return cmds
 
 
@@ -188,18 +188,19 @@ def c_creates_button(client):
     "creates example button, storing name on client"
     objname = TOBJ_TEMPLATE % client.counter()
     client.objs.append(objname)
-    cmds = ('@create %s:%s' % (objname, TOBJ_TYPECLASS),
-            '@desc %s = test red button!' % objname)
+    cmds = ("@create %s:%s" % (objname, TOBJ_TYPECLASS), "@desc %s = test red button!" % objname)
     return cmds
 
 
 def c_socialize(client):
     "socializechats on channel"
-    cmds = ('ooc Hello!',
-            'ooc Testing ...',
-            'ooc Testing ... times 2',
-            'say Yo!',
-            'emote stands looking around.')
+    cmds = (
+        "ooc Hello!",
+        "ooc Testing ...",
+        "ooc Testing ... times 2",
+        "say Yo!",
+        "emote stands looking around.",
+    )
     return cmds
 
 
@@ -218,6 +219,7 @@ def c_moves_s(client):
     "move through south exit if available"
     return "south"
 
+
 # Action tuple (required)
 #
 # This is a tuple of client action functions. The first element is the
@@ -263,12 +265,7 @@ def c_moves_s(client):
 #           c_logout,
 #           (1.0, c_idles))
 # "normal account" definition
-ACTIONS = (c_login,
-           c_logout,
-           (0.01, c_digs),
-           (0.39, c_looks),
-           (0.2, c_help),
-           (0.4, c_moves))
+ACTIONS = (c_login, c_logout, (0.01, c_digs), (0.39, c_looks), (0.2, c_help), (0.4, c_moves))
 # walking tester. This requires a pre-made
 # "loop" of multiple rooms that ties back
 # to limbo (using @tunnel and @open)
diff --git a/evennia/server/profiling/memplot.py b/evennia/server/profiling/memplot.py
index 1665a9d2357..b078a4962a7 100644
--- a/evennia/server/profiling/memplot.py
+++ b/evennia/server/profiling/memplot.py
@@ -10,9 +10,10 @@
 import os
 import sys
 import time
+
 # TODO!
-#sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
-#os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
+# sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
+# os.environ['DJANGO_SETTINGS_MODULE'] = 'game.settings'
 import evennia
 from evennia.utils.idmapper import models as _idmapper
 
@@ -38,8 +39,12 @@ def at_script_creation(self):
     def at_repeat(self):
         "Regularly save memory statistics."
         pid = os.getpid()
-        rmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "rss")).read()) / 1000.0  # resident memory
-        vmem = float(os.popen('ps -p %d -o %s | tail -1' % (pid, "vsz")).read()) / 1000.0  # virtual memory
+        rmem = (
+            float(os.popen("ps -p %d -o %s | tail -1" % (pid, "rss")).read()) / 1000.0
+        )  # resident memory
+        vmem = (
+            float(os.popen("ps -p %d -o %s | tail -1" % (pid, "vsz")).read()) / 1000.0
+        )  # virtual memory
         total_num, cachedict = _idmapper.cache_size()
         t0 = (time.time() - self.db.starttime) / 60.0  # save in minutes
 
@@ -61,8 +66,8 @@ def at_repeat(self):
     nobj = data[:, 3]
 
     # calculate derivative of obj creation
-    #oderiv = (0.5*(nobj[2:] - nobj[:-2]) / (secs[2:] - secs[:-2])).copy()
-    #oderiv = (0.5*(rmem[2:] - rmem[:-2]) / (secs[2:] - secs[:-2])).copy()
+    # oderiv = (0.5*(nobj[2:] - nobj[:-2]) / (secs[2:] - secs[:-2])).copy()
+    # oderiv = (0.5*(rmem[2:] - rmem[:-2]) / (secs[2:] - secs[:-2])).copy()
 
     fig = pp.figure()
     ax1 = fig.add_subplot(111)
@@ -75,37 +80,37 @@ def at_repeat(self):
 
     ax2 = ax1.twinx()
     ax2.plot(secs, nobj, "g--", label="objs in cache", lw=2)
-    #ax2.plot(secs[:-2], oderiv/60.0, "g--", label="Objs/second", lw=2)
-    #ax2.plot(secs[:-2], oderiv, "g--", label="Objs/second", lw=2)
+    # ax2.plot(secs[:-2], oderiv/60.0, "g--", label="Objs/second", lw=2)
+    # ax2.plot(secs[:-2], oderiv, "g--", label="Objs/second", lw=2)
     ax2.set_ylabel("Number of objects")
     ax2.legend(loc="lower right")
     ax2.annotate("First 500 bots\nconnecting", xy=(10, 4000))
     ax2.annotate("Next 500 bots\nconnecting", xy=(350, 10000))
-    #ax2.annotate("@reload", xy=(185,600))
-
-#    # plot mem vs cachesize
-#    nobj, rmem, vmem = nobj[:262].copy(), rmem[:262].copy(), vmem[:262].copy()
-#
-#    fig = pp.figure()
-#    ax1 = fig.add_subplot(111)
-#    ax1.set_title("Memory usage per cache size")
-#    ax1.set_xlabel("Cache size (number of objects)")
-#    ax1.set_ylabel("Memory usage (MB)")
-#    ax1.plot(nobj, rmem, "r", label="RMEM", lw=2)
-#    ax1.plot(nobj, vmem, "b", label="VMEM", lw=2)
-#
-
-# empirical estimate of memory usage: rmem = 35.0 + 0.0157 * Ncache
-# Ncache = int((rmem - 35.0) / 0.0157)  (rmem in MB)
-#
-#    rderiv_aver = 0.0157
-#    fig = pp.figure()
-#    ax1 = fig.add_subplot(111)
-#    ax1.set_title("Relation between memory and cache size")
-#    ax1.set_xlabel("Memory usage (MB)")
-#    ax1.set_ylabel("Idmapper Cache Size (number of objects)")
-#    rmem = numpy.linspace(35, 2000, 2000)
-#    nobjs = numpy.array([int((mem - 35.0) / 0.0157) for mem in rmem])
-#    ax1.plot(rmem, nobjs, "r", lw=2)
+    # ax2.annotate("@reload", xy=(185,600))
+
+    #    # plot mem vs cachesize
+    #    nobj, rmem, vmem = nobj[:262].copy(), rmem[:262].copy(), vmem[:262].copy()
+    #
+    #    fig = pp.figure()
+    #    ax1 = fig.add_subplot(111)
+    #    ax1.set_title("Memory usage per cache size")
+    #    ax1.set_xlabel("Cache size (number of objects)")
+    #    ax1.set_ylabel("Memory usage (MB)")
+    #    ax1.plot(nobj, rmem, "r", label="RMEM", lw=2)
+    #    ax1.plot(nobj, vmem, "b", label="VMEM", lw=2)
+    #
+
+    # empirical estimate of memory usage: rmem = 35.0 + 0.0157 * Ncache
+    # Ncache = int((rmem - 35.0) / 0.0157)  (rmem in MB)
+    #
+    #    rderiv_aver = 0.0157
+    #    fig = pp.figure()
+    #    ax1 = fig.add_subplot(111)
+    #    ax1.set_title("Relation between memory and cache size")
+    #    ax1.set_xlabel("Memory usage (MB)")
+    #    ax1.set_ylabel("Idmapper Cache Size (number of objects)")
+    #    rmem = numpy.linspace(35, 2000, 2000)
+    #    nobjs = numpy.array([int((mem - 35.0) / 0.0157) for mem in rmem])
+    #    ax1.plot(rmem, nobjs, "r", lw=2)
 
     pp.show()
diff --git a/evennia/server/profiling/settings_mixin.py b/evennia/server/profiling/settings_mixin.py
index ee2439a9f30..2070961a599 100644
--- a/evennia/server/profiling/settings_mixin.py
+++ b/evennia/server/profiling/settings_mixin.py
@@ -14,8 +14,6 @@
 # a faster password hasher suitable for multiple simultaneous
 # account creations. The default one is safer but deliberately
 # very slow to make cracking harder.
-PASSWORD_HASHERS = (
-    'django.contrib.auth.hashers.MD5PasswordHasher',
-)
+PASSWORD_HASHERS = ("django.contrib.auth.hashers.MD5PasswordHasher",)
 # make dummy clients able to test all commands
 PERMISSION_ACCOUNT_DEFAULT = "Developer"
diff --git a/evennia/server/profiling/test_queries.py b/evennia/server/profiling/test_queries.py
index 6c0cf7a207a..0c0090be15d 100644
--- a/evennia/server/profiling/test_queries.py
+++ b/evennia/server/profiling/test_queries.py
@@ -6,8 +6,9 @@
 
 import sys
 import os
-#sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
-#os.environ["DJANGO_SETTINGS_MODULE"] = "game.settings"
+
+# sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))))
+# os.environ["DJANGO_SETTINGS_MODULE"] = "game.settings"
 from django.db import connection
 
 
@@ -23,7 +24,7 @@ def count_queries(exec_string, setup_string):
     exec(exec_string)
     nqueries = len(connection.queries) - num_queries_old
 
-    for query in connection.queries[-nqueries if nqueries else 1:]:
+    for query in connection.queries[-nqueries if nqueries else 1 :]:
         print(query["time"], query["sql"])
     print("Number of queries: %s" % nqueries)
 
@@ -32,13 +33,11 @@ def count_queries(exec_string, setup_string):
 
     # setup tests here
 
-    setup_string = \
-        """
+    setup_string = """
 from evennia.objects.models import ObjectDB
 g = ObjectDB.objects.get(db_key="Griatch")
 """
-    exec_string = \
-        """
+    exec_string = """
 g.tags.all()
 """
     count_queries(exec_string, setup_string)
diff --git a/evennia/server/profiling/tests.py b/evennia/server/profiling/tests.py
index 518d60b24ce..447229d4c4b 100644
--- a/evennia/server/profiling/tests.py
+++ b/evennia/server/profiling/tests.py
@@ -1,7 +1,21 @@
 from django.test import TestCase
 from mock import Mock, patch, mock_open
-from .dummyrunner_settings import (c_creates_button, c_creates_obj, c_digs, c_examines, c_help, c_idles, c_login,
-                                   c_login_nodig, c_logout, c_looks, c_moves, c_moves_n, c_moves_s, c_socialize)
+from .dummyrunner_settings import (
+    c_creates_button,
+    c_creates_obj,
+    c_digs,
+    c_examines,
+    c_help,
+    c_idles,
+    c_login,
+    c_login_nodig,
+    c_logout,
+    c_looks,
+    c_moves,
+    c_moves_n,
+    c_moves_s,
+    c_socialize,
+)
 
 try:
     import memplot
@@ -26,15 +40,25 @@ def clear_client_lists(self):
         self.client.exits = []
 
     def test_c_login(self):
-        self.assertEqual(c_login(self.client), ('create %s %s' % (self.client.name, self.client.password),
-                                                'connect %s %s' % (self.client.name, self.client.password),
-                                                '@dig %s' % self.client.start_room,
-                                                '@teleport %s' % self.client.start_room,
-                                                "@dig testing_room_1 = exit_1, exit_1"))
+        self.assertEqual(
+            c_login(self.client),
+            (
+                "create %s %s" % (self.client.name, self.client.password),
+                "connect %s %s" % (self.client.name, self.client.password),
+                "@dig %s" % self.client.start_room,
+                "@teleport %s" % self.client.start_room,
+                "@dig testing_room_1 = exit_1, exit_1",
+            ),
+        )
 
     def test_c_login_no_dig(self):
-        self.assertEqual(c_login_nodig(self.client), ('create %s %s' % (self.client.name, self.client.password),
-                                                      'connect %s %s' % (self.client.name, self.client.password)))
+        self.assertEqual(
+            c_login_nodig(self.client),
+            (
+                "create %s %s" % (self.client.name, self.client.password),
+                "connect %s %s" % (self.client.name, self.client.password),
+            ),
+        )
 
     def test_c_logout(self):
         self.assertEqual(c_logout(self.client), "@quit")
@@ -54,36 +78,54 @@ def test_c_examines(self):
         self.perception_method_tests(c_examines, "examine", " me")
 
     def test_idles(self):
-        self.assertEqual(c_idles(self.client), ('idle', 'idle'))
+        self.assertEqual(c_idles(self.client), ("idle", "idle"))
 
     def test_c_help(self):
-        self.assertEqual(c_help(self.client), ('help', 'help @teleport', 'help look', 'help @tunnel', 'help @dig'))
+        self.assertEqual(
+            c_help(self.client),
+            ("help", "help @teleport", "help look", "help @tunnel", "help @dig"),
+        )
 
     def test_c_digs(self):
-        self.assertEqual(c_digs(self.client), ('@dig/tel testing_room_1 = exit_1, exit_1'))
-        self.assertEqual(self.client.exits, ['exit_1', 'exit_1'])
+        self.assertEqual(c_digs(self.client), ("@dig/tel testing_room_1 = exit_1, exit_1"))
+        self.assertEqual(self.client.exits, ["exit_1", "exit_1"])
         self.clear_client_lists()
 
     def test_c_creates_obj(self):
         objname = "testing_obj_1"
-        self.assertEqual(c_creates_obj(self.client), ('@create %s' % objname,
-                                                      '@desc %s = "this is a test object' % objname,
-                                                      '@set %s/testattr = this is a test attribute value.' % objname,
-                                                      '@set %s/testattr2 = this is a second test attribute.' % objname))
+        self.assertEqual(
+            c_creates_obj(self.client),
+            (
+                "@create %s" % objname,
+                '@desc %s = "this is a test object' % objname,
+                "@set %s/testattr = this is a test attribute value." % objname,
+                "@set %s/testattr2 = this is a second test attribute." % objname,
+            ),
+        )
         self.assertEqual(self.client.objs, [objname])
         self.clear_client_lists()
 
     def test_c_creates_button(self):
         objname = "testing_button_1"
         typeclass_name = "contrib.tutorial_examples.red_button.RedButton"
-        self.assertEqual(c_creates_button(self.client), ('@create %s:%s' % (objname, typeclass_name),
-                                                         '@desc %s = test red button!' % objname))
+        self.assertEqual(
+            c_creates_button(self.client),
+            ("@create %s:%s" % (objname, typeclass_name), "@desc %s = test red button!" % objname),
+        )
         self.assertEqual(self.client.objs, [objname])
         self.clear_client_lists()
 
     def test_c_socialize(self):
-        self.assertEqual(c_socialize(self.client), ('ooc Hello!', 'ooc Testing ...', 'ooc Testing ... times 2',
-                                                    'say Yo!', 'emote stands looking around.'))
+        self.assertEqual(
+            c_socialize(self.client),
+            (
+                "ooc Hello!",
+                "ooc Testing ...",
+                "ooc Testing ... times 2",
+                "say Yo!",
+                "emote stands looking around.",
+            ),
+        )
 
     def test_c_moves(self):
         self.assertEqual(c_moves(self.client), "look")
@@ -108,6 +150,7 @@ def test_memplot(self, mock_time, mocked_open, mocked_os, mocked_idmapper):
         if isinstance(memplot, Mock):
             return
         from evennia.utils.create import create_script
+
         mocked_idmapper.cache_size.return_value = (9, 5000)
         mock_time.time = Mock(return_value=6000.0)
         script = create_script(memplot.Memplot)
@@ -115,5 +158,5 @@ def test_memplot(self, mock_time, mocked_open, mocked_os, mocked_idmapper):
         mocked_os.popen.read.return_value = 5000.0
         script.at_repeat()
         handle = mocked_open()
-        handle.write.assert_called_with('100.0, 0.001, 0.001, 9\n')
+        handle.write.assert_called_with("100.0, 0.001, 0.001, 9\n")
         script.stop()
diff --git a/evennia/server/server.py b/evennia/server/server.py
index 8b269674f0e..76024350684 100644
--- a/evennia/server/server.py
+++ b/evennia/server/server.py
@@ -7,7 +7,6 @@
 by evennia/server/server_runner.py).
 
 """
-from builtins import object
 import time
 import sys
 import os
@@ -19,9 +18,11 @@
 from twisted.python.log import ILogObserver
 
 import django
+
 django.setup()
 
 import evennia
+
 evennia._init()
 
 from django.db import connection
@@ -42,7 +43,7 @@
 _SA = object.__setattr__
 
 # a file with a flag telling the server to restart after shutdown or not.
-SERVER_RESTART = os.path.join(settings.GAME_DIR, "server", 'server.restart')
+SERVER_RESTART = os.path.join(settings.GAME_DIR, "server", "server.restart")
 
 # module containing hook methods called during start_stop
 SERVER_STARTSTOP_MODULE = mod_import(settings.AT_SERVER_STARTSTOP_MODULE)
@@ -76,16 +77,24 @@
 WEBCLIENT_ENABLED = settings.WEBCLIENT_ENABLED
 GAME_INDEX_ENABLED = settings.GAME_INDEX_ENABLED
 
-INFO_DICT = {"servername": SERVERNAME, "version": VERSION,
-             "amp": "", "errors": "", "info": "", "webserver": "", "irc_rss": ""}
+INFO_DICT = {
+    "servername": SERVERNAME,
+    "version": VERSION,
+    "amp": "",
+    "errors": "",
+    "info": "",
+    "webserver": "",
+    "irc_rss": "",
+}
 
 try:
     WEB_PLUGINS_MODULE = mod_import(settings.WEB_PLUGINS_MODULE)
 except ImportError:
     WEB_PLUGINS_MODULE = None
     INFO_DICT["errors"] = (
-            "WARNING: settings.WEB_PLUGINS_MODULE not found - "
-            "copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf.")
+        "WARNING: settings.WEB_PLUGINS_MODULE not found - "
+        "copy 'evennia/game_template/server/conf/web_plugins.py to mygame/server/conf."
+    )
 
 
 # Maintenance function - this is called repeatedly by the server
@@ -139,16 +148,18 @@ def _server_maintenance():
     # handle idle timeouts
     if _IDLE_TIMEOUT > 0:
         reason = _("idle timeout exceeded")
-        for session in (sess for sess in SESSIONS.values()
-                        if (now - sess.cmd_last) > _IDLE_TIMEOUT):
-            if not session.account or not \
-                    session.account.access(session.account, "noidletimeout", default=False):
+        for session in (
+            sess for sess in SESSIONS.values() if (now - sess.cmd_last) > _IDLE_TIMEOUT
+        ):
+            if not session.account or not session.account.access(
+                session.account, "noidletimeout", default=False
+            ):
                 SESSIONS.disconnect(session, reason=reason)
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 # Evennia Main Server object
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class Evennia(object):
@@ -166,7 +177,7 @@ def __init__(self, application):
         application - an instantiated Twisted application
 
         """
-        sys.path.insert(1, '.')
+        sys.path.insert(1, ".")
 
         # create a store of services
         self.services = service.MultiService()
@@ -190,6 +201,7 @@ def __init__(self, application):
         # (see https://github.com/evennia/evennia/issues/1128)
         def _wrap_sigint_handler(*args):
             from twisted.internet.defer import Deferred
+
             if hasattr(self, "web_root"):
                 d = self.web_root.empty_threadpool()
                 d.addCallback(lambda _: self.shutdown("reload", _reactor_stopping=True))
@@ -197,8 +209,8 @@ def _wrap_sigint_handler(*args):
                 d = Deferred(lambda _: self.shutdown("reload", _reactor_stopping=True))
             d.addCallback(lambda _: reactor.stop())
             reactor.callLater(1, d.callback, None)
-        reactor.sigInt = _wrap_sigint_handler
 
+        reactor.sigInt = _wrap_sigint_handler
 
     # Server startup methods
 
@@ -207,11 +219,14 @@ def sqlite3_prep(self):
         Optimize some SQLite stuff at startup since we
         can't save it to the database.
         """
-        if ((".".join(str(i) for i in django.VERSION) < "1.2" and
-             settings.DATABASES.get('default', {}).get('ENGINE') == "sqlite3") or
-            (hasattr(settings, 'DATABASES') and
-             settings.DATABASES.get("default", {}).get('ENGINE', None) ==
-             'django.db.backends.sqlite3')):
+        if (
+            ".".join(str(i) for i in django.VERSION) < "1.2"
+            and settings.DATABASES.get("default", {}).get("ENGINE") == "sqlite3"
+        ) or (
+            hasattr(settings, "DATABASES")
+            and settings.DATABASES.get("default", {}).get("ENGINE", None)
+            == "django.db.backends.sqlite3"
+        ):
             cursor = connection.cursor()
             cursor.execute("PRAGMA cache_size=10000")
             cursor.execute("PRAGMA synchronous=OFF")
@@ -229,36 +244,68 @@ def update_defaults(self):
         global INFO_DICT
 
         # setting names
-        settings_names = ("CMDSET_CHARACTER", "CMDSET_ACCOUNT",
-                          "BASE_ACCOUNT_TYPECLASS", "BASE_OBJECT_TYPECLASS",
-                          "BASE_CHARACTER_TYPECLASS", "BASE_ROOM_TYPECLASS",
-                          "BASE_EXIT_TYPECLASS", "BASE_SCRIPT_TYPECLASS",
-                          "BASE_CHANNEL_TYPECLASS")
+        settings_names = (
+            "CMDSET_CHARACTER",
+            "CMDSET_ACCOUNT",
+            "BASE_ACCOUNT_TYPECLASS",
+            "BASE_OBJECT_TYPECLASS",
+            "BASE_CHARACTER_TYPECLASS",
+            "BASE_ROOM_TYPECLASS",
+            "BASE_EXIT_TYPECLASS",
+            "BASE_SCRIPT_TYPECLASS",
+            "BASE_CHANNEL_TYPECLASS",
+        )
         # get previous and current settings so they can be compared
-        settings_compare = list(zip([ServerConfig.objects.conf(name) for name in settings_names],
-                               [settings.__getattr__(name) for name in settings_names]))
-        mismatches = [i for i, tup in enumerate(settings_compare) if tup[0] and tup[1] and tup[0] != tup[1]]
-        if len(mismatches):  # can't use any() since mismatches may be [0] which reads as False for any()
+        settings_compare = list(
+            zip(
+                [ServerConfig.objects.conf(name) for name in settings_names],
+                [settings.__getattr__(name) for name in settings_names],
+            )
+        )
+        mismatches = [
+            i for i, tup in enumerate(settings_compare) if tup[0] and tup[1] and tup[0] != tup[1]
+        ]
+        if len(
+            mismatches
+        ):  # can't use any() since mismatches may be [0] which reads as False for any()
             # we have a changed default. Import relevant objects and
             # run the update
             from evennia.objects.models import ObjectDB
             from evennia.comms.models import ChannelDB
-            #from evennia.accounts.models import AccountDB
-            for i, prev, curr in ((i, tup[0], tup[1]) for i, tup in enumerate(settings_compare) if i in mismatches):
+
+            # from evennia.accounts.models import AccountDB
+            for i, prev, curr in (
+                (i, tup[0], tup[1]) for i, tup in enumerate(settings_compare) if i in mismatches
+            ):
                 # update the database
-                INFO_DICT['info'] = " %s:\n '%s' changed to '%s'. Updating unchanged entries in database ..." % (settings_names[i], prev, curr)
+                INFO_DICT["info"] = (
+                    " %s:\n '%s' changed to '%s'. Updating unchanged entries in database ..."
+                    % (settings_names[i], prev, curr)
+                )
                 if i == 0:
-                    ObjectDB.objects.filter(db_cmdset_storage__exact=prev).update(db_cmdset_storage=curr)
+                    ObjectDB.objects.filter(db_cmdset_storage__exact=prev).update(
+                        db_cmdset_storage=curr
+                    )
                 if i == 1:
-                    AccountDB.objects.filter(db_cmdset_storage__exact=prev).update(db_cmdset_storage=curr)
+                    AccountDB.objects.filter(db_cmdset_storage__exact=prev).update(
+                        db_cmdset_storage=curr
+                    )
                 if i == 2:
-                    AccountDB.objects.filter(db_typeclass_path__exact=prev).update(db_typeclass_path=curr)
+                    AccountDB.objects.filter(db_typeclass_path__exact=prev).update(
+                        db_typeclass_path=curr
+                    )
                 if i in (3, 4, 5, 6):
-                    ObjectDB.objects.filter(db_typeclass_path__exact=prev).update(db_typeclass_path=curr)
+                    ObjectDB.objects.filter(db_typeclass_path__exact=prev).update(
+                        db_typeclass_path=curr
+                    )
                 if i == 7:
-                    ScriptDB.objects.filter(db_typeclass_path__exact=prev).update(db_typeclass_path=curr)
+                    ScriptDB.objects.filter(db_typeclass_path__exact=prev).update(
+                        db_typeclass_path=curr
+                    )
                 if i == 8:
-                    ChannelDB.objects.filter(db_typeclass_path__exact=prev).update(db_typeclass_path=curr)
+                    ChannelDB.objects.filter(db_typeclass_path__exact=prev).update(
+                        db_typeclass_path=curr
+                    )
                 # store the new default and clean caches
                 ServerConfig.objects.conf(settings_names[i], curr)
                 ObjectDB.flush_instance_cache()
@@ -267,8 +314,11 @@ def update_defaults(self):
                 ChannelDB.flush_instance_cache()
         # if this is the first start we might not have a "previous"
         # setup saved. Store it now.
-        [ServerConfig.objects.conf(settings_names[i], tup[1])
-         for i, tup in enumerate(settings_compare) if not tup[0]]
+        [
+            ServerConfig.objects.conf(settings_names[i], tup[1])
+            for i, tup in enumerate(settings_compare)
+            if not tup[0]
+        ]
 
     def run_initial_setup(self):
         """
@@ -279,19 +329,20 @@ def run_initial_setup(self):
         Once finished the last_initial_setup_step is set to -1.
         """
         global INFO_DICT
-        last_initial_setup_step = ServerConfig.objects.conf('last_initial_setup_step')
+        last_initial_setup_step = ServerConfig.objects.conf("last_initial_setup_step")
         if not last_initial_setup_step:
             # None is only returned if the config does not exist,
             # i.e. this is an empty DB that needs populating.
-            INFO_DICT['info'] = ' Server started for the first time. Setting defaults.'
+            INFO_DICT["info"] = " Server started for the first time. Setting defaults."
             initial_setup.handle_setup(0)
         elif int(last_initial_setup_step) >= 0:
             # a positive value means the setup crashed on one of its
             # modules and setup will resume from this step, retrying
             # the last failed module. When all are finished, the step
             # is set to -1 to show it does not need to be run again.
-            INFO_DICT['info'] = ' Resuming initial setup from step {last}.'.format(
-                  last=last_initial_setup_step)
+            INFO_DICT["info"] = " Resuming initial setup from step {last}.".format(
+                last=last_initial_setup_step
+            )
             initial_setup.handle_setup(int(last_initial_setup_step))
 
     def run_init_hooks(self, mode):
@@ -315,14 +366,14 @@ def run_init_hooks(self, mode):
         [p.at_init() for p in AccountDB.get_all_cached_instances()]
 
         # call correct server hook based on start file value
-        if mode == 'reload':
+        if mode == "reload":
             logger.log_msg("Server successfully reloaded.")
             self.at_server_reload_start()
-        elif mode == 'reset':
+        elif mode == "reset":
             # only run hook, don't purge sessions
             self.at_server_cold_start()
             logger.log_msg("Evennia Server successfully restarted in 'reset' mode.")
-        elif mode == 'shutdown':
+        elif mode == "shutdown":
             self.at_server_cold_start()
             # clear eventual lingering session storages
             ObjectDB.objects.clear_all_sessids()
@@ -332,7 +383,7 @@ def run_init_hooks(self, mode):
         self.at_server_start()
 
     @defer.inlineCallbacks
-    def shutdown(self, mode='reload', _reactor_stopping=False):
+    def shutdown(self, mode="reload", _reactor_stopping=False):
         """
         Shuts down the server from inside it.
 
@@ -357,20 +408,24 @@ def shutdown(self, mode='reload', _reactor_stopping=False):
         from evennia.server.models import ServerConfig
         from evennia.utils import gametime as _GAMETIME_MODULE
 
-        if mode == 'reload':
+        if mode == "reload":
             # call restart hooks
             ServerConfig.objects.conf("server_restart_mode", "reload")
             yield [o.at_server_reload() for o in ObjectDB.get_all_cached_instances()]
             yield [p.at_server_reload() for p in AccountDB.get_all_cached_instances()]
-            yield [(s.pause(manual_pause=False), s.at_server_reload())
-                   for s in ScriptDB.get_all_cached_instances() if s.is_active]
+            yield [
+                (s.pause(manual_pause=False), s.at_server_reload())
+                for s in ScriptDB.get_all_cached_instances()
+                if s.is_active or s.attributes.has("_manual_pause")
+            ]
             yield self.sessions.all_sessions_portal_sync()
             self.at_server_reload_stop()
             # only save monitor state on reload, not on shutdown/reset
             from evennia.scripts.monitorhandler import MONITOR_HANDLER
+
             MONITOR_HANDLER.save()
         else:
-            if mode == 'reset':
+            if mode == "reset":
                 # like shutdown but don't unset the is_connected flag and don't disconnect sessions
                 yield [o.at_server_shutdown() for o in ObjectDB.get_all_cached_instances()]
                 yield [p.at_server_shutdown() for p in AccountDB.get_all_cached_instances()]
@@ -379,15 +434,24 @@ def shutdown(self, mode='reload', _reactor_stopping=False):
             else:  # shutdown
                 yield [_SA(p, "is_connected", False) for p in AccountDB.get_all_cached_instances()]
                 yield [o.at_server_shutdown() for o in ObjectDB.get_all_cached_instances()]
-                yield [(p.unpuppet_all(), p.at_server_shutdown())
-                       for p in AccountDB.get_all_cached_instances()]
+                yield [
+                    (p.unpuppet_all(), p.at_server_shutdown())
+                    for p in AccountDB.get_all_cached_instances()
+                ]
                 yield ObjectDB.objects.clear_all_sessids()
-            yield [(s.pause(manual_pause=False), s.at_server_shutdown()) for s in ScriptDB.get_all_cached_instances()]
+            yield [
+                (
+                    s.pause(manual_pause=s.attributes.get("_manual_pause", False)),
+                    s.at_server_shutdown(),
+                )
+                for s in ScriptDB.get_all_cached_instances()
+            ]
             ServerConfig.objects.conf("server_restart_mode", "reset")
             self.at_server_cold_stop()
 
         # tickerhandler state should always be saved.
         from evennia.scripts.tickerhandler import TICKER_HANDLER
+
         TICKER_HANDLER.save()
 
         # always called, also for a reload
@@ -444,10 +508,12 @@ def at_post_portal_sync(self, mode):
         """
 
         from evennia.scripts.monitorhandler import MONITOR_HANDLER
-        MONITOR_HANDLER.restore(mode == 'reload')
+
+        MONITOR_HANDLER.restore(mode == "reload")
 
         from evennia.scripts.tickerhandler import TICKER_HANDLER
-        TICKER_HANDLER.restore(mode == 'reload')
+
+        TICKER_HANDLER.restore(mode == "reload")
 
         # after sync is complete we force-validate all scripts
         # (this also starts any that didn't yet start)
@@ -455,9 +521,34 @@ def at_post_portal_sync(self, mode):
 
         # start the task handler
         from evennia.scripts.taskhandler import TASK_HANDLER
+
         TASK_HANDLER.load()
         TASK_HANDLER.create_delays()
 
+        # check so default channels exist
+        from evennia.comms.models import ChannelDB
+        from evennia.accounts.models import AccountDB
+        from evennia.utils.create import create_channel
+
+        god_account = AccountDB.objects.get(id=1)
+        # mudinfo
+        mudinfo_chan = settings.CHANNEL_MUDINFO
+        if not mudinfo_chan:
+            raise RuntimeError("settings.CHANNEL_MUDINFO must be defined.")
+        if not ChannelDB.objects.filter(db_key=mudinfo_chan["key"]):
+            channel = create_channel(**mudinfo_chan)
+            channel.connect(god_account)
+        # connectinfo
+        connectinfo_chan = settings.CHANNEL_MUDINFO
+        if connectinfo_chan:
+            if not ChannelDB.objects.filter(db_key=mudinfo_chan["key"]):
+                channel = create_channel(**connectinfo_chan)
+        # default channels
+        for chan_info in settings.DEFAULT_CHANNELS:
+            if not ChannelDB.objects.filter(db_key=chan_info["key"]):
+                channel = create_channel(**chan_info)
+                channel.connect(god_account)
+
         # delete the temporary setting
         ServerConfig.objects.conf("server_restart_mode", delete=True)
 
@@ -476,15 +567,19 @@ def at_server_cold_start(self):
         # We need to do this just in case the server was killed in a way where
         # the normal cleanup operations did not have time to run.
         from evennia.objects.models import ObjectDB
+
         ObjectDB.objects.clear_all_sessids()
 
         # Remove non-persistent scripts
         from evennia.scripts.models import ScriptDB
+
         for script in ScriptDB.objects.filter(db_persistent=False):
             script.stop()
 
         if GUEST_ENABLED:
-            for guest in AccountDB.objects.all().filter(db_typeclass_path=settings.BASE_GUEST_TYPECLASS):
+            for guest in AccountDB.objects.all().filter(
+                db_typeclass_path=settings.BASE_GUEST_TYPECLASS
+            ):
                 for character in guest.db._playable_characters:
                     if character:
                         character.delete()
@@ -499,11 +594,12 @@ def at_server_cold_stop(self):
         if SERVER_STARTSTOP_MODULE:
             SERVER_STARTSTOP_MODULE.at_server_cold_stop()
 
-#------------------------------------------------------------
+
+# ------------------------------------------------------------
 #
 # Start the Evennia game server and add all active services
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 # Tell the system the server is starting up; some things are not available yet
@@ -511,12 +607,13 @@ def at_server_cold_stop(self):
 
 # twistd requires us to define the variable 'application' so it knows
 # what to execute from.
-application = service.Application('Evennia')
+application = service.Application("Evennia")
 
 if "--nodaemon" not in sys.argv:
     # custom logging, but only if we are not running in interactive mode
-    logfile = logger.WeeklyLogFile(os.path.basename(settings.SERVER_LOG_FILE),
-                                   os.path.dirname(settings.SERVER_LOG_FILE))
+    logfile = logger.WeeklyLogFile(
+        os.path.basename(settings.SERVER_LOG_FILE), os.path.dirname(settings.SERVER_LOG_FILE)
+    )
     application.setComponent(ILogObserver, logger.ServerLogObserver(logfile).emit)
 
 # The main evennia server program. This sets up the database
@@ -530,34 +627,42 @@ def at_server_cold_stop(self):
     # it would be during testing and debugging.
 
     ifacestr = ""
-    if AMP_INTERFACE != '127.0.0.1':
+    if AMP_INTERFACE != "127.0.0.1":
         ifacestr = "-%s" % AMP_INTERFACE
 
-    INFO_DICT["amp"] = 'amp %s: %s' % (ifacestr, AMP_PORT)
+    INFO_DICT["amp"] = "amp %s: %s" % (ifacestr, AMP_PORT)
 
     from evennia.server import amp_client
 
     factory = amp_client.AMPClientFactory(EVENNIA)
     amp_service = internet.TCPClient(AMP_HOST, AMP_PORT, factory)
-    amp_service.setName('ServerAMPClient')
+    amp_service.setName("ServerAMPClient")
     EVENNIA.services.addService(amp_service)
 
 if WEBSERVER_ENABLED:
 
     # Start a django-compatible webserver.
 
-    from evennia.server.webserver import DjangoWebRoot, WSGIWebServer, Website, LockableThreadPool
+    from evennia.server.webserver import (
+        DjangoWebRoot,
+        WSGIWebServer,
+        Website,
+        LockableThreadPool,
+        PrivateStaticRoot,
+    )
 
     # start a thread pool and define the root url (/) as a wsgi resource
     # recognized by Django
-    threads = LockableThreadPool(minthreads=max(1, settings.WEBSERVER_THREADPOOL_LIMITS[0]),
-                                 maxthreads=max(1, settings.WEBSERVER_THREADPOOL_LIMITS[1]))
+    threads = LockableThreadPool(
+        minthreads=max(1, settings.WEBSERVER_THREADPOOL_LIMITS[0]),
+        maxthreads=max(1, settings.WEBSERVER_THREADPOOL_LIMITS[1]),
+    )
 
     web_root = DjangoWebRoot(threads)
     # point our media resources to url /media
-    web_root.putChild(b"media", static.File(settings.MEDIA_ROOT))
+    web_root.putChild(b"media", PrivateStaticRoot(settings.MEDIA_ROOT))
     # point our static resources to url /static
-    web_root.putChild(b"static", static.File(settings.STATIC_ROOT))
+    web_root.putChild(b"static", PrivateStaticRoot(settings.STATIC_ROOT))
     EVENNIA.web_root = web_root
 
     if WEB_PLUGINS_MODULE:
@@ -570,8 +675,8 @@ def at_server_cold_stop(self):
     INFO_DICT["webserver"] = ""
     for proxyport, serverport in WEBSERVER_PORTS:
         # create the webserver (we only need the port for this)
-        webserver = WSGIWebServer(threads, serverport, web_site, interface='127.0.0.1')
-        webserver.setName('EvenniaWebServer%s' % serverport)
+        webserver = WSGIWebServer(threads, serverport, web_site, interface="127.0.0.1")
+        webserver.setName("EvenniaWebServer%s" % serverport)
         EVENNIA.services.addService(webserver)
 
         INFO_DICT["webserver"] += "webserver: %s" % serverport
@@ -579,18 +684,19 @@ def at_server_cold_stop(self):
 ENABLED = []
 if IRC_ENABLED:
     # IRC channel connections
-    ENABLED.append('irc')
+    ENABLED.append("irc")
 
 if RSS_ENABLED:
     # RSS feed channel connections
-    ENABLED.append('rss')
+    ENABLED.append("rss")
 
 if GRAPEVINE_ENABLED:
     # Grapevine channel connections
-    ENABLED.append('grapevine')
+    ENABLED.append("grapevine")
 
 if GAME_INDEX_ENABLED:
     from evennia.server.game_index_client.service import EvenniaGameIndexService
+
     egi_service = EvenniaGameIndexService()
     EVENNIA.services.addService(egi_service)
 
diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py
index 5ce1fdbe401..6ae0ec4b639 100644
--- a/evennia/server/serversession.py
+++ b/evennia/server/serversession.py
@@ -6,8 +6,6 @@
 It is stored on the Server side (as opposed to protocol-specific sessions which
 are stored on the Portal side)
 """
-from builtins import object
-
 import weakref
 import time
 from django.utils import timezone
@@ -33,25 +31,26 @@
 class NDbHolder(object):
     """Holder for allowing property access of attributes"""
 
-    def __init__(self, obj, name, manager_name='attributes'):
+    def __init__(self, obj, name, manager_name="attributes"):
         _SA(self, name, _GA(obj, manager_name))
-        _SA(self, 'name', name)
+        _SA(self, "name", name)
 
     def __getattribute__(self, attrname):
-        if attrname == 'all':
+        if attrname == "all":
             # we allow to overload our default .all
-            attr = _GA(self, _GA(self, 'name')).get("all")
+            attr = _GA(self, _GA(self, "name")).get("all")
             return attr if attr else _GA(self, "all")
-        return _GA(self, _GA(self, 'name')).get(attrname)
+        return _GA(self, _GA(self, "name")).get(attrname)
 
     def __setattr__(self, attrname, value):
-        _GA(self, _GA(self, 'name')).add(attrname, value)
+        _GA(self, _GA(self, "name")).add(attrname, value)
 
     def __delattr__(self, attrname):
-        _GA(self, _GA(self, 'name')).remove(attrname)
+        _GA(self, _GA(self, "name")).remove(attrname)
 
     def get_all(self):
-        return _GA(self, _GA(self, 'name')).all()
+        return _GA(self, _GA(self, "name")).all()
+
     all = property(get_all)
 
 
@@ -149,6 +148,7 @@ def all(self, return_tuples=False):
 # Server Session
 # -------------------------------------------------------------
 
+
 class ServerSession(Session):
     """
     This class represents an account's session and is a template for
@@ -168,10 +168,11 @@ def __init__(self):
         self.cmdset = CmdSetHandler(self, True)
 
     def __cmdset_storage_get(self):
-        return [path.strip() for path in self.cmdset_storage_string.split(',')]
+        return [path.strip() for path in self.cmdset_storage_string.split(",")]
 
     def __cmdset_storage_set(self, value):
         self.cmdset_storage_string = ",".join(str(val).strip() for val in make_iter(value))
+
     cmdset_storage = property(__cmdset_storage_get, __cmdset_storage_set)
 
     def at_sync(self):
@@ -254,8 +255,7 @@ def at_disconnect(self, reason=None):
             account.at_post_disconnect()
             # remove any webclient settings monitors associated with this
             # session
-            MONITOR_HANDLER.remove(account, "_saved_webclient_options",
-                                   self.sessid)
+            MONITOR_HANDLER.remove(account, "_saved_webclient_options", self.sessid)
 
     def get_account(self):
         """
@@ -276,6 +276,7 @@ def get_puppet(self):
 
         """
         return self.logged_in and self.puppet
+
     get_character = get_puppet
 
     def get_puppet_or_account(self):
@@ -304,7 +305,7 @@ def log(self, message, channel=True):
         cchan = channel and settings.CHANNEL_CONNECTINFO
         if cchan:
             try:
-                cchan = ChannelDB.objects.get_channel(cchan[0])
+                cchan = ChannelDB.objects.get_channel(cchan["key"])
                 cchan.msg("[%s]: %s" % (cchan.key, message))
             except Exception:
                 logger.log_trace()
@@ -318,8 +319,8 @@ def get_client_size(self):
 
         """
         flags = self.protocol_flags
-        width = flags.get('SCREENWIDTH', {}).get(0, settings.CLIENT_DEFAULT_WIDTH)
-        height = flags.get('SCREENHEIGHT', {}).get(0, settings.CLIENT_DEFAULT_HEIGHT)
+        width = flags.get("SCREENWIDTH", {}).get(0, settings.CLIENT_DEFAULT_WIDTH)
+        height = flags.get("SCREENHEIGHT", {}).get(0, settings.CLIENT_DEFAULT_HEIGHT)
         return width, height
 
     def update_session_counters(self, idle=False):
@@ -463,7 +464,7 @@ def __str__(self):
         if self.logged_in and hasattr(self, "account") and self.account:
             symbol = "(#%s)" % self.account.id
         try:
-            if hasattr(self.address, '__iter__'):
+            if hasattr(self.address, "__iter__"):
                 address = ":".join([str(part) for part in self.address])
             else:
                 address = self.address
@@ -527,6 +528,7 @@ def ndb_set(self, value):
     def ndb_del(self):
         """Stop accidental deletion."""
         raise Exception("Cannot delete the ndb object!")
+
     ndb = property(ndb_get, ndb_set, ndb_del)
     db = property(ndb_get, ndb_set, ndb_del)
 
diff --git a/evennia/server/session.py b/evennia/server/session.py
index f06bcac3f63..dab0f4b705a 100644
--- a/evennia/server/session.py
+++ b/evennia/server/session.py
@@ -3,7 +3,6 @@
 (both on Portal and Server side) should inherit from this class.
 
 """
-from builtins import object
 from django.conf import settings
 
 import time
@@ -37,10 +36,24 @@ class Session(object):
     """
 
     # names of attributes that should be affected by syncing.
-    _attrs_to_sync = ('protocol_key', 'address', 'suid', 'sessid', 'uid', 'csessid',
-                      'uname', 'logged_in', 'puid',
-                      'conn_time', 'cmd_last', 'cmd_last_visible', 'cmd_total',
-                      'protocol_flags', 'server_data', "cmdset_storage_string")
+    _attrs_to_sync = (
+        "protocol_key",
+        "address",
+        "suid",
+        "sessid",
+        "uid",
+        "csessid",
+        "uname",
+        "logged_in",
+        "puid",
+        "conn_time",
+        "cmd_last",
+        "cmd_last_visible",
+        "cmd_total",
+        "protocol_flags",
+        "server_data",
+        "cmdset_storage_string",
+    )
 
     def init_session(self, protocol_key, address, sessionhandler):
         """
@@ -83,11 +96,13 @@ def init_session(self, protocol_key, address, sessionhandler):
         self.cmd_last = self.conn_time
         self.cmd_total = 0
 
-        self.protocol_flags = {"ENCODING": "utf-8",
-                               "SCREENREADER": False,
-                               "INPUTDEBUG": False,
-                               "RAW": False,
-                               "NOCOLOR": False}
+        self.protocol_flags = {
+            "ENCODING": "utf-8",
+            "SCREENREADER": False,
+            "INPUTDEBUG": False,
+            "RAW": False,
+            "NOCOLOR": False,
+        }
         self.server_data = {}
 
         # map of input data to session methods
@@ -106,8 +121,9 @@ def get_sync_data(self):
                 the keys given by self._attrs_to_sync.
 
         """
-        return dict((key, value) for key, value in self.__dict__.items()
-                    if key in self._attrs_to_sync)
+        return dict(
+            (key, value) for key, value in self.__dict__.items() if key in self._attrs_to_sync
+        )
 
     def load_sync_data(self, sessdata):
         """
@@ -119,9 +135,12 @@ def load_sync_data(self, sessdata):
 
         """
         for propname, value in sessdata.items():
-            if (propname == "protocol_flags" and isinstance(value, dict) and
-                    hasattr(self, "protocol_flags") and
-                    isinstance(self.protocol_flags, dict)):
+            if (
+                propname == "protocol_flags"
+                and isinstance(value, dict)
+                and hasattr(self, "protocol_flags")
+                and isinstance(self.protocol_flags, dict)
+            ):
                 # special handling to allow partial update of protocol flags
                 self.protocol_flags.update(value)
             else:
@@ -135,7 +154,9 @@ def at_sync(self):
 
         """
         if self.account:
-            self.protocol_flags.update(self.account.attributes.get("_saved_protocol_flags", None) or {})
+            self.protocol_flags.update(
+                self.account.attributes.get("_saved_protocol_flags", None) or {}
+            )
 
     # access hooks
 
diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py
index cdb9a1ab1d0..1bf43746d66 100644
--- a/evennia/server/sessionhandler.py
+++ b/evennia/server/sessionhandler.py
@@ -13,14 +13,17 @@
 
 """
 import time
-from builtins import object
-from future.utils import listvalues
 
 from django.conf import settings
 from evennia.commands.cmdhandler import CMD_LOGINSTART
 from evennia.utils.logger import log_trace
-from evennia.utils.utils import (variable_from_module, is_iter,
-                                 make_iter, delay, callables_from_module)
+from evennia.utils.utils import (
+    variable_from_module,
+    is_iter,
+    make_iter,
+    delay,
+    callables_from_module,
+)
 from evennia.server.signals import SIGNAL_ACCOUNT_POST_LOGIN, SIGNAL_ACCOUNT_POST_LOGOUT
 from evennia.server.signals import SIGNAL_ACCOUNT_POST_FIRST_LOGIN, SIGNAL_ACCOUNT_POST_LAST_LOGOUT
 from evennia.utils.inlinefuncs import parse_inlinefunc
@@ -35,7 +38,7 @@
 _ScriptDB = None
 _OOB_HANDLER = None
 
-_ERR_BAD_UTF8 = 'Your client sent an incorrect UTF-8 sequence.'
+_ERR_BAD_UTF8 = "Your client sent an incorrect UTF-8 sequence."
 
 
 class DummySession(object):
@@ -45,23 +48,23 @@ class DummySession(object):
 DUMMYSESSION = DummySession()
 
 # AMP signals
-PCONN = chr(1)        # portal session connect
-PDISCONN = chr(2)     # portal session disconnect
-PSYNC = chr(3)        # portal session sync
-SLOGIN = chr(4)       # server session login
-SDISCONN = chr(5)     # server session disconnect
+PCONN = chr(1)  # portal session connect
+PDISCONN = chr(2)  # portal session disconnect
+PSYNC = chr(3)  # portal session sync
+SLOGIN = chr(4)  # server session login
+SDISCONN = chr(5)  # server session disconnect
 SDISCONNALL = chr(6)  # server session disconnect all
-SSHUTD = chr(7)       # server shutdown
-SSYNC = chr(8)        # server session sync
-SCONN = chr(11)        # server portal connection (for bots)
-PCONNSYNC = chr(12)   # portal post-syncing session
+SSHUTD = chr(7)  # server shutdown
+SSYNC = chr(8)  # server session sync
+SCONN = chr(11)  # server portal connection (for bots)
+PCONNSYNC = chr(12)  # portal post-syncing session
 PDISCONNALL = chr(13)  # portal session discnnect all
-SRELOAD = chr(14)      # server reloading (have portal start a new server)
-SSTART = chr(15)       # server start (portal must already be running anyway)
-PSHUTD = chr(16)       # portal (+server) shutdown
-SSHUTD = chr(17)       # server shutdown
-PSTATUS = chr(18)      # ping server or portal status
-SRESET = chr(19)       # server shutdown in reset mode
+SRELOAD = chr(14)  # server reloading (have portal start a new server)
+SSTART = chr(15)  # server start (portal must already be running anyway)
+PSHUTD = chr(16)  # portal (+server) shutdown
+SSHUTD = chr(17)  # server shutdown
+PSTATUS = chr(18)  # ping server or portal status
+SRESET = chr(19)  # server shutdown in reset mode
 
 # i18n
 from django.utils.translation import ugettext as _
@@ -98,15 +101,16 @@ def delayed_import():
     if not _ScriptDB:
         from evennia.scripts.models import ScriptDB as _ScriptDB
     # including once to avoid warnings in Python syntax checkers
-    assert(_ServerSession)
-    assert(_AccountDB)
-    assert(_ServerConfig)
-    assert(_ScriptDB)
+    assert _ServerSession
+    assert _AccountDB
+    assert _ServerConfig
+    assert _ScriptDB
 
 
-#-----------------------------------------------------------
+# -----------------------------------------------------------
 # SessionHandler base class
-#------------------------------------------------------------
+# ------------------------------------------------------------
+
 
 class SessionHandler(dict):
     """
@@ -148,7 +152,7 @@ def get_sessions(self, include_unloggedin=False):
 
         """
         if include_unloggedin:
-            return listvalues(self)
+            return list(self.values())
         else:
             return [session for session in self.values() if session.logged_in]
 
@@ -201,7 +205,7 @@ def _utf8(data):
                 except UnicodeDecodeError:
                     # incorrect unicode sequence
                     session.sendLine(_ERR_BAD_UTF8)
-                    data = ''
+                    data = ""
 
             return data
 
@@ -222,8 +226,11 @@ def _validate(data):
                     data = parse_inlinefunc(data, strip=strip_inlinefunc, session=session)
 
                 return str(data)
-            elif hasattr(data, "id") and hasattr(data, "db_date_created") \
-                    and hasattr(data, '__dbclass__'):
+            elif (
+                hasattr(data, "id")
+                and hasattr(data, "db_date_created")
+                and hasattr(data, "__dbclass__")
+            ):
                 # convert database-object to their string representation.
                 return _validate(str(data))
             else:
@@ -261,6 +268,7 @@ def _validate(data):
 # Server-SessionHandler class
 # ------------------------------------------------------------
 
+
 class ServerSessionHandler(SessionHandler):
     """
     This object holds the stack of sessions active in the game at
@@ -384,7 +392,7 @@ def portal_sessions_sync(self, portalsessionsdata):
             self[sessid] = sess
             sess.at_sync()
 
-        mode = 'reload'
+        mode = "reload"
 
         # tell the server hook we synced
         self.server.at_post_portal_sync(mode)
@@ -442,9 +450,9 @@ def start_bot_session(self, protocol_path, configdict):
             the Server.
 
         """
-        self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION, operation=SCONN,
-                                                         protocol_path=protocol_path,
-                                                         config=configdict)
+        self.server.amp_protocol.send_AdminServer2Portal(
+            DUMMYSESSION, operation=SCONN, protocol_path=protocol_path, config=configdict
+        )
 
     def portal_restart_server(self):
         """
@@ -466,8 +474,7 @@ def portal_shutdown(self):
         itself down)
 
         """
-        self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
-                                                         operation=PSHUTD)
+        self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION, operation=PSHUTD)
 
     def login(self, session, account, force=False, testmode=False):
         """
@@ -514,10 +521,9 @@ def login(self, session, account, force=False, testmode=False):
         session.logged_in = True
         # sync the portal to the session
         if not testmode:
-            self.server.amp_protocol.send_AdminServer2Portal(session,
-                                                             operation=SLOGIN,
-                                                             sessiondata={"logged_in": True,
-                                                                          "uid": session.uid})
+            self.server.amp_protocol.send_AdminServer2Portal(
+                session, operation=SLOGIN, sessiondata={"logged_in": True, "uid": session.uid}
+            )
         account.at_post_login(session=session)
         if nsess < 2:
             SIGNAL_ACCOUNT_POST_FIRST_LOGIN.send(sender=account, session=session)
@@ -545,8 +551,9 @@ def disconnect(self, session, reason="", sync_portal=True):
             nsess = len(self.sessions_from_account(session.account)) - 1
             sreason = " ({})".format(reason) if reason else ""
             string = "Logged out: {account} {address} ({nsessions} sessions(s) remaining){reason}"
-            string = string.format(reason=sreason, account=session.account,
-                                   address=session.address, nsessions=nsess)
+            string = string.format(
+                reason=sreason, account=session.account, address=session.address, nsessions=nsess
+            )
             session.log(string)
 
             if nsess == 0:
@@ -559,9 +566,9 @@ def disconnect(self, session, reason="", sync_portal=True):
             del self[sessid]
         if sync_portal:
             # inform portal that session should be closed.
-            self.server.amp_protocol.send_AdminServer2Portal(session,
-                                                             operation=SDISCONN,
-                                                             reason=reason)
+            self.server.amp_protocol.send_AdminServer2Portal(
+                session, operation=SDISCONN, reason=reason
+            )
 
     def all_sessions_portal_sync(self):
         """
@@ -570,9 +577,9 @@ def all_sessions_portal_sync(self):
 
         """
         sessdata = self.get_all_sync_data()
-        return self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
-                                                                operation=SSYNC,
-                                                                sessiondata=sessdata)
+        return self.server.amp_protocol.send_AdminServer2Portal(
+            DUMMYSESSION, operation=SSYNC, sessiondata=sessdata
+        )
 
     def session_portal_sync(self, session):
         """
@@ -581,10 +588,9 @@ def session_portal_sync(self, session):
 
         """
         sessdata = {session.sessid: session.get_sync_data()}
-        return self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
-                                                                operation=SSYNC,
-                                                                sessiondata=sessdata,
-                                                                clean=False)
+        return self.server.amp_protocol.send_AdminServer2Portal(
+            DUMMYSESSION, operation=SSYNC, sessiondata=sessdata, clean=False
+        )
 
     def session_portal_partial_sync(self, session_data):
         """
@@ -595,10 +601,9 @@ def session_portal_partial_sync(self, session_data):
                 more sessions in detail.
 
         """
-        return self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
-                                                                operation=SSYNC,
-                                                                sessiondata=session_data,
-                                                                clean=False)
+        return self.server.amp_protocol.send_AdminServer2Portal(
+            DUMMYSESSION, operation=SSYNC, sessiondata=session_data, clean=False
+        )
 
     def disconnect_all_sessions(self, reason="You have been disconnected."):
         """
@@ -612,12 +617,13 @@ def disconnect_all_sessions(self, reason="You have been disconnected."):
         for session in self:
             del session
         # tell portal to disconnect all sessions
-        self.server.amp_protocol.send_AdminServer2Portal(DUMMYSESSION,
-                                                         operation=SDISCONNALL,
-                                                         reason=reason)
+        self.server.amp_protocol.send_AdminServer2Portal(
+            DUMMYSESSION, operation=SDISCONNALL, reason=reason
+        )
 
-    def disconnect_duplicate_sessions(self, curr_session,
-                                      reason=_("Logged in from elsewhere. Disconnecting.")):
+    def disconnect_duplicate_sessions(
+        self, curr_session, reason=_("Logged in from elsewhere. Disconnecting.")
+    ):
         """
         Disconnects any existing sessions with the same user.
 
@@ -630,10 +636,9 @@ def disconnect_duplicate_sessions(self, curr_session,
         # we can't compare sessions directly since this will compare addresses and
         # mean connecting from the same host would not catch duplicates
         sid = id(curr_session)
-        doublet_sessions = [sess for sess in self.values()
-                            if sess.logged_in and
-                            sess.uid == uid and
-                            id(sess) != sid]
+        doublet_sessions = [
+            sess for sess in self.values() if sess.logged_in and sess.uid == uid and id(sess) != sid
+        ]
 
         for session in doublet_sessions:
             self.disconnect(session, reason)
@@ -646,9 +651,13 @@ def validate_sessions(self):
         """
         tcurr = time.time()
         reason = _("Idle timeout exceeded, disconnecting.")
-        for session in (session for session in self.values()
-                        if session.logged_in and _IDLE_TIMEOUT > 0 and
-                        (tcurr - session.cmd_last) > _IDLE_TIMEOUT):
+        for session in (
+            session
+            for session in self.values()
+            if session.logged_in
+            and _IDLE_TIMEOUT > 0
+            and (tcurr - session.cmd_last) > _IDLE_TIMEOUT
+        ):
             self.disconnect(session, reason=reason)
 
     def account_count(self):
@@ -672,8 +681,13 @@ def all_connected_accounts(self):
                 amount of Sessions due to multi-playing).
 
         """
-        return list(set(session.account for session in self.values()
-                        if session.logged_in and session.account))
+        return list(
+            set(
+                session.account
+                for session in self.values()
+                if session.logged_in and session.account
+            )
+        )
 
     def session_from_sessid(self, sessid):
         """
@@ -704,8 +718,11 @@ def session_from_account(self, account, sessid):
             sessions (Session or list): Session(s) found.
 
         """
-        sessions = [self[sid] for sid in make_iter(sessid)
-                    if sid in self and self[sid].logged_in and account.uid == self[sid].uid]
+        sessions = [
+            self[sid]
+            for sid in make_iter(sessid)
+            if sid in self and self[sid].logged_in and account.uid == self[sid].uid
+        ]
         return sessions[0] if len(sessions) == 1 else sessions
 
     def sessions_from_account(self, account):
@@ -736,6 +753,7 @@ def sessions_from_puppet(self, puppet):
         """
         sessions = puppet.sessid.get()
         return sessions[0] if len(sessions) == 1 else sessions
+
     sessions_from_character = sessions_from_puppet
 
     def sessions_from_csessid(self, csessid):
@@ -751,8 +769,9 @@ def sessions_from_csessid(self, csessid):
         """
         if csessid:
             return []
-        return [session for session in self.values()
-                if session.csessid and session.csessid == csessid]
+        return [
+            session for session in self.values() if session.csessid and session.csessid == csessid
+        ]
 
     def announce_all(self, message):
         """
@@ -781,8 +800,7 @@ def data_out(self, session, **kwargs):
         kwargs = self.clean_senddata(session, kwargs)
 
         # send across AMP
-        self.server.amp_protocol.send_MsgServer2Portal(session,
-                                                       **kwargs)
+        self.server.amp_protocol.send_MsgServer2Portal(session, **kwargs)
 
     def get_inputfuncs(self):
         """
diff --git a/evennia/server/signals.py b/evennia/server/signals.py
index 3154898ba4f..fd96becc6fc 100644
--- a/evennia/server/signals.py
+++ b/evennia/server/signals.py
@@ -24,45 +24,45 @@ def my_callback(sender, **kwargs):
 # Account.create() after the Account is created. Note that this will *not* fire
 # if calling create.create_account alone, since going through the Account.create()
 # is the most expected route.
-SIGNAL_ACCOUNT_POST_CREATE = Signal(providing_args=['ip', ])
+SIGNAL_ACCOUNT_POST_CREATE = Signal(providing_args=["ip"])
 
 # The Sender is the renamed Account. This is triggered by the username setter in AccountDB.
-SIGNAL_ACCOUNT_POST_RENAME = Signal(providing_args=['old_name', 'new_name'])
+SIGNAL_ACCOUNT_POST_RENAME = Signal(providing_args=["old_name", "new_name"])
 
 # The Sender is the connecting Account. This is triggered when an Account connects cold;
 # that is, it had no other sessions connected.
-SIGNAL_ACCOUNT_POST_FIRST_LOGIN = Signal(providing_args=['session', ])
+SIGNAL_ACCOUNT_POST_FIRST_LOGIN = Signal(providing_args=["session"])
 
 # The sender is the connecting Account. This is triggered whenever a session authenticates
 # to an Account regardless of existing sessions. It then firest after FIRST_LOGIN signal
-SIGNAL_ACCOUNT_POST_LOGIN = Signal(providing_args=['session', ])
+SIGNAL_ACCOUNT_POST_LOGIN = Signal(providing_args=["session"])
 
 # The Sender is the Account attempting to authenticate. This is triggered whenever a
 # session tries to login to an Account but fails.
-SIGNAL_ACCOUNT_POST_LOGIN_FAIL = Signal(providing_args=['session', ])
+SIGNAL_ACCOUNT_POST_LOGIN_FAIL = Signal(providing_args=["session"])
 
 # The sender is the disconnecting Account. This is triggered whenever a session disconnects
 # from the account, regardless of how many it started with or remain.
-SIGNAL_ACCOUNT_POST_LOGOUT = Signal(providing_args=['session', ])
+SIGNAL_ACCOUNT_POST_LOGOUT = Signal(providing_args=["session"])
 
 # The sender is the Account. This is triggered when an Account's final session disconnects.
-SIGNAL_ACCOUNT_POST_LAST_LOGOUT = Signal(providing_args=['session', ])
+SIGNAL_ACCOUNT_POST_LAST_LOGOUT = Signal(providing_args=["session"])
 
 # The sender is an Object. This is triggered when Object has been created, after all hooks.
 SIGNAL_OBJECT_POST_CREATE = Signal()
 
 # The sender is the Object being puppeted. This is triggered after all puppeting hooks have
 # been called. The Object has already been puppeted by this point.
-SIGNAL_OBJECT_POST_PUPPET = Signal(providing_args=['session', 'account'])
+SIGNAL_OBJECT_POST_PUPPET = Signal(providing_args=["session", "account"])
 
 # The sender is the Object being released. This is triggered after all hooks are called.
 # The Object is no longer puppeted by this point.
-SIGNAL_OBJECT_POST_UNPUPPET = Signal(providing_args=['session', 'account'])
+SIGNAL_OBJECT_POST_UNPUPPET = Signal(providing_args=["session", "account"])
 
 # The sender is the Typed Object being renamed. This isn't necessarily an Object;
 # it could be a script. It fires whenever the value of the Typed object's 'key'
 # changes. Will need to use isinstance() or other filtering on things that use this.
-SIGNAL_TYPED_OBJECT_POST_RENAME = Signal(providing_args=['old_key', 'new_key'])
+SIGNAL_TYPED_OBJECT_POST_RENAME = Signal(providing_args=["old_key", "new_key"])
 
 # The sender is the created Script. This is called after the Script was first created,
 # after all hooks.
diff --git a/evennia/server/tests/test_amp_connection.py b/evennia/server/tests/test_amp_connection.py
index 9c0ea83f1a8..8f41150866c 100644
--- a/evennia/server/tests/test_amp_connection.py
+++ b/evennia/server/tests/test_amp_connection.py
@@ -17,12 +17,12 @@
 from evennia.utils import create
 
 from twisted.internet.base import DelayedCall
+
 DelayedCall.debug = True
 
 # @patch("evennia.server.initial_setup.get_god_account",
 #        MagicMock(return_value=create.account("TestAMPAccount", "test@test.com", "testpassword")))
 class _TestAMP(TwistedTestCase):
-
     def setUp(self):
         super(_TestAMP, self).setUp()
         self.account = mommy.make("accounts.AccountDB", id=1)
@@ -90,9 +90,9 @@ def test_msgserver2portal(self, mocktransport):
     def test_adminserver2portal(self, mocktransport):
         self._connect_client(mocktransport)
 
-        self.amp_client.send_AdminServer2Portal(self.session,
-                                                operation=amp.PSYNC,
-                                                info_dict={}, spid=None)
+        self.amp_client.send_AdminServer2Portal(
+            self.session, operation=amp.PSYNC, info_dict={}, spid=None
+        )
         wire_data = self._catch_wire_read(mocktransport)[0]
 
         self._connect_server(mocktransport)
@@ -117,8 +117,7 @@ def test_msgportal2server(self, mocktransport):
     def test_adminportal2server(self, mocktransport):
         self._connect_server(mocktransport)
 
-        self.amp_server.send_AdminPortal2Server(self.session,
-                                                operation=amp.PDISCONNALL)
+        self.amp_server.send_AdminPortal2Server(self.session, operation=amp.PDISCONNALL)
         wire_data = self._catch_wire_read(mocktransport)[0]
 
         self._connect_client(mocktransport)
diff --git a/evennia/server/tests/test_initial_setup.py b/evennia/server/tests/test_initial_setup.py
index b08bde14e0d..a0f2cee28bd 100644
--- a/evennia/server/tests/test_initial_setup.py
+++ b/evennia/server/tests/test_initial_setup.py
@@ -11,7 +11,6 @@
 
 
 class TestInitialSetup(TestCase):
-
     @patch("evennia.server.initial_setup.AccountDB")
     def test_get_god_account(self, mocked_accountdb):
         mocked_accountdb.objects.get = MagicMock(return_value=1)
diff --git a/evennia/server/tests/test_launcher.py b/evennia/server/tests/test_launcher.py
index 231aab8aa65..b22160e45bc 100644
--- a/evennia/server/tests/test_launcher.py
+++ b/evennia/server/tests/test_launcher.py
@@ -13,22 +13,25 @@
 from evennia.server.portal import amp
 
 from twisted.internet.base import DelayedCall
+
 DelayedCall.debug = True
 
+
 @patch("evennia.server.evennia_launcher.Popen", new=MagicMock())
 class TestLauncher(TwistedTestCase):
-
     def test_is_windows(self):
-        self.assertEqual(evennia_launcher._is_windows(), os.name == 'nt')
+        self.assertEqual(evennia_launcher._is_windows(), os.name == "nt")
 
     def test_file_compact(self):
-        self.assertEqual(evennia_launcher._file_names_compact(
-            "foo/bar/test1", "foo/bar/test2"),
-            "foo/bar/test1 and test2")
+        self.assertEqual(
+            evennia_launcher._file_names_compact("foo/bar/test1", "foo/bar/test2"),
+            "foo/bar/test1 and test2",
+        )
 
-        self.assertEqual(evennia_launcher._file_names_compact(
-            "foo/test1", "foo/bar/test2"),
-            "foo/test1 and foo/bar/test2")
+        self.assertEqual(
+            evennia_launcher._file_names_compact("foo/test1", "foo/bar/test2"),
+            "foo/test1 and foo/bar/test2",
+        )
 
     @patch("evennia.server.evennia_launcher.print")
     def test_print_info(self, mockprint):
@@ -41,7 +44,7 @@ def test_print_info(self, mockprint):
             "webserver_proxy": 1234,
             "webclient": 1234,
             "webserver_internal": 1234,
-            "amp": 1234
+            "amp": 1234,
         }
         server_dict = {
             "servername": "testserver",
@@ -50,7 +53,7 @@ def test_print_info(self, mockprint):
             "amp": 1234,
             "irc_rss": "irc.test",
             "info": "testing mode",
-            "errors": ""
+            "errors": "",
         }
 
         evennia_launcher._print_info(portal_dict, server_dict)
@@ -129,14 +132,14 @@ def _msend_status_err(operation, arguments, callback=None, errback=None):
     @patch("evennia.server.evennia_launcher.print")
     def test_query_status_run(self, mprint):
         evennia_launcher.query_status()
-        mprint.assert_called_with('Portal: RUNNING (pid 100)\nServer: RUNNING (pid 100)')
+        mprint.assert_called_with("Portal: RUNNING (pid 100)\nServer: RUNNING (pid 100)")
 
     @patch("evennia.server.evennia_launcher.send_instruction", _msend_status_err)
     @patch("evennia.server.evennia_launcher.NO_REACTOR_STOP", True)
     @patch("evennia.server.evennia_launcher.print")
     def test_query_status_not_run(self, mprint):
         evennia_launcher.query_status()
-        mprint.assert_called_with('Portal: NOT RUNNING\nServer: NOT RUNNING')
+        mprint.assert_called_with("Portal: NOT RUNNING\nServer: NOT RUNNING")
 
     @patch("evennia.server.evennia_launcher.send_instruction", _msend_status_ok)
     @patch("evennia.server.evennia_launcher.NO_REACTOR_STOP", True)
@@ -144,7 +147,7 @@ def test_query_status_callback(self):
         mprint = MagicMock()
 
         def testcall(response):
-            resp = pickle.loads(response['status'])
+            resp = pickle.loads(response["status"])
             mprint(resp)
 
         evennia_launcher.query_status(callback=testcall)
@@ -173,10 +176,8 @@ def test_wait_for_status(self, mcalllater):
         mcall = MagicMock()
         merr = MagicMock()
         evennia_launcher.wait_for_status(
-            portal_running=True,
-            server_running=True,
-            callback=mcall,
-            errback=merr)
+            portal_running=True, server_running=True, callback=mcall, errback=merr
+        )
 
         mcall.assert_called_with(True, True)
         merr.assert_not_called()
@@ -187,10 +188,8 @@ def test_wait_for_status_fail(self, mcalllater):
         mcall = MagicMock()
         merr = MagicMock()
         evennia_launcher.wait_for_status(
-            portal_running=True,
-            server_running=True,
-            callback=mcall,
-            errback=merr)
+            portal_running=True, server_running=True, callback=mcall, errback=merr
+        )
 
         mcall.assert_not_called()
         merr.assert_not_called()
diff --git a/evennia/server/tests/test_misc.py b/evennia/server/tests/test_misc.py
index ff0ba8cda7a..3e0672ba9f2 100644
--- a/evennia/server/tests/test_misc.py
+++ b/evennia/server/tests/test_misc.py
@@ -22,6 +22,7 @@ class MockSettings(object):
     Class for simulating django.conf.settings. Created with a single value, and then sets the required
     WEBSERVER_ENABLED setting to True or False depending if we're testing WEBSERVER_PORTS.
     """
+
     def __init__(self, setting, value=None):
         setattr(self, setting, value)
         if setting == "WEBSERVER_PORTS":
@@ -34,12 +35,26 @@ class TestDeprecations(TestCase):
     """
     Class for testing deprecations.check_errors.
     """
+
     deprecated_settings = (
-            "CMDSET_DEFAULT", "CMDSET_OOC", "BASE_COMM_TYPECLASS", "COMM_TYPECLASS_PATHS",
-            "CHARACTER_DEFAULT_HOME", "OBJECT_TYPECLASS_PATHS", "SCRIPT_TYPECLASS_PATHS",
-            "ACCOUNT_TYPECLASS_PATHS", "CHANNEL_TYPECLASS_PATHS", "SEARCH_MULTIMATCH_SEPARATOR",
-            "TIME_SEC_PER_MIN", "TIME_MIN_PER_HOUR", "TIME_HOUR_PER_DAY", "TIME_DAY_PER_WEEK",
-            "TIME_WEEK_PER_MONTH", "TIME_MONTH_PER_YEAR", "GAME_DIRECTORY_LISTING")
+        "CMDSET_DEFAULT",
+        "CMDSET_OOC",
+        "BASE_COMM_TYPECLASS",
+        "COMM_TYPECLASS_PATHS",
+        "CHARACTER_DEFAULT_HOME",
+        "OBJECT_TYPECLASS_PATHS",
+        "SCRIPT_TYPECLASS_PATHS",
+        "ACCOUNT_TYPECLASS_PATHS",
+        "CHANNEL_TYPECLASS_PATHS",
+        "SEARCH_MULTIMATCH_SEPARATOR",
+        "TIME_SEC_PER_MIN",
+        "TIME_MIN_PER_HOUR",
+        "TIME_HOUR_PER_DAY",
+        "TIME_DAY_PER_WEEK",
+        "TIME_WEEK_PER_MONTH",
+        "TIME_MONTH_PER_YEAR",
+        "GAME_DIRECTORY_LISTING",
+    )
 
     def test_check_errors(self):
         """
@@ -51,34 +66,32 @@ def test_check_errors(self):
             self.assertRaises(DeprecationWarning, check_errors, MockSettings(setting))
         # test check for WEBSERVER_PORTS having correct value
         self.assertRaises(
-            DeprecationWarning,
-            check_errors, MockSettings("WEBSERVER_PORTS", value=["not a tuple"]))
+            DeprecationWarning, check_errors, MockSettings("WEBSERVER_PORTS", value=["not a tuple"])
+        )
 
 
 class ValidatorTest(EvenniaTest):
-
     def test_validator(self):
         # Validator returns None on success and ValidationError on failure.
         validator = EvenniaPasswordValidator()
 
         # This password should meet Evennia standards.
-        self.assertFalse(validator.validate('testpassword', user=self.account))
+        self.assertFalse(validator.validate("testpassword", user=self.account))
 
         # This password contains illegal characters and should raise an Exception.
         from django.core.exceptions import ValidationError
-        self.assertRaises(ValidationError, validator.validate, '(#)[#]<>', user=self.account)
+
+        self.assertRaises(ValidationError, validator.validate, "(#)[#]<>", user=self.account)
 
 
 class ThrottleTest(EvenniaTest):
     """
     Class for testing the connection/IP throttle.
     """
+
     def test_throttle(self):
-        ips = ('94.100.176.153', '45.56.148.77', '5.196.1.129')
-        kwargs = {
-            'limit': 5,
-            'timeout': 15 * 60
-        }
+        ips = ("94.100.176.153", "45.56.148.77", "5.196.1.129")
+        kwargs = {"limit": 5, "timeout": 15 * 60}
 
         throttle = Throttle(**kwargs)
 
diff --git a/evennia/server/tests/test_server.py b/evennia/server/tests/test_server.py
index bc971af7a46..076a03a879a 100644
--- a/evennia/server/tests/test_server.py
+++ b/evennia/server/tests/test_server.py
@@ -18,97 +18,110 @@ class TestServer(TestCase):
 
     def setUp(self):
         from evennia.server import server
+
         self.server = server
 
     def test__server_maintenance_reset(self):
-        with patch.multiple("evennia.server.server",
-                            LoopingCall=DEFAULT,
-                            Evennia=DEFAULT,
-                            _FLUSH_CACHE=DEFAULT,
-                            connection=DEFAULT,
-                            _IDMAPPER_CACHE_MAXSIZE=1000,
-                            _MAINTENANCE_COUNT=0,
-                            ServerConfig=DEFAULT) as mocks:
-            mocks['connection'].close = MagicMock()
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=456)
+        with patch.multiple(
+            "evennia.server.server",
+            LoopingCall=DEFAULT,
+            Evennia=DEFAULT,
+            _FLUSH_CACHE=DEFAULT,
+            connection=DEFAULT,
+            _IDMAPPER_CACHE_MAXSIZE=1000,
+            _MAINTENANCE_COUNT=0,
+            ServerConfig=DEFAULT,
+        ) as mocks:
+            mocks["connection"].close = MagicMock()
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=456)
 
             # flush cache
             self.server._server_maintenance()
-            mocks['ServerConfig'].objects.conf.assert_called_with('runtime', 456)
+            mocks["ServerConfig"].objects.conf.assert_called_with("runtime", 456)
 
     def test__server_maintenance_flush(self):
-        with patch.multiple("evennia.server.server",
-                            LoopingCall=DEFAULT,
-                            Evennia=DEFAULT,
-                            _FLUSH_CACHE=DEFAULT,
-                            connection=DEFAULT,
-                            _IDMAPPER_CACHE_MAXSIZE=1000,
-                            _MAINTENANCE_COUNT=600 - 1,
-                            ServerConfig=DEFAULT) as mocks:
-            mocks['connection'].close = MagicMock()
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=100)
+        with patch.multiple(
+            "evennia.server.server",
+            LoopingCall=DEFAULT,
+            Evennia=DEFAULT,
+            _FLUSH_CACHE=DEFAULT,
+            connection=DEFAULT,
+            _IDMAPPER_CACHE_MAXSIZE=1000,
+            _MAINTENANCE_COUNT=600 - 1,
+            ServerConfig=DEFAULT,
+        ) as mocks:
+            mocks["connection"].close = MagicMock()
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
 
             # flush cache
             self.server._server_maintenance()
-            mocks['_FLUSH_CACHE'].assert_called_with(1000)
+            mocks["_FLUSH_CACHE"].assert_called_with(1000)
 
     def test__server_maintenance_validate_scripts(self):
-        with patch.multiple("evennia.server.server",
-                            LoopingCall=DEFAULT,
-                            Evennia=DEFAULT,
-                            _FLUSH_CACHE=DEFAULT,
-                            connection=DEFAULT,
-                            _IDMAPPER_CACHE_MAXSIZE=1000,
-                            _MAINTENANCE_COUNT=3600 - 1,
-                            ServerConfig=DEFAULT) as mocks:
-            mocks['connection'].close = MagicMock()
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=100)
+        with patch.multiple(
+            "evennia.server.server",
+            LoopingCall=DEFAULT,
+            Evennia=DEFAULT,
+            _FLUSH_CACHE=DEFAULT,
+            connection=DEFAULT,
+            _IDMAPPER_CACHE_MAXSIZE=1000,
+            _MAINTENANCE_COUNT=3600 - 1,
+            ServerConfig=DEFAULT,
+        ) as mocks:
+            mocks["connection"].close = MagicMock()
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
             with patch("evennia.server.server.evennia.ScriptDB.objects.validate") as mock:
                 self.server._server_maintenance()
-                mocks['_FLUSH_CACHE'].assert_called_with(1000)
+                mocks["_FLUSH_CACHE"].assert_called_with(1000)
                 mock.assert_called()
 
     def test__server_maintenance_channel_handler_update(self):
-        with patch.multiple("evennia.server.server",
-                            LoopingCall=DEFAULT,
-                            Evennia=DEFAULT,
-                            _FLUSH_CACHE=DEFAULT,
-                            connection=DEFAULT,
-                            _IDMAPPER_CACHE_MAXSIZE=1000,
-                            _MAINTENANCE_COUNT=3700 - 1,
-                            ServerConfig=DEFAULT) as mocks:
-            mocks['connection'].close = MagicMock()
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=100)
+        with patch.multiple(
+            "evennia.server.server",
+            LoopingCall=DEFAULT,
+            Evennia=DEFAULT,
+            _FLUSH_CACHE=DEFAULT,
+            connection=DEFAULT,
+            _IDMAPPER_CACHE_MAXSIZE=1000,
+            _MAINTENANCE_COUNT=3700 - 1,
+            ServerConfig=DEFAULT,
+        ) as mocks:
+            mocks["connection"].close = MagicMock()
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
             with patch("evennia.server.server.evennia.CHANNEL_HANDLER.update") as mock:
                 self.server._server_maintenance()
                 mock.assert_called()
 
     def test__server_maintenance_close_connection(self):
-        with patch.multiple("evennia.server.server",
-                            LoopingCall=DEFAULT,
-                            Evennia=DEFAULT,
-                            _FLUSH_CACHE=DEFAULT,
-                            connection=DEFAULT,
-                            _IDMAPPER_CACHE_MAXSIZE=1000,
-                            _MAINTENANCE_COUNT=(3600 * 7) - 1,
-                            ServerConfig=DEFAULT) as mocks:
-            mocks['connection'].close = MagicMock()
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=100)
+        with patch.multiple(
+            "evennia.server.server",
+            LoopingCall=DEFAULT,
+            Evennia=DEFAULT,
+            _FLUSH_CACHE=DEFAULT,
+            connection=DEFAULT,
+            _IDMAPPER_CACHE_MAXSIZE=1000,
+            _MAINTENANCE_COUNT=(3600 * 7) - 1,
+            ServerConfig=DEFAULT,
+        ) as mocks:
+            mocks["connection"].close = MagicMock()
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
             self.server._server_maintenance()
-            mocks['connection'].close.assert_called()
+            mocks["connection"].close.assert_called()
 
     def test__server_maintenance_idle_time(self):
-        with patch.multiple("evennia.server.server",
-                            LoopingCall=DEFAULT,
-                            Evennia=DEFAULT,
-                            _FLUSH_CACHE=DEFAULT,
-                            connection=DEFAULT,
-                            _IDMAPPER_CACHE_MAXSIZE=1000,
-                            _MAINTENANCE_COUNT=(3600 * 7) - 1,
-                            SESSIONS=DEFAULT,
-                            _IDLE_TIMEOUT=10,
-                            time=DEFAULT,
-                            ServerConfig=DEFAULT) as mocks:
+        with patch.multiple(
+            "evennia.server.server",
+            LoopingCall=DEFAULT,
+            Evennia=DEFAULT,
+            _FLUSH_CACHE=DEFAULT,
+            connection=DEFAULT,
+            _IDMAPPER_CACHE_MAXSIZE=1000,
+            _MAINTENANCE_COUNT=(3600 * 7) - 1,
+            SESSIONS=DEFAULT,
+            _IDLE_TIMEOUT=10,
+            time=DEFAULT,
+            ServerConfig=DEFAULT,
+        ) as mocks:
             sess1 = MagicMock()
             sess2 = MagicMock()
             sess3 = MagicMock()
@@ -123,9 +136,9 @@ def test__server_maintenance_idle_time(self):
             sess3.account = MagicMock()
             sess4.account.access = MagicMock(return_value=False)
 
-            mocks['time'].time = MagicMock(return_value=1000)
+            mocks["time"].time = MagicMock(return_value=1000)
 
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=100)
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=100)
             mocks["SESSIONS"].values = MagicMock(return_value=[sess1, sess2, sess3, sess4])
             mocks["SESSIONS"].disconnect = MagicMock()
 
@@ -135,11 +148,9 @@ def test__server_maintenance_idle_time(self):
             mocks["SESSIONS"].disconnect.assert_has_calls(calls, any_order=True)
 
     def test_evennia_start(self):
-        with patch.multiple("evennia.server.server",
-                            time=DEFAULT,
-                            service=DEFAULT) as mocks:
+        with patch.multiple("evennia.server.server", time=DEFAULT, service=DEFAULT) as mocks:
 
-            mocks['time'].time = MagicMock(return_value=1000)
+            mocks["time"].time = MagicMock(return_value=1000)
             evennia = self.server.Evennia(MagicMock())
             self.assertEqual(evennia.start_time, 1000)
 
@@ -148,45 +159,49 @@ def test_evennia_start(self):
     @patch("evennia.server.server.ScriptDB")
     @patch("evennia.comms.models.ChannelDB")
     def test_update_defaults(self, mockchan, mockscript, mockacct, mockobj):
-        with patch.multiple("evennia.server.server",
-                            ServerConfig=DEFAULT) as mocks:
-
-                mockchan.objects.filter = MagicMock()
-                mockscript.objects.filter = MagicMock()
-                mockacct.objects.filter = MagicMock()
-                mockobj.objects.filter = MagicMock()
-
-                # fake mismatches
-                settings_names = ("CMDSET_CHARACTER", "CMDSET_ACCOUNT",
-                                  "BASE_ACCOUNT_TYPECLASS", "BASE_OBJECT_TYPECLASS",
-                                  "BASE_CHARACTER_TYPECLASS", "BASE_ROOM_TYPECLASS",
-                                  "BASE_EXIT_TYPECLASS", "BASE_SCRIPT_TYPECLASS",
-                                  "BASE_CHANNEL_TYPECLASS")
-                fakes = {name: "Dummy.path" for name in settings_names}
-
-                def _mock_conf(key, *args):
-                    return fakes[key]
+        with patch.multiple("evennia.server.server", ServerConfig=DEFAULT) as mocks:
+
+            mockchan.objects.filter = MagicMock()
+            mockscript.objects.filter = MagicMock()
+            mockacct.objects.filter = MagicMock()
+            mockobj.objects.filter = MagicMock()
+
+            # fake mismatches
+            settings_names = (
+                "CMDSET_CHARACTER",
+                "CMDSET_ACCOUNT",
+                "BASE_ACCOUNT_TYPECLASS",
+                "BASE_OBJECT_TYPECLASS",
+                "BASE_CHARACTER_TYPECLASS",
+                "BASE_ROOM_TYPECLASS",
+                "BASE_EXIT_TYPECLASS",
+                "BASE_SCRIPT_TYPECLASS",
+                "BASE_CHANNEL_TYPECLASS",
+            )
+            fakes = {name: "Dummy.path" for name in settings_names}
+
+            def _mock_conf(key, *args):
+                return fakes[key]
+
+            mocks["ServerConfig"].objects.conf = _mock_conf
 
-                mocks['ServerConfig'].objects.conf = _mock_conf
-
-                evennia = self.server.Evennia(MagicMock())
-                evennia.update_defaults()
+            evennia = self.server.Evennia(MagicMock())
+            evennia.update_defaults()
 
-                mockchan.objects.filter.assert_called()
-                mockscript.objects.filter.assert_called()
-                mockacct.objects.filter.assert_called()
-                mockobj.objects.filter.assert_called()
+            mockchan.objects.filter.assert_called()
+            mockscript.objects.filter.assert_called()
+            mockacct.objects.filter.assert_called()
+            mockobj.objects.filter.assert_called()
 
     def test_initial_setup(self):
         from evennia.utils.create import create_account
 
-        acct = create_account("TestSuperuser", "test@test.com", "testpassword",
-                              is_superuser=True)
+        acct = create_account("TestSuperuser", "test@test.com", "testpassword", is_superuser=True)
 
-        with patch.multiple("evennia.server.initial_setup",
-                            reset_server=DEFAULT,
-                            AccountDB=DEFAULT) as mocks:
-            mocks['AccountDB'].objects.get = MagicMock(return_value=acct)
+        with patch.multiple(
+            "evennia.server.initial_setup", reset_server=DEFAULT, AccountDB=DEFAULT
+        ) as mocks:
+            mocks["AccountDB"].objects.get = MagicMock(return_value=acct)
             evennia = self.server.Evennia(MagicMock())
             evennia.run_initial_setup()
         acct.delete()
@@ -194,16 +209,17 @@ def test_initial_setup(self):
     def test_initial_setup_retry(self):
         from evennia.utils.create import create_account
 
-        acct = create_account("TestSuperuser2", "test@test.com", "testpassword",
-                              is_superuser=True)
+        acct = create_account("TestSuperuser2", "test@test.com", "testpassword", is_superuser=True)
 
-        with patch.multiple("evennia.server.initial_setup",
-                            ServerConfig=DEFAULT,
-                            reset_server=DEFAULT,
-                            AccountDB=DEFAULT) as mocks:
-            mocks['AccountDB'].objects.get = MagicMock(return_value=acct)
+        with patch.multiple(
+            "evennia.server.initial_setup",
+            ServerConfig=DEFAULT,
+            reset_server=DEFAULT,
+            AccountDB=DEFAULT,
+        ) as mocks:
+            mocks["AccountDB"].objects.get = MagicMock(return_value=acct)
             # a last_initial_setup_step > 0
-            mocks['ServerConfig'].objects.conf = MagicMock(return_value=4)
+            mocks["ServerConfig"].objects.conf = MagicMock(return_value=4)
             evennia = self.server.Evennia(MagicMock())
             evennia.run_initial_setup()
         acct.delete()
@@ -211,6 +227,7 @@ def test_initial_setup_retry(self):
     @override_settings(DEFAULT_HOME="#1")
     def test_run_init_hooks(self):
         from evennia.utils import create
+
         obj1 = create.object(key="HookTestObj1")
         obj2 = create.object(key="HookTestObj2")
         acct1 = create.account("HookAcct1", "hooktest1@test.com", "testpasswd")
@@ -224,9 +241,9 @@ def test_run_init_hooks(self):
                 mockobj.objects.clear_all_sessids = MagicMock()
 
                 evennia = self.server.Evennia(MagicMock())
-                evennia.run_init_hooks('reload') 
-                evennia.run_init_hooks('reset') 
-                evennia.run_init_hooks('shutdown') 
+                evennia.run_init_hooks("reload")
+                evennia.run_init_hooks("reset")
+                evennia.run_init_hooks("shutdown")
 
                 mockacct.get_all_cached_instances.assert_called()
                 mockobj.get_all_cached_instances.assert_called()
@@ -236,7 +253,7 @@ def test_run_init_hooks(self):
         acct1.delete()
         acct2.delete()
 
-    @patch('evennia.server.server.INFO_DICT', {"test": "foo"})
+    @patch("evennia.server.server.INFO_DICT", {"test": "foo"})
     def test_get_info_dict(self):
         evennia = self.server.Evennia(MagicMock())
         self.assertEqual(evennia.get_info_dict(), {"test": "foo"})
diff --git a/evennia/server/tests/testrunner.py b/evennia/server/tests/testrunner.py
index fb222c88c6c..63bbad49e0b 100644
--- a/evennia/server/tests/testrunner.py
+++ b/evennia/server/tests/testrunner.py
@@ -22,6 +22,8 @@ def build_suite(self, test_labels, extra_tests=None, **kwargs):
         If not given, a subset of settings.INSTALLED_APPS will be used.
         """
         import evennia
+
         evennia._init()
         return super(EvenniaTestSuiteRunner, self).build_suite(
-            test_labels, extra_tests=extra_tests, **kwargs)
+            test_labels, extra_tests=extra_tests, **kwargs
+        )
diff --git a/evennia/server/throttle.py b/evennia/server/throttle.py
index a1e6092844d..2105e8fc51e 100644
--- a/evennia/server/throttle.py
+++ b/evennia/server/throttle.py
@@ -16,7 +16,7 @@ class Throttle(object):
     no recent failures have been recorded.
     """
 
-    error_msg = 'Too many failed attempts; you must wait a few minutes before trying again.'
+    error_msg = "Too many failed attempts; you must wait a few minutes before trying again."
 
     def __init__(self, **kwargs):
         """
@@ -31,8 +31,8 @@ def __init__(self, **kwargs):
                 the throttle is imposed!
         """
         self.storage = defaultdict(deque)
-        self.cache_size = self.limit = kwargs.get('limit', 5)
-        self.timeout = kwargs.get('timeout', 5 * 60)
+        self.cache_size = self.limit = kwargs.get("limit", 5)
+        self.timeout = kwargs.get("timeout", 5 * 60)
 
     def get(self, ip=None):
         """
@@ -49,10 +49,12 @@ def get(self, ip=None):
                 timestamps of recent failures only for that IP.
 
         """
-        if ip: return self.storage.get(ip, deque(maxlen=self.cache_size))
-        else: return self.storage
+        if ip:
+            return self.storage.get(ip, deque(maxlen=self.cache_size))
+        else:
+            return self.storage
 
-    def update(self, ip, failmsg='Exceeded threshold.'):
+    def update(self, ip, failmsg="Exceeded threshold."):
         """
         Store the time of the latest failure.
 
@@ -78,8 +80,11 @@ def update(self, ip, failmsg='Exceeded threshold.'):
         currently_throttled = self.check(ip)
 
         # If this makes it engage, log a single activation event
-        if (not previously_throttled and currently_throttled):
-            logger.log_sec('Throttle Activated: %s (IP: %s, %i hits in %i seconds.)' % (failmsg, ip, self.limit, self.timeout))
+        if not previously_throttled and currently_throttled:
+            logger.log_sec(
+                "Throttle Activated: %s (IP: %s, %i hits in %i seconds.)"
+                % (failmsg, ip, self.limit, self.timeout)
+            )
 
     def check(self, ip):
         """
@@ -107,7 +112,7 @@ def check(self, ip):
                 return True
             else:
                 # timeout has passed. clear faillist
-                del(self.storage[ip])
+                del self.storage[ip]
                 return False
         else:
             return False
diff --git a/evennia/server/validators.py b/evennia/server/validators.py
index faa1aa68c8b..5d49cb0a724 100644
--- a/evennia/server/validators.py
+++ b/evennia/server/validators.py
@@ -24,26 +24,28 @@ def __call__(self, username):
         """
 
         # Check guest list
-        if (settings.GUEST_LIST and username.lower() in (guest.lower() for guest in settings.GUEST_LIST)):
+        if settings.GUEST_LIST and username.lower() in (
+            guest.lower() for guest in settings.GUEST_LIST
+        ):
             raise ValidationError(
-                _('Sorry, that username is reserved.'),
-                code='evennia_username_reserved',
+                _("Sorry, that username is reserved."), code="evennia_username_reserved"
             )
 
         # Check database
         exists = AccountDB.objects.filter(username__iexact=username).exists()
         if exists:
             raise ValidationError(
-                _('Sorry, that username is already taken.'),
-                code='evennia_username_taken',
+                _("Sorry, that username is already taken."), code="evennia_username_taken"
             )
 
 
 class EvenniaPasswordValidator:
-
-    def __init__(self, regex=r"^[\w. @+\-',]+$",
-                 policy="Password should contain a mix of letters, "
-                        "spaces, digits and @/./+/-/_/'/, only."):
+    def __init__(
+        self,
+        regex=r"^[\w. @+\-',]+$",
+        policy="Password should contain a mix of letters, "
+        "spaces, digits and @/./+/-/_/'/, only.",
+    ):
         """
         Constructs a standard Django password validator.
 
@@ -71,10 +73,7 @@ def validate(self, password, user=None):
         """
         # Check complexity
         if not re.findall(self.regex, password):
-            raise ValidationError(
-                _(self.policy),
-                code='evennia_password_policy',
-            )
+            raise ValidationError(_(self.policy), code="evennia_password_policy")
 
     def get_help_text(self):
         """
diff --git a/evennia/server/webserver.py b/evennia/server/webserver.py
index 884daabfe75..4dc3f71e354 100644
--- a/evennia/server/webserver.py
+++ b/evennia/server/webserver.py
@@ -14,7 +14,7 @@
 """
 import urllib.parse
 from urllib.parse import quote as urlquote
-from twisted.web import resource, http, server
+from twisted.web import resource, http, server, static
 from twisted.internet import reactor
 from twisted.application import internet
 from twisted.web.proxy import ReverseProxyResource
@@ -58,6 +58,7 @@ def callInThread(self, func, *args, **kwargs):
 # X-Forwarded-For Handler
 #
 
+
 class HTTPChannelWithXForwardedFor(http.HTTPChannel):
     """
     HTTP xforward class
@@ -73,9 +74,9 @@ def allHeadersReceived(self):
         http.HTTPChannel.allHeadersReceived(self)
         req = self.requests[-1]
         client_ip, port = self.transport.client
-        proxy_chain = req.getHeader('X-FORWARDED-FOR')
+        proxy_chain = req.getHeader("X-FORWARDED-FOR")
         if proxy_chain and client_ip in _UPSTREAM_IPS:
-            forwarded = proxy_chain.split(', ', 1)[CLIENT]
+            forwarded = proxy_chain.split(", ", 1)[CLIENT]
             self.transport.client = (forwarded, port)
 
 
@@ -100,10 +101,11 @@ def getChild(self, path, request):
 
         """
         request.notifyFinish().addErrback(
-                lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f))
+            lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f)
+        )
         return EvenniaReverseProxyResource(
-            self.host, self.port, self.path + '/' + urlquote(path, safe=""),
-            self.reactor)
+            self.host, self.port, self.path + "/" + urlquote(path, safe=""), self.reactor
+        )
 
     def render(self, request):
         """
@@ -121,18 +123,24 @@ def render(self, request):
         request.content.seek(0, 0)
         qs = urllib.parse.urlparse(request.uri)[4]
         if qs:
-            rest = self.path + '?' + qs.decode()
+            rest = self.path + "?" + qs.decode()
         else:
             rest = self.path
         rest = rest.encode()
         clientFactory = self.proxyClientFactoryClass(
-            request.method, rest, request.clientproto,
-            request.getAllHeaders(), request.content.read(), request)
+            request.method,
+            rest,
+            request.clientproto,
+            request.getAllHeaders(),
+            request.content.read(),
+            request,
+        )
         clientFactory.noisy = False
         self.reactor.connectTCP(self.host, self.port, clientFactory)
         # don't trigger traceback if connection is lost before request finish.
         request.notifyFinish().addErrback(
-                lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f))
+            lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f)
+        )
         return NOT_DONE_YET
 
 
@@ -178,7 +186,7 @@ def empty_threadpool(self):
         return defer.DeferredList(self._pending_requests, consumeErrors=True)
 
     def _decrement_requests(self, *args, **kwargs):
-        self._pending_requests.pop(kwargs.get('deferred', None), None)
+        self._pending_requests.pop(kwargs.get("deferred", None), None)
 
     def getChild(self, path, request):
         """
@@ -209,10 +217,12 @@ def getChild(self, path, request):
 # Site with deactivateable logging
 #
 
+
 class Website(server.Site):
     """
     This class will only log http requests if settings.DEBUG is True.
     """
+
     noisy = False
 
     def logPrefix(self):
@@ -231,6 +241,7 @@ def log(self, request):
 # Threaded Webserver
 #
 
+
 class WSGIWebServer(internet.TCPServer):
     """
     This is a WSGI webserver. It makes sure to start
@@ -268,3 +279,15 @@ def stopService(self):
         """
         super().stopService()
         self.pool.stop()
+
+
+class PrivateStaticRoot(static.File):
+    """
+    This overrides the default static file resource so as to not make the
+    directory listings public (that is, if you go to /media or /static you
+    won't see an index of all static/media files on the server).
+
+    """
+
+    def directoryListing(self):
+        return resource.ForbiddenResource()
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index 114747ddcf9..804df3f4792 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -12,7 +12,6 @@
 always be sure of what you have changed and what is default behaviour.
 
 """
-from builtins import range
 from django.contrib.messages import constants as messages
 from django.urls import reverse_lazy
 
@@ -36,13 +35,13 @@
 # A list of ports the Evennia telnet server listens on Can be one or many.
 TELNET_PORTS = [4000]
 # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
-TELNET_INTERFACES = ['0.0.0.0']
+TELNET_INTERFACES = ["0.0.0.0"]
 # Activate Telnet+SSL protocol (SecureSocketLibrary) for supporting clients
 SSL_ENABLED = False
 # Ports to use for Telnet+SSL
 SSL_PORTS = [4003]
 # Telnet+SSL Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
-SSL_INTERFACES = ['0.0.0.0']
+SSL_INTERFACES = ["0.0.0.0"]
 # OOB (out-of-band) telnet communication allows Evennia to communicate
 # special commands and data with enabled Telnet clients. This is used
 # to create custom client interfaces over a telnet connection. To make
@@ -55,7 +54,7 @@
 # Ports to use for SSH
 SSH_PORTS = [4004]
 # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
-SSH_INTERFACES = ['0.0.0.0']
+SSH_INTERFACES = ["0.0.0.0"]
 # Start the evennia django+twisted webserver so you can
 # browse the evennia website and the admin interface
 # (Obs - further web configuration can be found below
@@ -72,10 +71,10 @@
 # webserver (these should not be publicly open)
 WEBSERVER_PORTS = [(4001, 4005)]
 # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
-WEBSERVER_INTERFACES = ['0.0.0.0']
+WEBSERVER_INTERFACES = ["0.0.0.0"]
 # IP addresses that may talk to the server in a reverse proxy configuration,
 # like NginX.
-UPSTREAM_IPS = ['127.0.0.1']
+UPSTREAM_IPS = ["127.0.0.1"]
 # The webserver uses threadpool for handling requests. This will scale
 # with server load. Set the minimum and maximum number of threads it
 # may use as (min, max) (must be > 0)
@@ -96,7 +95,7 @@
 # front-facing client's sake.
 WEBSOCKET_CLIENT_PORT = 4002
 # Interface addresses to listen to. If 0.0.0.0, listen to all. Use :: for IPv6.
-WEBSOCKET_CLIENT_INTERFACE = '0.0.0.0'
+WEBSOCKET_CLIENT_INTERFACE = "0.0.0.0"
 # Actual URL for webclient component to reach the websocket. You only need
 # to set this if you know you need it, like using some sort of proxy setup.
 # If given it must be on the form "ws[s]://hostname[:port]". If left at None,
@@ -111,21 +110,23 @@
 # operating between two processes on the same machine. You usually don't need to
 # change this unless you cannot use the default AMP port/host for
 # whatever reason.
-AMP_HOST = 'localhost'
+AMP_HOST = "localhost"
 AMP_PORT = 4006
-AMP_INTERFACE = '127.0.0.1'
+AMP_INTERFACE = "127.0.0.1"
 
 
 # Path to the lib directory containing the bulk of the codebase's code.
 EVENNIA_DIR = os.path.dirname(os.path.abspath(__file__))
 # Path to the game directory (containing the server/conf/settings.py file)
 # This is dynamically created- there is generally no need to change this!
-if EVENNIA_DIR.lower() == os.getcwd().lower() or (sys.argv[1] == 'test' if len(sys.argv) > 1 else False):
+if EVENNIA_DIR.lower() == os.getcwd().lower() or (
+    sys.argv[1] == "test" if len(sys.argv) > 1 else False
+):
     # unittesting mode
     GAME_DIR = os.getcwd()
 else:
     # Fallback location (will be replaced by the actual game dir at runtime)
-    GAME_DIR = os.path.join(EVENNIA_DIR, 'game_template')
+    GAME_DIR = os.path.join(EVENNIA_DIR, "game_template")
     for i in range(10):
         gpath = os.getcwd()
         if "server" in os.listdir(gpath):
@@ -135,12 +136,12 @@
         os.chdir(os.pardir)
 
 # Place to put log files
-LOG_DIR = os.path.join(GAME_DIR, 'server', 'logs')
-SERVER_LOG_FILE = os.path.join(LOG_DIR, 'server.log')
-PORTAL_LOG_FILE = os.path.join(LOG_DIR, 'portal.log')
-HTTP_LOG_FILE = os.path.join(LOG_DIR, 'http_requests.log')
+LOG_DIR = os.path.join(GAME_DIR, "server", "logs")
+SERVER_LOG_FILE = os.path.join(LOG_DIR, "server.log")
+PORTAL_LOG_FILE = os.path.join(LOG_DIR, "portal.log")
+HTTP_LOG_FILE = os.path.join(LOG_DIR, "http_requests.log")
 # if this is set to the empty string, lockwarnings will be turned off.
-LOCKWARNING_LOG_FILE = os.path.join(LOG_DIR, 'lockwarnings.log')
+LOCKWARNING_LOG_FILE = os.path.join(LOG_DIR, "lockwarnings.log")
 # Rotate log files when server and/or portal stops. This will keep log
 # file sizes down. Turn off to get ever growing log files and never
 # lose log info.
@@ -151,15 +152,14 @@
 CHANNEL_LOG_ROTATE_SIZE = 1000000
 # Local time zone for this installation. All choices can be found here:
 # http://www.postgresql.org/docs/8.0/interactive/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE
-TIME_ZONE = 'UTC'
+TIME_ZONE = "UTC"
 # Activate time zone in datetimes
 USE_TZ = True
 # Authentication backends. This is the code used to authenticate a user.
-AUTHENTICATION_BACKENDS = (
-    'evennia.web.utils.backends.CaseInsensitiveModelBackend',)
+AUTHENTICATION_BACKENDS = ["evennia.web.utils.backends.CaseInsensitiveModelBackend"]
 # Language code for this installation. All choices can be found here:
 # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 # How long time (in seconds) a user may idle before being logged
 # out. This can be set as big as desired. A user may avoid being
 # thrown off by sending the empty system command 'idle' to the server
@@ -206,7 +206,7 @@
 # time depends very much on your game so some experimentation may
 # be necessary (use @server to see how many objects are in the idmapper
 # cache at any time). Setting this to None disables the cache cap.
-IDMAPPER_CACHE_MAXSIZE = 200      # (MB)
+IDMAPPER_CACHE_MAXSIZE = 200  # (MB)
 # This determines how many connections per second the Portal should
 # accept, as a DoS countermeasure. If the rate exceeds this number, incoming
 # connections will be queued to this rate, so none will be lost.
@@ -226,8 +226,9 @@
 # 0 or less.
 MAX_CHAR_LIMIT = 6000
 # The warning to echo back to users if they enter a very large string
-MAX_CHAR_LIMIT_WARNING = ("You entered a string that was too long. "
-                          "Please break it up into multiple parts.")
+MAX_CHAR_LIMIT_WARNING = (
+    "You entered a string that was too long. " "Please break it up into multiple parts."
+)
 # If this is true, errors and tracebacks from the engine will be
 # echoed as text in-game as well as to the log. This can speed up
 # debugging. OBS: Showing full tracebacks to regular users could be a
@@ -250,14 +251,15 @@
 # HOST - empty string is localhost (unused in sqlite3)
 # PORT - empty string defaults to localhost (unused in sqlite3)
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(GAME_DIR, 'server', 'evennia.db3'),
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',
-        'PORT': ''
-    }}
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": os.getenv("TEST_DB_PATH", os.path.join(GAME_DIR, "server", "evennia.db3")),
+        "USER": "",
+        "PASSWORD": "",
+        "HOST": "",
+        "PORT": "",
+    }
+}
 # How long the django-database connection should be kept open, in seconds.
 # If you get errors about the database having gone away after long idle
 # periods, shorten this value (e.g. MySQL defaults to a timeout of 8 hrs)
@@ -271,8 +273,9 @@
 # not be checked for models specified here. If new_natural_key does not exist,
 # `None` will be returned and stored back as if no replacement was set.
 ATTRIBUTE_STORED_MODEL_RENAME = [
-        (("players", "playerdb"), ("accounts", "accountdb")),
-        (("typeclasses", "defaultplayer"), ("typeclasses", "defaultaccount"))]
+    (("players", "playerdb"), ("accounts", "accountdb")),
+    (("typeclasses", "defaultplayer"), ("typeclasses", "defaultaccount")),
+]
 
 
 ######################################################################
@@ -353,7 +356,7 @@
 WEB_PLUGINS_MODULE = "server.conf.web_plugins"
 # Tuple of modules implementing lock functions. All callable functions
 # inside these modules will be available as lock functions.
-LOCK_FUNC_MODULES = ("evennia.locks.lockfuncs", "server.conf.lockfuncs",)
+LOCK_FUNC_MODULES = ("evennia.locks.lockfuncs", "server.conf.lockfuncs")
 # Module holding handlers for managing incoming data from the client. These
 # will be loaded in order, meaning functions in later modules may overload
 # previous ones if having the same name.
@@ -414,15 +417,16 @@
 # Command set for accounts without a character (ooc)
 CMDSET_ACCOUNT = "commands.default_cmdsets.AccountCmdSet"
 # Location to search for cmdsets if full path not given
-CMDSET_PATHS = ["commands", "evennia", "contribs"]
+CMDSET_PATHS = ["commands", "evennia", "evennia.contrib"]
 # Fallbacks for cmdset paths that fail to load. Note that if you change the path for your
 # default cmdsets, you will also need to copy CMDSET_FALLBACKS after your change in your
 # settings file for it to detect the change.
 CMDSET_FALLBACKS = {
-    CMDSET_CHARACTER: 'evennia.commands.default.cmdset_character.CharacterCmdSet',
-    CMDSET_ACCOUNT: 'evennia.commands.default.cmdset_account.AccountCmdSet',
-    CMDSET_SESSION: 'evennia.commands.default.cmdset_session.SessionCmdSet',
-    CMDSET_UNLOGGEDIN: 'evennia.commands.default.cmdset_unloggedin.UnloggedinCmdSet'}
+    CMDSET_CHARACTER: "evennia.commands.default.cmdset_character.CharacterCmdSet",
+    CMDSET_ACCOUNT: "evennia.commands.default.cmdset_account.AccountCmdSet",
+    CMDSET_SESSION: "evennia.commands.default.cmdset_session.SessionCmdSet",
+    CMDSET_UNLOGGEDIN: "evennia.commands.default.cmdset_unloggedin.UnloggedinCmdSet",
+}
 # Parent class for all default commands. Changing this class will
 # modify all default commands, so do so carefully.
 COMMAND_DEFAULT_CLASS = "evennia.commands.default.muxcommand.MuxCommand"
@@ -505,30 +509,30 @@
 # ("Description", 'Option Class name in evennia.OPTION_CLASS_MODULES', 'Default Value')
 
 OPTIONS_ACCOUNT_DEFAULT = {
-    'border_color': ('Headers, footers, table borders, etc.', 'Color', 'n'),
-    'header_star_color': ('* inside Header lines.', 'Color', 'n'),
-    'header_text_color': ('Text inside Header lines.', 'Color', 'w'),
-    'header_fill': ('Fill for Header lines.', 'Text', '='),
-    'separator_star_color': ('* inside Separator lines.', 'Color', 'n'),
-    'separator_text_color': ('Text inside Separator lines.', 'Color', 'w'),
-    'separator_fill': ('Fill for Separator Lines.', 'Text', '-'),
-    'footer_star_color': ('* inside Footer lines.', 'Color', 'n'),
-    'footer_text_color': ('Text inside Footer Lines.', 'Color', 'n'),
-    'footer_fill': ('Fill for Footer Lines.', 'Text', '='),
-    'column_names_color': ('Table column header text.', 'Color', 'w'),
-    'help_category_color': ('Help category names.', 'Color', 'n'),
-    'help_entry_color': ('Help entry names.', 'Color', 'n'),
-    'timezone': ('Timezone for dates. @tz for a list.', 'Timezone', 'UTC')
+    "border_color": ("Headers, footers, table borders, etc.", "Color", "n"),
+    "header_star_color": ("* inside Header lines.", "Color", "n"),
+    "header_text_color": ("Text inside Header lines.", "Color", "w"),
+    "header_fill": ("Fill for Header lines.", "Text", "="),
+    "separator_star_color": ("* inside Separator lines.", "Color", "n"),
+    "separator_text_color": ("Text inside Separator lines.", "Color", "w"),
+    "separator_fill": ("Fill for Separator Lines.", "Text", "-"),
+    "footer_star_color": ("* inside Footer lines.", "Color", "n"),
+    "footer_text_color": ("Text inside Footer Lines.", "Color", "n"),
+    "footer_fill": ("Fill for Footer Lines.", "Text", "="),
+    "column_names_color": ("Table column header text.", "Color", "w"),
+    "help_category_color": ("Help category names.", "Color", "n"),
+    "help_entry_color": ("Help entry names.", "Color", "n"),
+    "timezone": ("Timezone for dates. @tz for a list.", "Timezone", "UTC"),
 }
 # Modules holding Option classes, responsible for serializing the option and
 # calling validator functions on it. Same-named functions in modules added
 # later in this list will override those added earlier.
-OPTION_CLASS_MODULES = ['evennia.utils.optionclasses', ]
+OPTION_CLASS_MODULES = ["evennia.utils.optionclasses"]
 # Module holding validator functions. These are used as a resource for
 # validating options, but can also be used as input validators in general.
 # Same-named functions in modules added later in this list will override those
 # added earlier.
-VALIDATOR_FUNC_MODULES = ['evennia.utils.validatorfuncs', ]
+VALIDATOR_FUNC_MODULES = ["evennia.utils.validatorfuncs"]
 
 ######################################################################
 # Batch processors
@@ -536,7 +540,7 @@
 
 # Python path to a directory to be searched for batch scripts
 # for the batch processors (.ev and/or .py files).
-BASE_BATCHPROCESS_PATHS = ['world', 'evennia.contrib', 'evennia.contrib.tutorial_examples']
+BASE_BATCHPROCESS_PATHS = ["world", "evennia.contrib", "evennia.contrib.tutorial_examples"]
 
 ######################################################################
 # Game Time setup
@@ -572,12 +576,10 @@
 # Only functions defined globally (and not starting with '_') in
 # these modules will be considered valid inlinefuncs. The list
 # is loaded from left-to-right, same-named functions will overload
-INLINEFUNC_MODULES = ["evennia.utils.inlinefuncs",
-                      "server.conf.inlinefuncs"]
+INLINEFUNC_MODULES = ["evennia.utils.inlinefuncs", "server.conf.inlinefuncs"]
 # Module holding handlers for OLCFuncs. These allow for embedding
 # functional code in prototypes
-PROTOTYPEFUNC_MODULES = ["evennia.utils.prototypefuncs",
-                         "server.conf.prototypefuncs"]
+PROTOTYPEFUNC_MODULES = ["evennia.utils.prototypefuncs", "server.conf.prototypefuncs"]
 
 ######################################################################
 # Global Scripts
@@ -619,12 +621,14 @@
 # The access hierarchy, in climbing order. A higher permission in the
 # hierarchy includes access of all levels below it. Used by the perm()/pperm()
 # lock functions, which accepts both plural and singular (Admin & Admins)
-PERMISSION_HIERARCHY = ["Guest",  # note-only used if GUEST_ENABLED=True
-                        "Player",
-                        "Helper",
-                        "Builder",
-                        "Admin",
-                        "Developer"]
+PERMISSION_HIERARCHY = [
+    "Guest",  # note-only used if GUEST_ENABLED=True
+    "Player",
+    "Helper",
+    "Builder",
+    "Admin",
+    "Developer",
+]
 # The default permission given to all new accounts
 PERMISSION_ACCOUNT_DEFAULT = "Player"
 # Default sizes for client window (in number of characters), if client
@@ -662,30 +666,35 @@
 # In-game Channels created from server start
 ######################################################################
 
-# This is a list of global channels created by the
-# initialization script the first time Evennia starts.
-# The superuser (user #1) will be automatically subscribed
-# to all channels in this list. Each channel is described by
-# a dictionary keyed with the same keys valid as arguments
-# to the evennia.create.create_channel() function.
-# Note: Evennia will treat the first channel in this list as
-# the general "public" channel and the second as the
-# general "mud info" channel. Other channels beyond that
-# are up to the admin to design and call appropriately.
+# The mudinfo channel must always exist; it is used by Evennia itself to
+# relay status messages, connection info etc to staff. The superuser will be
+# automatically subscribed to this channel and it will be recreated on a
+# reload if deleted. This is a dict specifying the kwargs needed to create
+# the channel .
+CHANNEL_MUDINFO = {
+    "key": "MudInfo",
+    "aliases": "",
+    "desc": "Connection log",
+    "locks": "control:perm(Developer);listen:perm(Admin);send:false()",
+}
+# These are additional channels to offer. Usually, at least 'public'
+# should exist. The superuser will automatically be subscribed to all channels
+# in this list. New entries will be created on the next reload. But
+# removing or updating a same-key channel from this list will NOT automatically
+# change/remove it in the game, that needs to be done manually.
 DEFAULT_CHANNELS = [
     # public channel
-    {"key": "Public",
-     "aliases": ('ooc', 'pub'),
-     "desc": "Public discussion",
-     "locks": "control:perm(Admin);listen:all();send:all()"},
-    # connection/mud info
-    {"key": "MudInfo",
-     "aliases": "",
-     "desc": "Connection log",
-     "locks": "control:perm(Developer);listen:perm(Admin);send:false()"}
+    {
+        "key": "Public",
+        "aliases": ("pub"),
+        "desc": "Public discussion",
+        "locks": "control:perm(Admin);listen:all();send:all()",
+    }
 ]
-# Extra optional channel for receiving connection messages ("<account> has (dis)connected").
-# While the MudInfo channel will also receieve this, this channel is meant for non-staffers.
+# Optional channel info (same form as CHANNEL_MUDINFO) for the channel to
+# receive connection messages ("<account> has (dis)connected").  While the
+# MudInfo channel will also receieve this info, this channel is meant for
+# non-staffers.
 CHANNEL_CONNECTINFO = None
 
 ######################################################################
@@ -702,15 +711,15 @@
 GAME_INDEX_ENABLED = False
 # This dict
 GAME_INDEX_LISTING = {
-    'game_name': SERVERNAME,
-    'game_status': 'pre-alpha',   # pre-alpha, alpha, beta or launched
-    'short_description': GAME_SLOGAN,
-    'long_description': '',
-    'listing_contact': '',        # email
-    'telnet_hostname': '',        # mygame.com
-    'telnet_port': '',            # 1234
-    'game_website': '',           # http://mygame.com
-    'web_client_url': ''          # http://mygame.com/webclient
+    "game_name": SERVERNAME,
+    "game_status": "pre-alpha",  # pre-alpha, alpha, beta or launched
+    "short_description": GAME_SLOGAN,
+    "long_description": "",
+    "listing_contact": "",  # email
+    "telnet_hostname": "",  # mygame.com
+    "telnet_port": "",  # 1234
+    "game_website": "",  # http://mygame.com
+    "web_client_url": "",  # http://mygame.com/webclient
 }
 # Evennia can connect to external IRC channels and
 # echo what is said on the channel to IRC and vice
@@ -763,8 +772,8 @@
 # Absolute path to the directory that holds file uploads from web apps.
 # Example: "/home/media/media.lawrence.com"
 MEDIA_ROOT = os.path.join(GAME_DIR, "web", "media")
-# It's safe to dis-regard this, as it's a Django feature we only half use as a
-# dependency, not actually what it's primarily meant for.
+# If using Sites/Pages from the web admin, this value must be set to the
+# database-id of the Site (domain) we want to use with this game's Pages.
 SITE_ID = 1
 # The age for sessions.
 # Default: 1209600 (2 weeks, in seconds)
@@ -774,7 +783,7 @@
 SESSION_COOKIE_DOMAIN = None
 # The name of the cookie to use for sessions.
 # Default: 'sessionid'
-SESSION_COOKIE_NAME = 'sessionid'
+SESSION_COOKIE_NAME = "sessionid"
 # Should the session expire when the browser closes?
 # Default: False
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
@@ -788,84 +797,88 @@
 SERVE_MEDIA = False
 # The master urlconf file that contains all of the sub-branches to the
 # applications. Change this to add your own URLs to the website.
-ROOT_URLCONF = 'web.urls'
+ROOT_URLCONF = "web.urls"
 # Where users are redirected after logging in via contrib.auth.login.
-LOGIN_REDIRECT_URL = '/'
+LOGIN_REDIRECT_URL = "/"
 # Where to redirect users when using the @login_required decorator.
-LOGIN_URL = reverse_lazy('login')
+LOGIN_URL = reverse_lazy("login")
 # Where to redirect users who wish to logout.
-LOGOUT_URL = reverse_lazy('logout')
+LOGOUT_URL = reverse_lazy("logout")
 # URL that handles the media served from MEDIA_ROOT.
 # Example: "http://media.lawrence.com"
-MEDIA_URL = '/media/'
+MEDIA_URL = "/media/"
 # URL prefix for admin media -- CSS, JavaScript and images. Make sure
 # to use a trailing slash. Django1.4+ will look for admin files under
 # STATIC_URL/admin.
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
 
 STATIC_ROOT = os.path.join(GAME_DIR, "web", "static")
 
 # Location of static data to overload the defaults from
 # evennia/web/webclient and evennia/web/website's static/ dirs.
-STATICFILES_DIRS = (
-    os.path.join(GAME_DIR, "web", "static_overrides"),)
+STATICFILES_DIRS = [os.path.join(GAME_DIR, "web", "static_overrides")]
 # Patterns of files in the static directories. Used here to make sure that
 # its readme file is preserved but unused.
-STATICFILES_IGNORE_PATTERNS = ('README.md',)
+STATICFILES_IGNORE_PATTERNS = ["README.md"]
 # The name of the currently selected web template. This corresponds to the
 # directory names shown in the templates directory.
-WEBSITE_TEMPLATE = 'website'
-WEBCLIENT_TEMPLATE = 'webclient'
+WEBSITE_TEMPLATE = "website"
+WEBCLIENT_TEMPLATE = "webclient"
 # The default options used by the webclient
 WEBCLIENT_OPTIONS = {
     "gagprompt": True,  # Gags prompt from the output window and keep them
     # together with the input bar
-    "helppopup": True,  # Shows help files in a new popup window
+    "helppopup": False,  # Shows help files in a new popup window
     "notification_popup": False,  # Shows notifications of new messages as
     # popup windows
-    "notification_sound": False   # Plays a sound for notifications of new
+    "notification_sound": False  # Plays a sound for notifications of new
     # messages
 }
 
 # We setup the location of the website template as well as the admin site.
-TEMPLATES = [{
-    'BACKEND': 'django.template.backends.django.DjangoTemplates',
-    'DIRS': [
-        os.path.join(GAME_DIR, "web", "template_overrides", WEBSITE_TEMPLATE),
-        os.path.join(GAME_DIR, "web", "template_overrides", WEBCLIENT_TEMPLATE),
-        os.path.join(GAME_DIR, "web", "template_overrides"),
-        os.path.join(EVENNIA_DIR, "web", "website", "templates", WEBSITE_TEMPLATE),
-        os.path.join(EVENNIA_DIR, "web", "website", "templates"),
-        os.path.join(EVENNIA_DIR, "web", "webclient", "templates", WEBCLIENT_TEMPLATE),
-        os.path.join(EVENNIA_DIR, "web", "webclient", "templates")],
-    'APP_DIRS': True,
-    'OPTIONS': {
-        "context_processors": [
-            'django.template.context_processors.i18n',
-            'django.template.context_processors.request',
-            'django.contrib.auth.context_processors.auth',
-            'django.template.context_processors.media',
-            'django.template.context_processors.debug',
-            'django.contrib.messages.context_processors.messages',
-            'sekizai.context_processors.sekizai',
-            'evennia.web.utils.general_context.general_context'],
-        # While true, show "pretty" error messages for template syntax errors.
-        "debug": DEBUG
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [
+            os.path.join(GAME_DIR, "web", "template_overrides", WEBSITE_TEMPLATE),
+            os.path.join(GAME_DIR, "web", "template_overrides", WEBCLIENT_TEMPLATE),
+            os.path.join(GAME_DIR, "web", "template_overrides"),
+            os.path.join(EVENNIA_DIR, "web", "website", "templates", WEBSITE_TEMPLATE),
+            os.path.join(EVENNIA_DIR, "web", "website", "templates"),
+            os.path.join(EVENNIA_DIR, "web", "webclient", "templates", WEBCLIENT_TEMPLATE),
+            os.path.join(EVENNIA_DIR, "web", "webclient", "templates"),
+        ],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.media",
+                "django.template.context_processors.debug",
+                "django.contrib.messages.context_processors.messages",
+                "sekizai.context_processors.sekizai",
+                "evennia.web.utils.general_context.general_context",
+            ],
+            # While true, show "pretty" error messages for template syntax errors.
+            "debug": DEBUG,
+        },
     }
-}]
+]
 
 # MiddleWare are semi-transparent extensions to Django's functionality.
 # see http://www.djangoproject.com/documentation/middleware/ for a more detailed
 # explanation.
-MIDDLEWARE = (
-    'django.middleware.common.CommonMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',  # 1.4?
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.admindocs.middleware.XViewMiddleware',
-    'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
-    'evennia.web.utils.middleware.SharedLoginMiddleware',)
+MIDDLEWARE = [
+    "django.middleware.common.CommonMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",  # 1.4?
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.admindocs.middleware.XViewMiddleware",
+    "django.contrib.flatpages.middleware.FlatpageFallbackMiddleware",
+    "evennia.web.utils.middleware.SharedLoginMiddleware",
+]
 
 ######################################################################
 # Evennia components
@@ -873,27 +886,28 @@
 
 # Global and Evennia-specific apps. This ties everything together so we can
 # refer to app models and perform DB syncs.
-INSTALLED_APPS = (
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.admin',
-    'django.contrib.admindocs',
-    'django.contrib.flatpages',
-    'django.contrib.sites',
-    'django.contrib.staticfiles',
-    'django.contrib.messages',
-    'sekizai',
-    'evennia.utils.idmapper',
-    'evennia.server',
-    'evennia.typeclasses',
-    'evennia.accounts',
-    'evennia.objects',
-    'evennia.comms',
-    'evennia.help',
-    'evennia.scripts',
-    'evennia.web.website',
-    'evennia.web.webclient')
+INSTALLED_APPS = [
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.admin",
+    "django.contrib.admindocs",
+    "django.contrib.flatpages",
+    "django.contrib.sites",
+    "django.contrib.staticfiles",
+    "django.contrib.messages",
+    "sekizai",
+    "evennia.utils.idmapper",
+    "evennia.server",
+    "evennia.typeclasses",
+    "evennia.accounts",
+    "evennia.objects",
+    "evennia.comms",
+    "evennia.help",
+    "evennia.scripts",
+    "evennia.web.website",
+    "evennia.web.webclient",
+]
 # The user profile extends the User object with more functionality;
 # This should usually not be changed.
 AUTH_USER_MODEL = "accounts.AccountDB"
@@ -901,30 +915,30 @@
 # Password validation plugins
 # https://docs.djangoproject.com/en/1.11/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [
-    {'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator'},
-    {'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-        'OPTIONS': {'min_length': 8}},
-    {'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator'},
-    {'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator'},
-    {'NAME': 'evennia.server.validators.EvenniaPasswordValidator'}]
+    {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"},
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+        "OPTIONS": {"min_length": 8},
+    },
+    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
+    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
+    {"NAME": "evennia.server.validators.EvenniaPasswordValidator"},
+]
 
 # Username validation plugins
 AUTH_USERNAME_VALIDATORS = [
-    {'NAME': 'django.contrib.auth.validators.ASCIIUsernameValidator'},
-    {'NAME': 'django.core.validators.MinLengthValidator',
-        'OPTIONS': {'limit_value': 3}},
-    {'NAME': 'django.core.validators.MaxLengthValidator',
-        'OPTIONS': {'limit_value': 30}},
-    {'NAME': 'evennia.server.validators.EvenniaUsernameAvailabilityValidator'}]
+    {"NAME": "django.contrib.auth.validators.ASCIIUsernameValidator"},
+    {"NAME": "django.core.validators.MinLengthValidator", "OPTIONS": {"limit_value": 3}},
+    {"NAME": "django.core.validators.MaxLengthValidator", "OPTIONS": {"limit_value": 30}},
+    {"NAME": "evennia.server.validators.EvenniaUsernameAvailabilityValidator"},
+]
 
 # Use a custom test runner that just tests Evennia-specific apps.
-TEST_RUNNER = 'evennia.server.tests.testrunner.EvenniaTestSuiteRunner'
+TEST_RUNNER = "evennia.server.tests.testrunner.EvenniaTestSuiteRunner"
 
 # Messages and Bootstrap don't classify events the same way; this setting maps
 # messages.error() to Bootstrap 'danger' classes.
-MESSAGE_TAGS = {
-    messages.ERROR: 'danger',
-}
+MESSAGE_TAGS = {messages.ERROR: "danger"}
 
 ######################################################################
 # Django extensions
@@ -933,8 +947,9 @@
 # Django extesions are useful third-party tools that are not
 # always included in the default django distro.
 try:
-    import django_extensions   # noqa
-    INSTALLED_APPS = INSTALLED_APPS + ('django_extensions',)
+    import django_extensions  # noqa
+
+    INSTALLED_APPS = INSTALLED_APPS.append("django_extensions")
 except ImportError:
     # Django extensions are not installed in all distros.
     pass
@@ -948,4 +963,4 @@
 # It is a fallback for the SECRET_KEY setting in settings.py, which
 # is randomly seeded when settings.py is first created. If copying
 # from here, make sure to change it!
-SECRET_KEY = 'changeme!(*#&*($&*(#*(&SDFKJJKLS*(@#KJAS'
+SECRET_KEY = "changeme!(*#&*($&*(#*(&SDFKJJKLS*(@#KJAS"
diff --git a/evennia/typeclasses/admin.py b/evennia/typeclasses/admin.py
index ca67dcab386..ed23c0a3052 100644
--- a/evennia/typeclasses/admin.py
+++ b/evennia/typeclasses/admin.py
@@ -11,10 +11,11 @@ class TagAdmin(admin.ModelAdmin):
     """
     A django Admin wrapper for Tags.
     """
-    search_fields = ('db_key', 'db_category', 'db_tagtype')
-    list_display = ('db_key', 'db_category', 'db_tagtype', 'db_data')
-    fields = ('db_key', 'db_category', 'db_tagtype', 'db_data')
-    list_filter = ('db_tagtype',)
+
+    search_fields = ("db_key", "db_category", "db_tagtype")
+    list_display = ("db_key", "db_category", "db_tagtype", "db_data")
+    fields = ("db_key", "db_category", "db_tagtype", "db_data")
+    list_filter = ("db_tagtype",)
 
 
 class TagForm(forms.ModelForm):
@@ -26,18 +27,25 @@ class TagForm(forms.ModelForm):
     Object's handler, which will handle the creation, change, or deletion of a tag for us, as well
     as updating the handler's cache so that all changes are instantly updated in-game.
     """
-    tag_key = forms.CharField(label='Tag Name',
-                              required=True,
-                              help_text="This is the main key identifier")
-    tag_category = forms.CharField(label="Category",
-                                   help_text="Used for grouping tags. Unset (default) gives a category of None",
-                                   required=False)
-    tag_type = forms.CharField(label="Type",
-                               help_text="Internal use. Either unset, \"alias\" or \"permission\"",
-                               required=False)
-    tag_data = forms.CharField(label="Data",
-                               help_text="Usually unused. Intended for eventual info about the tag itself",
-                               required=False)
+
+    tag_key = forms.CharField(
+        label="Tag Name", required=True, help_text="This is the main key identifier"
+    )
+    tag_category = forms.CharField(
+        label="Category",
+        help_text="Used for grouping tags. Unset (default) gives a category of None",
+        required=False,
+    )
+    tag_type = forms.CharField(
+        label="Type",
+        help_text='Internal use. Either unset, "alias" or "permission"',
+        required=False,
+    )
+    tag_data = forms.CharField(
+        label="Data",
+        help_text="Usually unused. Intended for eventual info about the tag itself",
+        required=False,
+    )
 
     class Meta:
         fields = ("tag_key", "tag_category", "tag_data", "tag_type")
@@ -54,15 +62,15 @@ def __init__(self, *args, **kwargs):
         tagcategory = None
         tagtype = None
         tagdata = None
-        if hasattr(self.instance, 'tag'):
+        if hasattr(self.instance, "tag"):
             tagkey = self.instance.tag.db_key
             tagcategory = self.instance.tag.db_category
             tagtype = self.instance.tag.db_tagtype
             tagdata = self.instance.tag.db_data
-            self.fields['tag_key'].initial = tagkey
-            self.fields['tag_category'].initial = tagcategory
-            self.fields['tag_type'].initial = tagtype
-            self.fields['tag_data'].initial = tagdata
+            self.fields["tag_key"].initial = tagkey
+            self.fields["tag_category"].initial = tagcategory
+            self.fields["tag_type"].initial = tagtype
+            self.fields["tag_data"].initial = tagdata
         self.instance.tag_key = tagkey
         self.instance.tag_category = tagcategory
         self.instance.tag_type = tagtype
@@ -78,10 +86,10 @@ def save(self, commit=True):
         # we are spoofing a tag for the Handler that will be called
         # instance = super().save(commit=False)
         instance = self.instance
-        instance.tag_key = self.cleaned_data['tag_key']
-        instance.tag_category = self.cleaned_data['tag_category'] or None
-        instance.tag_type = self.cleaned_data['tag_type'] or None
-        instance.tag_data = self.cleaned_data['tag_data'] or None
+        instance.tag_key = self.cleaned_data["tag_key"]
+        instance.tag_category = self.cleaned_data["tag_category"] or None
+        instance.tag_type = self.cleaned_data["tag_type"] or None
+        instance.tag_data = self.cleaned_data["tag_data"] or None
         return instance
 
 
@@ -110,6 +118,7 @@ def get_handler(finished_object):
             else:
                 handler_name = "tags"
             return getattr(related, handler_name)
+
         instances = super().save(commit=False)
         # self.deleted_objects is a list created when super of save is called, we'll remove those
         for obj in self.deleted_objects:
@@ -128,6 +137,7 @@ class TagInline(admin.TabularInline):
     of the field on that through model which points to the model being used: 'objectdb',
     'msg', 'accountdb', etc.
     """
+
     # Set this to the through model of your desired M2M when subclassing.
     model = None
     form = TagForm
@@ -148,6 +158,7 @@ def get_formset(self, request, obj=None, **kwargs):
 
         class ProxyFormset(formset):
             pass
+
         ProxyFormset.related_field = self.related_field
         return ProxyFormset
 
@@ -161,20 +172,26 @@ class AttributeForm(forms.ModelForm):
     the creation, change, or deletion of an Attribute for us, as well as updating the handler's cache so that all
     changes are instantly updated in-game.
     """
-    attr_key = forms.CharField(label='Attribute Name', required=False, initial="Enter Attribute Name Here")
-    attr_category = forms.CharField(label="Category",
-                                    help_text="type of attribute, for sorting",
-                                    required=False,
-                                    max_length=128)
+
+    attr_key = forms.CharField(
+        label="Attribute Name", required=False, initial="Enter Attribute Name Here"
+    )
+    attr_category = forms.CharField(
+        label="Category", help_text="type of attribute, for sorting", required=False, max_length=128
+    )
     attr_value = PickledFormField(label="Value", help_text="Value to pickle/save", required=False)
-    attr_type = forms.CharField(label="Type",
-                                help_text="Internal use. Either unset (normal Attribute) or \"nick\"",
-                                required=False,
-                                max_length=16)
-    attr_lockstring = forms.CharField(label="Locks",
-                                      required=False,
-                                      help_text="Lock string on the form locktype:lockdef;lockfunc:lockdef;...",
-                                      widget=forms.Textarea(attrs={"rows": 1, "cols": 8}))
+    attr_type = forms.CharField(
+        label="Type",
+        help_text='Internal use. Either unset (normal Attribute) or "nick"',
+        required=False,
+        max_length=16,
+    )
+    attr_lockstring = forms.CharField(
+        label="Locks",
+        required=False,
+        help_text="Lock string on the form locktype:lockdef;lockfunc:lockdef;...",
+        widget=forms.Textarea(attrs={"rows": 1, "cols": 8}),
+    )
 
     class Meta:
         fields = ("attr_key", "attr_value", "attr_category", "attr_lockstring", "attr_type")
@@ -193,24 +210,24 @@ def __init__(self, *args, **kwargs):
         attr_value = None
         attr_type = None
         attr_lockstring = None
-        if hasattr(self.instance, 'attribute'):
+        if hasattr(self.instance, "attribute"):
             attr_key = self.instance.attribute.db_key
             attr_category = self.instance.attribute.db_category
             attr_value = self.instance.attribute.db_value
             attr_type = self.instance.attribute.db_attrtype
             attr_lockstring = self.instance.attribute.db_lock_storage
-            self.fields['attr_key'].initial = attr_key
-            self.fields['attr_category'].initial = attr_category
-            self.fields['attr_type'].initial = attr_type
-            self.fields['attr_value'].initial = attr_value
-            self.fields['attr_lockstring'].initial = attr_lockstring
+            self.fields["attr_key"].initial = attr_key
+            self.fields["attr_category"].initial = attr_category
+            self.fields["attr_type"].initial = attr_type
+            self.fields["attr_value"].initial = attr_value
+            self.fields["attr_lockstring"].initial = attr_lockstring
         self.instance.attr_key = attr_key
         self.instance.attr_category = attr_category
         self.instance.attr_value = attr_value
 
         # prevent from being transformed to str
         if isinstance(attr_value, (set, _SaverSet)):
-            self.fields['attr_value'].disabled = True
+            self.fields["attr_value"].disabled = True
 
         self.instance.deserialized_value = from_pickle(attr_value)
         self.instance.attr_type = attr_type
@@ -225,13 +242,13 @@ def save(self, commit=True):
         """
         # we are spoofing an Attribute for the Handler that will be called
         instance = self.instance
-        instance.attr_key = self.cleaned_data['attr_key'] or "no_name_entered_for_attribute"
-        instance.attr_category = self.cleaned_data['attr_category'] or None
-        instance.attr_value = self.cleaned_data['attr_value']
+        instance.attr_key = self.cleaned_data["attr_key"] or "no_name_entered_for_attribute"
+        instance.attr_category = self.cleaned_data["attr_category"] or None
+        instance.attr_value = self.cleaned_data["attr_value"]
         # convert the serialized string value into an object, if necessary, for AttributeHandler
         instance.attr_value = from_pickle(instance.attr_value)
-        instance.attr_type = self.cleaned_data['attr_type'] or None
-        instance.attr_lockstring = self.cleaned_data['attr_lockstring']
+        instance.attr_type = self.cleaned_data["attr_type"] or None
+        instance.attr_lockstring = self.cleaned_data["attr_lockstring"]
         return instance
 
     def clean_attr_value(self):
@@ -240,7 +257,7 @@ def clean_attr_value(self):
         failing on them. Otherwise they will be turned into str.
 
         """
-        data = self.cleaned_data['attr_value']
+        data = self.cleaned_data["attr_value"]
         initial = self.instance.attr_value
         if isinstance(initial, (set, _SaverSet, datetime)):
             return initial
@@ -264,6 +281,7 @@ def get_handler(finished_object):
             else:
                 handler_name = "attributes"
             return getattr(related, handler_name)
+
         instances = super().save(commit=False)
         for obj in self.deleted_objects:
             # self.deleted_objects is a list created when super of save is called, we'll remove those
@@ -276,9 +294,13 @@ def get_handler(finished_object):
             value = instance.attr_value
 
             try:
-                handler.add(instance.attr_key, value,
-                            category=instance.attr_category, strattr=False,
-                            lockstring=instance.attr_lockstring)
+                handler.add(
+                    instance.attr_key,
+                    value,
+                    category=instance.attr_category,
+                    strattr=False,
+                    lockstring=instance.attr_lockstring,
+                )
             except (TypeError, ValueError):
                 # catch errors in nick templates and continue
                 traceback.print_exc()
@@ -293,6 +315,7 @@ class AttributeInline(admin.TabularInline):
     of the field on that through model which points to the model being used: 'objectdb',
     'msg', 'accountdb', etc.
     """
+
     # Set this to the through model of your desired M2M when subclassing.
     model = None
     form = AttributeForm
diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py
index 278eff6a9e2..ef201eb0e2a 100644
--- a/evennia/typeclasses/attributes.py
+++ b/evennia/typeclasses/attributes.py
@@ -8,7 +8,6 @@
 
 
 """
-from builtins import object
 import re
 import fnmatch
 import weakref
@@ -61,35 +60,51 @@ class Attribute(SharedMemoryModel):
     #
     # These database fields are all set using their corresponding properties,
     # named same as the field, but withtout the db_* prefix.
-    db_key = models.CharField('key', max_length=255, db_index=True)
+    db_key = models.CharField("key", max_length=255, db_index=True)
     db_value = PickledObjectField(
-        'value', null=True,
+        "value",
+        null=True,
         help_text="The data returned when the attribute is accessed. Must be "
-                  "written as a Python literal if editing through the admin "
-                  "interface. Attribute values which are not Python literals "
-                  "cannot be edited through the admin interface.")
+        "written as a Python literal if editing through the admin "
+        "interface. Attribute values which are not Python literals "
+        "cannot be edited through the admin interface.",
+    )
     db_strvalue = models.TextField(
-        'strvalue', null=True, blank=True,
-        help_text="String-specific storage for quick look-up")
+        "strvalue", null=True, blank=True, help_text="String-specific storage for quick look-up"
+    )
     db_category = models.CharField(
-        'category', max_length=128, db_index=True, blank=True, null=True,
-        help_text="Optional categorization of attribute.")
+        "category",
+        max_length=128,
+        db_index=True,
+        blank=True,
+        null=True,
+        help_text="Optional categorization of attribute.",
+    )
     # Lock storage
     db_lock_storage = models.TextField(
-        'locks', blank=True,
-        help_text="Lockstrings for this object are stored here.")
+        "locks", blank=True, help_text="Lockstrings for this object are stored here."
+    )
     db_model = models.CharField(
-        'model', max_length=32, db_index=True, blank=True, null=True,
+        "model",
+        max_length=32,
+        db_index=True,
+        blank=True,
+        null=True,
         help_text="Which model of object this attribute is attached to (A "
-                  "natural key like 'objects.objectdb'). You should not change "
-                  "this value unless you know what you are doing.")
+        "natural key like 'objects.objectdb'). You should not change "
+        "this value unless you know what you are doing.",
+    )
     # subclass of Attribute (None or nick)
     db_attrtype = models.CharField(
-        'attrtype', max_length=16, db_index=True, blank=True, null=True,
-        help_text="Subclass of Attribute (None or nick)")
+        "attrtype",
+        max_length=16,
+        db_index=True,
+        blank=True,
+        null=True,
+        help_text="Subclass of Attribute (None or nick)",
+    )
     # time stamp
-    db_date_created = models.DateTimeField(
-        'date_created', editable=False, auto_now_add=True)
+    db_date_created = models.DateTimeField("date_created", editable=False, auto_now_add=True)
 
     # Database manager
     # objects = managers.AttributeManager()
@@ -156,6 +171,7 @@ def __value_set(self, new_value):
     def __value_del(self):
         """Deleter. Allows for del attr.value. This removes the entire attribute."""
         self.delete()
+
     value = property(__value_get, __value_set, __value_del)
 
     #
@@ -170,7 +186,7 @@ def __str__(self):
     def __repr__(self):
         return "%s(%s)" % (self.db_key, self.id)
 
-    def access(self, accessing_obj, access_type='read', default=False, **kwargs):
+    def access(self, accessing_obj, access_type="read", default=False, **kwargs):
         """
         Determines if another object has permission to access.
 
@@ -196,10 +212,12 @@ def access(self, accessing_obj, access_type='read', default=False, **kwargs):
 # Handlers making use of the Attribute model
 #
 
+
 class AttributeHandler(object):
     """
     Handler for adding Attributes to the object.
     """
+
     _m2m_fieldname = "db_attributes"
     _attrcreate = "attrcreate"
     _attredit = "attredit"
@@ -219,17 +237,26 @@ def __init__(self, obj):
 
     def _fullcache(self):
         """Cache all attributes of this object"""
-        query = {"%s__id" % self._model: self._objid,
-                 "attribute__db_model__iexact": self._model,
-                 "attribute__db_attrtype": self._attrtype}
+        query = {
+            "%s__id" % self._model: self._objid,
+            "attribute__db_model__iexact": self._model,
+            "attribute__db_attrtype": self._attrtype,
+        }
         attrs = [
-            conn.attribute for conn in getattr(
-                self.obj,
-                self._m2m_fieldname).through.objects.filter(
-                **query)]
-        self._cache = dict(("%s-%s" % (to_str(attr.db_key).lower(),
-                                       attr.db_category.lower() if attr.db_category else None),
-                            attr) for attr in attrs)
+            conn.attribute
+            for conn in getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)
+        ]
+        self._cache = dict(
+            (
+                "%s-%s"
+                % (
+                    to_str(attr.db_key).lower(),
+                    attr.db_category.lower() if attr.db_category else None,
+                ),
+                attr,
+            )
+            for attr in attrs
+        )
         self._cache_complete = True
 
     def _getcache(self, key=None, category=None):
@@ -277,11 +304,13 @@ def _getcache(self, key=None, category=None):
                 else:
                     return []  # no such attribute: return an empty list
             else:
-                query = {"%s__id" % self._model: self._objid,
-                         "attribute__db_model__iexact": self._model,
-                         "attribute__db_attrtype": self._attrtype,
-                         "attribute__db_key__iexact": key.lower(),
-                         "attribute__db_category__iexact": category.lower() if category else None}
+                query = {
+                    "%s__id" % self._model: self._objid,
+                    "attribute__db_model__iexact": self._model,
+                    "attribute__db_attrtype": self._attrtype,
+                    "attribute__db_key__iexact": key.lower(),
+                    "attribute__db_category__iexact": category.lower() if category else None,
+                }
                 if not self.obj.pk:
                     return []
                 conn = getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)
@@ -304,12 +333,18 @@ def _getcache(self, key=None, category=None):
                 return [attr for key, attr in self._cache.items() if key.endswith(catkey) and attr]
             else:
                 # we have to query to make this category up-date in the cache
-                query = {"%s__id" % self._model: self._objid,
-                         "attribute__db_model__iexact": self._model,
-                         "attribute__db_attrtype": self._attrtype,
-                         "attribute__db_category__iexact": category.lower() if category else None}
-                attrs = [conn.attribute for conn
-                         in getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)]
+                query = {
+                    "%s__id" % self._model: self._objid,
+                    "attribute__db_model__iexact": self._model,
+                    "attribute__db_attrtype": self._attrtype,
+                    "attribute__db_category__iexact": category.lower() if category else None,
+                }
+                attrs = [
+                    conn.attribute
+                    for conn in getattr(self.obj, self._m2m_fieldname).through.objects.filter(
+                        **query
+                    )
+                ]
                 for attr in attrs:
                     if attr.pk:
                         cachekey = "%s-%s" % (attr.db_key, category)
@@ -351,8 +386,11 @@ def _delcache(self, key, category):
             cachekey = "%s-%s" % (key, category)
             self._cache.pop(cachekey, None)
         else:
-            self._cache = {key: attrobj for key, attrobj in
-                           list(self._cache.items()) if not key.endswith(catkey)}
+            self._cache = {
+                key: attrobj
+                for key, attrobj in list(self._cache.items())
+                if not key.endswith(catkey)
+            }
         # mark that the category cache is no longer up-to-date
         self._catcache.pop(catkey, None)
         self._cache_complete = False
@@ -389,9 +427,18 @@ def has(self, key=None, category=None):
             ret.extend(bool(attr) for attr in self._getcache(keystr, category))
         return ret[0] if len(ret) == 1 else ret
 
-    def get(self, key=None, default=None, category=None, return_obj=False,
-            strattr=False, raise_exception=False, accessing_obj=None,
-            default_access=True, return_list=False):
+    def get(
+        self,
+        key=None,
+        default=None,
+        category=None,
+        return_obj=False,
+        strattr=False,
+        raise_exception=False,
+        accessing_obj=None,
+        default_access=True,
+        return_list=False,
+    ):
         """
         Get the Attribute.
 
@@ -420,10 +467,11 @@ def get(self, key=None, default=None, category=None, return_obj=False,
             return_list (bool, optional):
 
         Returns:
-            result (any or list): One or more matches for keys and/or categories. Each match will be
-                the value of the found Attribute(s) unless `return_obj` is True, at which point it
-                will be the attribute object itself or None. If `return_list` is True, this will
-                always be a list, regardless of the number of elements.
+            result (any or list): One or more matches for keys and/or
+                categories. Each match will be the value of the found Attribute(s)
+                unless `return_obj` is True, at which point it will be the
+                attribute object itself or None. If `return_list` is True, this
+                will always be a list, regardless of the number of elements.
 
         Raises:
             AttributeError: If `raise_exception` is set and no matching Attribute
@@ -431,15 +479,6 @@ def get(self, key=None, default=None, category=None, return_obj=False,
 
         """
 
-        class RetDefault(object):
-            """Holds default values"""
-
-            def __init__(self):
-                self.key = None
-                self.value = default
-                self.category = None
-                self.strvalue = str(default) if default is not None else None
-
         ret = []
         for keystr in make_iter(key):
             # it's okay to send a None key
@@ -450,13 +489,14 @@ def __init__(self):
                 raise AttributeError
             elif return_obj:
                 ret.append(None)
-            else:
-                ret.append(RetDefault())
 
         if accessing_obj:
             # check 'attrread' locks
-            ret = [attr for attr in ret if attr.access(accessing_obj,
-                                                       self._attrread, default=default_access)]
+            ret = [
+                attr
+                for attr in ret
+                if attr.access(accessing_obj, self._attrread, default=default_access)
+            ]
         if strattr:
             ret = ret if return_obj else [attr.strvalue for attr in ret if attr]
         else:
@@ -464,12 +504,18 @@ def __init__(self):
 
         if return_list:
             return ret if ret else [default] if default is not None else []
-        elif not ret:
-            return ret if len(key) > 1 else default
-        return ret[0] if len(ret) == 1 else ret
-
-    def add(self, key, value, category=None, lockstring="",
-            strattr=False, accessing_obj=None, default_access=True):
+        return ret[0] if ret and len(ret) == 1 else ret or default
+
+    def add(
+        self,
+        key,
+        value,
+        category=None,
+        lockstring="",
+        strattr=False,
+        accessing_obj=None,
+        default_access=True,
+    ):
         """
         Add attribute to object, with optional `lockstring`.
 
@@ -491,8 +537,9 @@ def add(self, key, value, category=None, lockstring="",
                 `attrcreate` is defined on the Attribute in question.
 
         """
-        if accessing_obj and not self.obj.access(accessing_obj, self._attrcreate,
-                                                 default=default_access):
+        if accessing_obj and not self.obj.access(
+            accessing_obj, self._attrcreate, default=default_access
+        ):
             # check create access
             return
 
@@ -515,12 +562,14 @@ def add(self, key, value, category=None, lockstring="",
                 attr_obj.value = value
         else:
             # create a new Attribute (no OOB handlers can be notified)
-            kwargs = {"db_key": keystr,
-                      "db_category": category,
-                      "db_model": self._model,
-                      "db_attrtype": self._attrtype,
-                      "db_value": None if strattr else to_pickle(value),
-                      "db_strvalue": value if strattr else None}
+            kwargs = {
+                "db_key": keystr,
+                "db_category": category,
+                "db_model": self._model,
+                "db_attrtype": self._attrtype,
+                "db_value": None if strattr else to_pickle(value),
+                "db_strvalue": value if strattr else None,
+            }
             new_attr = Attribute(**kwargs)
             new_attr.save()
             getattr(self.obj, self._m2m_fieldname).add(new_attr)
@@ -559,7 +608,7 @@ def batch_add(self, *args, **kwargs):
 
         """
         new_attrobjs = []
-        strattr = kwargs.get('strattr', False)
+        strattr = kwargs.get("strattr", False)
         for tup in args:
             if not is_iter(tup) or len(tup) < 2:
                 raise RuntimeError("batch_add requires iterables as arguments (got %r)." % tup)
@@ -575,7 +624,7 @@ def batch_add(self, *args, **kwargs):
                 attr_obj = attr_objs[0]
                 # update an existing attribute object
                 attr_obj.db_category = category
-                attr_obj.db_lock_storage = lockstring or ''
+                attr_obj.db_lock_storage = lockstring or ""
                 attr_obj.save(update_fields=["db_category", "db_lock_storage"])
                 if strattr:
                     # store as a simple string (will not notify OOB handlers)
@@ -586,13 +635,15 @@ def batch_add(self, *args, **kwargs):
                     attr_obj.value = new_value
             else:
                 # create a new Attribute (no OOB handlers can be notified)
-                kwargs = {"db_key": keystr,
-                          "db_category": category,
-                          "db_model": self._model,
-                          "db_attrtype": self._attrtype,
-                          "db_value": None if strattr else to_pickle(new_value),
-                          "db_strvalue": new_value if strattr else None,
-                          "db_lock_storage": lockstring or ''}
+                kwargs = {
+                    "db_key": keystr,
+                    "db_category": category,
+                    "db_model": self._model,
+                    "db_attrtype": self._attrtype,
+                    "db_value": None if strattr else to_pickle(new_value),
+                    "db_strvalue": new_value if strattr else None,
+                    "db_lock_storage": lockstring or "",
+                }
                 new_attr = Attribute(**kwargs)
                 new_attr.save()
                 new_attrobjs.append(new_attr)
@@ -601,8 +652,14 @@ def batch_add(self, *args, **kwargs):
             # Add new objects to m2m field all at once
             getattr(self.obj, self._m2m_fieldname).add(*new_attrobjs)
 
-    def remove(self, key=None, raise_exception=False, category=None,
-               accessing_obj=None, default_access=True):
+    def remove(
+        self,
+        key=None,
+        raise_exception=False,
+        category=None,
+        accessing_obj=None,
+        default_access=True,
+    ):
         """
         Remove attribute or a list of attributes from object.
 
@@ -632,8 +689,9 @@ def remove(self, key=None, raise_exception=False, category=None,
         """
 
         if key is None:
-            self.clear(category=category, accessing_obj=accessing_obj,
-                       default_access=default_access)
+            self.clear(
+                category=category, accessing_obj=accessing_obj, default_access=default_access
+            )
             return
 
         category = category.strip().lower() if category is not None else None
@@ -644,10 +702,9 @@ def remove(self, key=None, raise_exception=False, category=None,
             attr_objs = self._getcache(keystr, category)
             for attr_obj in attr_objs:
                 if not (
-                    accessing_obj and not attr_obj.access(
-                        accessing_obj,
-                        self._attredit,
-                        default=default_access)):
+                    accessing_obj
+                    and not attr_obj.access(accessing_obj, self._attredit, default=default_access)
+                ):
                     try:
                         attr_obj.delete()
                     except AssertionError:
@@ -684,9 +741,11 @@ def clear(self, category=None, accessing_obj=None, default_access=True):
             attrs = self._cache.values()
 
         if accessing_obj:
-            [attr.delete() for attr in attrs
-             if attr and
-             attr.access(accessing_obj, self._attredit, default=default_access)]
+            [
+                attr.delete()
+                for attr in attrs
+                if attr and attr.access(accessing_obj, self._attredit, default=default_access)
+            ]
         else:
             [attr.delete() for attr in attrs if attr and attr.pk]
         self._cache = {}
@@ -712,11 +771,13 @@ def all(self, accessing_obj=None, default_access=True):
         """
         if not self._cache_complete:
             self._fullcache()
-        attrs = sorted([attr for attr in self._cache.values() if attr],
-                       key=lambda o: o.id)
+        attrs = sorted([attr for attr in self._cache.values() if attr], key=lambda o: o.id)
         if accessing_obj:
-            return [attr for attr in attrs
-                    if attr.access(accessing_obj, self._attredit, default=default_access)]
+            return [
+                attr
+                for attr in attrs
+                if attr.access(accessing_obj, self._attredit, default=default_access)
+            ]
         else:
             return attrs
 
@@ -827,6 +888,7 @@ class NickHandler(AttributeHandler):
     They also always use the `strvalue` fields for their data.
 
     """
+
     _attrtype = "nick"
 
     def __init__(self, *args, **kwargs):
@@ -870,8 +932,11 @@ def get(self, key=None, category="inputline", return_tuple=False, **kwargs):
         else:
             retval = super().get(key=key, category=category, **kwargs)
             if retval:
-                return retval[3] if isinstance(retval, tuple) else \
-                    [tup[3] for tup in make_iter(retval)]
+                return (
+                    retval[3]
+                    if isinstance(retval, tuple)
+                    else [tup[3] for tup in make_iter(retval)]
+                )
             return None
 
     def add(self, key, replacement, category="inputline", **kwargs):
@@ -891,8 +956,7 @@ def add(self, key, replacement, category="inputline", **kwargs):
             nick_regex, nick_template = initialize_nick_templates(key + " $1", replacement + " $1")
         else:
             nick_regex, nick_template = initialize_nick_templates(key, replacement)
-        super().add(key, (nick_regex, nick_template, key, replacement),
-                                     category=category, **kwargs)
+        super().add(key, (nick_regex, nick_template, key, replacement), category=category, **kwargs)
 
     def remove(self, key, category="inputline", **kwargs):
         """
@@ -929,12 +993,24 @@ def nickreplace(self, raw_string, categories=("inputline", "channel"), include_a
         """
         nicks = {}
         for category in make_iter(categories):
-            nicks.update({nick.key: nick for nick in make_iter(
-                self.get(category=category, return_obj=True)) if nick and nick.key})
+            nicks.update(
+                {
+                    nick.key: nick
+                    for nick in make_iter(self.get(category=category, return_obj=True))
+                    if nick and nick.key
+                }
+            )
         if include_account and self.obj.has_account:
             for category in make_iter(categories):
-                nicks.update({nick.key: nick for nick in make_iter(self.obj.account.nicks.get(
-                    category=category, return_obj=True)) if nick and nick.key})
+                nicks.update(
+                    {
+                        nick.key: nick
+                        for nick in make_iter(
+                            self.obj.account.nicks.get(category=category, return_obj=True)
+                        )
+                        if nick and nick.key
+                    }
+                )
         for key, nick in nicks.items():
             nick_regex, template, _, _ = nick.value
             regex = self._regex_cache.get(nick_regex)
diff --git a/evennia/typeclasses/managers.py b/evennia/typeclasses/managers.py
index 062ce0f5e3e..abaf389a1dd 100644
--- a/evennia/typeclasses/managers.py
+++ b/evennia/typeclasses/managers.py
@@ -11,23 +11,27 @@
 from evennia.typeclasses.attributes import Attribute
 from evennia.typeclasses.tags import Tag
 
-__all__ = ("TypedObjectManager", )
+__all__ = ("TypedObjectManager",)
 _GA = object.__getattribute__
 _Tag = None
 
 
 # Managers
 
+
 class TypedObjectManager(idmapper.manager.SharedMemoryManager):
     """
     Common ObjectManager for all dbobjects.
 
     """
+
     # common methods for all typed managers. These are used
     # in other methods. Returns querysets.
 
     # Attribute manager methods
-    def get_attribute(self, key=None, category=None, value=None, strvalue=None, obj=None, attrtype=None):
+    def get_attribute(
+        self, key=None, category=None, value=None, strvalue=None, obj=None, attrtype=None
+    ):
         """
         Return Attribute objects by key, by category, by value, by
         strvalue, by object (it is stored on) or with a combination of
@@ -69,8 +73,10 @@ def get_attribute(self, key=None, category=None, value=None, strvalue=None, obj=
             # no reason to make strvalue/value mutually exclusive at this level
             query.append(("attribute__db_value", value))
         return Attribute.objects.filter(
-            pk__in=self.model.db_attributes.through.objects.filter(
-                **dict(query)).values_list("attribute_id", flat=True))
+            pk__in=self.model.db_attributes.through.objects.filter(**dict(query)).values_list(
+                "attribute_id", flat=True
+            )
+        )
 
     def get_nick(self, key=None, category=None, value=None, strvalue=None, obj=None):
         """
@@ -91,7 +97,9 @@ def get_nick(self, key=None, category=None, value=None, strvalue=None, obj=None)
             nicks (list): The matching Nicks.
 
         """
-        return self.get_attribute(key=key, category=category, value=value, strvalue=strvalue, obj=obj)
+        return self.get_attribute(
+            key=key, category=category, value=value, strvalue=strvalue, obj=obj
+        )
 
     def get_by_attribute(self, key=None, category=None, value=None, strvalue=None, attrtype=None):
         """
@@ -149,7 +157,6 @@ def get_by_nick(self, key=None, nick=None, category="inputline"):
 
     # Tag manager methods
 
-
     def get_tag(self, key=None, category=None, obj=None, tagtype=None, global_search=False):
         """
         Return Tag objects by key, by category, by object (it is
@@ -194,8 +201,10 @@ def get_tag(self, key=None, category=None, obj=None, tagtype=None, global_search
             if category:
                 query.append(("tag__db_category", category))
             return Tag.objects.filter(
-                pk__in=self.model.db_tags.through.objects.filter(
-                    **dict(query)).values_list("tag_id", flat=True))
+                pk__in=self.model.db_tags.through.objects.filter(**dict(query)).values_list(
+                    "tag_id", flat=True
+                )
+            )
 
     def get_permission(self, key=None, category=None, obj=None):
         """
@@ -259,8 +268,11 @@ def get_by_tag(self, key=None, category=None, tagtype=None):
         n_categories = len(categories)
 
         dbmodel = self.model.__dbclass__.__name__.lower()
-        query = self.filter(db_tags__db_tagtype__iexact=tagtype,
-                            db_tags__db_model__iexact=dbmodel).distinct().order_by('id')
+        query = (
+            self.filter(db_tags__db_tagtype__iexact=tagtype, db_tags__db_model__iexact=dbmodel)
+            .distinct()
+            .order_by("id")
+        )
 
         if n_keys > 0:
             # keys and/or categories given
@@ -270,11 +282,14 @@ def get_by_tag(self, key=None, category=None, tagtype=None):
                 cat = categories[0]
                 categories = [cat for _ in range(n_keys)]
             elif 1 < n_categories < n_keys:
-                raise IndexError("get_by_tag needs a single category or a list of categories "
-                                 "the same length as the list of tags.")
+                raise IndexError(
+                    "get_by_tag needs a single category or a list of categories "
+                    "the same length as the list of tags."
+                )
             for ikey, key in enumerate(keys):
-                query = query.filter(db_tags__db_key__iexact=key,
-                                     db_tags__db_category__iexact=categories[ikey])
+                query = query.filter(
+                    db_tags__db_key__iexact=key, db_tags__db_category__iexact=categories[ikey]
+                )
         else:
             # only one or more categories given
             for category in categories:
@@ -336,8 +351,7 @@ def create_tag(self, key=None, category=None, data=None, tagtype=None):
         # try to get old tag
 
         dbmodel = self.model.__dbclass__.__name__.lower()
-        tag = self.get_tag(key=key, category=category, tagtype=tagtype,
-                           global_search=True)
+        tag = self.get_tag(key=key, category=category, tagtype=tagtype, global_search=True)
         if tag and data is not None:
             # get tag from list returned by get_tag
             tag = tag[0]
@@ -354,7 +368,8 @@ def create_tag(self, key=None, category=None, data=None, tagtype=None):
                 db_category=category.strip().lower() if category and key is not None else None,
                 db_data=data,
                 db_model=dbmodel,
-                db_tagtype=tagtype.strip().lower() if tagtype is not None else None)
+                db_tagtype=tagtype.strip().lower() if tagtype is not None else None,
+            )
             tag.save()
         return make_iter(tag)[0]
 
@@ -378,7 +393,7 @@ def dbref(self, dbref, reqhash=True):
         if reqhash and not (isinstance(dbref, str) and dbref.startswith("#")):
             return None
         if isinstance(dbref, str):
-            dbref = dbref.lstrip('#')
+            dbref = dbref.lstrip("#")
         try:
             if int(dbref) < 0:
                 return None
@@ -449,10 +464,9 @@ def object_totals(self):
 
         """
         dbtotals = {}
-        typeclass_paths = set(self.values_list('db_typeclass_path', flat=True))
+        typeclass_paths = set(self.values_list("db_typeclass_path", flat=True))
         for typeclass_path in typeclass_paths:
-            dbtotals[typeclass_path] = \
-                self.filter(db_typeclass_path=typeclass_path).count()
+            dbtotals[typeclass_path] = self.filter(db_typeclass_path=typeclass_path).count()
         return dbtotals
 
     def typeclass_search(self, typeclass, include_children=False, include_parents=False):
@@ -539,30 +553,30 @@ def smart_search(self, query):
         for ipart, part in enumerate(querysplit):
             key, rest = part, ""
             if ":" in part:
-                key, rest = part.split(':', 1)
+                key, rest = part.split(":", 1)
             # tags are on the form tag or tag:category
-            if key.startswith('tag=='):
+            if key.startswith("tag=="):
                 plustags.append((key[5:], rest))
                 continue
-            elif key.startswith('tag!='):
+            elif key.startswith("tag!="):
                 negtags.append((key[5:], rest))
                 continue
             # attrs are on the form attr:value or attr:value:category
             elif rest:
                 value, category = rest, ""
                 if ":" in rest:
-                    value, category = rest.split(':', 1)
-                if key.startswith('attr=='):
+                    value, category = rest.split(":", 1)
+                if key.startswith("attr=="):
                     plusattrs.append((key[7:], value, category))
                     continue
-                elif key.startswith('attr!='):
+                elif key.startswith("attr!="):
                     negattrs.append((key[7:], value, category))
                     continue
             # if we get here, we are entering a key search criterion which
             # we assume is one word.
             queries.append(part)
         # build query from components
-        query = ' '.join(queries)
+        query = " ".join(queries)
         # TODO
 
     def get(self, *args, **kwargs):
@@ -663,7 +677,11 @@ def annotate(self, *args, **kwargs):
         Returns:
             Annotated queryset.
         """
-        return super(TypeclassManager, self).filter(db_typeclass_path=self.model.path).annotate(*args, **kwargs)
+        return (
+            super(TypeclassManager, self)
+            .filter(db_typeclass_path=self.model.path)
+            .annotate(*args, **kwargs)
+        )
 
     def values(self, *args, **kwargs):
         """
@@ -675,7 +693,11 @@ def values(self, *args, **kwargs):
         Returns:
             Queryset of values dictionaries, just filtered by typeclass first.
         """
-        return super(TypeclassManager, self).filter(db_typeclass_path=self.model.path).values(*args, **kwargs)
+        return (
+            super(TypeclassManager, self)
+            .filter(db_typeclass_path=self.model.path)
+            .values(*args, **kwargs)
+        )
 
     def values_list(self, *args, **kwargs):
         """
@@ -687,7 +709,11 @@ def values_list(self, *args, **kwargs):
         Returns:
             Queryset of value_list tuples, just filtered by typeclass first.
         """
-        return super(TypeclassManager, self).filter(db_typeclass_path=self.model.path).values_list(*args, **kwargs)
+        return (
+            super(TypeclassManager, self)
+            .filter(db_typeclass_path=self.model.path)
+            .values_list(*args, **kwargs)
+        )
 
     def _get_subclasses(self, cls):
         """
@@ -717,8 +743,9 @@ def get_family(self, **kwargs):
                 on the model base used.
 
         """
-        paths = [self.model.path] + ["%s.%s" % (cls.__module__, cls.__name__)
-                                     for cls in self._get_subclasses(self.model)]
+        paths = [self.model.path] + [
+            "%s.%s" % (cls.__module__, cls.__name__) for cls in self._get_subclasses(self.model)
+        ]
         kwargs.update({"db_typeclass_path__in": paths})
         return super().get(**kwargs)
 
@@ -738,8 +765,9 @@ def filter_family(self, *args, **kwargs):
 
         """
         # query, including all subclasses
-        paths = [self.model.path] + ["%s.%s" % (cls.__module__, cls.__name__)
-                                     for cls in self._get_subclasses(self.model)]
+        paths = [self.model.path] + [
+            "%s.%s" % (cls.__module__, cls.__name__) for cls in self._get_subclasses(self.model)
+        ]
         kwargs.update({"db_typeclass_path__in": paths})
         return super().filter(*args, **kwargs)
 
@@ -752,6 +780,7 @@ def all_family(self):
             objects (list): The objects found.
 
         """
-        paths = [self.model.path] + ["%s.%s" % (cls.__module__, cls.__name__)
-                                     for cls in self._get_subclasses(self.model)]
+        paths = [self.model.path] + [
+            "%s.%s" % (cls.__module__, cls.__name__) for cls in self._get_subclasses(self.model)
+        ]
         return super().all().filter(db_typeclass_path__in=paths)
diff --git a/evennia/typeclasses/migrations/0001_initial.py b/evennia/typeclasses/migrations/0001_initial.py
index e81039a184b..157e5e4a5dc 100644
--- a/evennia/typeclasses/migrations/0001_initial.py
+++ b/evennia/typeclasses/migrations/0001_initial.py
@@ -8,54 +8,156 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Attribute',
+            name="Attribute",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(max_length=255, verbose_name='key', db_index=True)),
-                ('db_value', evennia.utils.picklefield.PickledObjectField(help_text='The data returned when the attribute is accessed. Must be written as a Python literal if editing through the admin interface. Attribute values which are not Python literals cannot be edited through the admin interface.', null=True, verbose_name='value')),
-                ('db_strvalue', models.TextField(help_text='String-specific storage for quick look-up', null=True, verbose_name='strvalue', blank=True)),
-                ('db_category', models.CharField(max_length=128, blank=True, help_text='Optional categorization of attribute.', null=True, verbose_name='category', db_index=True)),
-                ('db_lock_storage', models.TextField(help_text='Lockstrings for this object are stored here.', verbose_name='locks', blank=True)),
-                ('db_model', models.CharField(max_length=32, blank=True, help_text='Which model of object this attribute is attached to (A natural key like objects.dbobject). You should not change this value unless you know what you are doing.', null=True, verbose_name='model', db_index=True)),
-                ('db_attrtype', models.CharField(max_length=16, blank=True, help_text='Subclass of Attribute (None or nick)', null=True, verbose_name='attrtype', db_index=True)),
-                ('db_date_created', models.DateTimeField(auto_now_add=True, verbose_name='date_created')),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                ("db_key", models.CharField(max_length=255, verbose_name="key", db_index=True)),
+                (
+                    "db_value",
+                    evennia.utils.picklefield.PickledObjectField(
+                        help_text="The data returned when the attribute is accessed. Must be written as a Python literal if editing through the admin interface. Attribute values which are not Python literals cannot be edited through the admin interface.",
+                        null=True,
+                        verbose_name="value",
+                    ),
+                ),
+                (
+                    "db_strvalue",
+                    models.TextField(
+                        help_text="String-specific storage for quick look-up",
+                        null=True,
+                        verbose_name="strvalue",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_category",
+                    models.CharField(
+                        max_length=128,
+                        blank=True,
+                        help_text="Optional categorization of attribute.",
+                        null=True,
+                        verbose_name="category",
+                        db_index=True,
+                    ),
+                ),
+                (
+                    "db_lock_storage",
+                    models.TextField(
+                        help_text="Lockstrings for this object are stored here.",
+                        verbose_name="locks",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_model",
+                    models.CharField(
+                        max_length=32,
+                        blank=True,
+                        help_text="Which model of object this attribute is attached to (A natural key like objects.dbobject). You should not change this value unless you know what you are doing.",
+                        null=True,
+                        verbose_name="model",
+                        db_index=True,
+                    ),
+                ),
+                (
+                    "db_attrtype",
+                    models.CharField(
+                        max_length=16,
+                        blank=True,
+                        help_text="Subclass of Attribute (None or nick)",
+                        null=True,
+                        verbose_name="attrtype",
+                        db_index=True,
+                    ),
+                ),
+                (
+                    "db_date_created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="date_created"),
+                ),
             ],
-            options={
-                'verbose_name': 'Evennia Attribute',
-            },
+            options={"verbose_name": "Evennia Attribute"},
             bases=(models.Model,),
         ),
         migrations.CreateModel(
-            name='Tag',
+            name="Tag",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('db_key', models.CharField(help_text='tag identifier', max_length=255, null=True, verbose_name='key', db_index=True)),
-                ('db_category', models.CharField(help_text='tag category', max_length=64, null=True, verbose_name='category', db_index=True)),
-                ('db_data', models.TextField(help_text='optional data field with extra information. This is not searched for.', null=True, verbose_name='data', blank=True)),
-                ('db_model', models.CharField(help_text='database model to Tag', max_length=32, null=True, verbose_name='model', db_index=True)),
-                ('db_tagtype', models.CharField(help_text='overall type of Tag', max_length=16, null=True, verbose_name='tagtype', db_index=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID", serialize=False, auto_created=True, primary_key=True
+                    ),
+                ),
+                (
+                    "db_key",
+                    models.CharField(
+                        help_text="tag identifier",
+                        max_length=255,
+                        null=True,
+                        verbose_name="key",
+                        db_index=True,
+                    ),
+                ),
+                (
+                    "db_category",
+                    models.CharField(
+                        help_text="tag category",
+                        max_length=64,
+                        null=True,
+                        verbose_name="category",
+                        db_index=True,
+                    ),
+                ),
+                (
+                    "db_data",
+                    models.TextField(
+                        help_text="optional data field with extra information. This is not searched for.",
+                        null=True,
+                        verbose_name="data",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "db_model",
+                    models.CharField(
+                        help_text="database model to Tag",
+                        max_length=32,
+                        null=True,
+                        verbose_name="model",
+                        db_index=True,
+                    ),
+                ),
+                (
+                    "db_tagtype",
+                    models.CharField(
+                        help_text="overall type of Tag",
+                        max_length=16,
+                        null=True,
+                        verbose_name="tagtype",
+                        db_index=True,
+                    ),
+                ),
             ],
-            options={
-                'verbose_name': 'Tag',
-            },
+            options={"verbose_name": "Tag"},
             bases=(models.Model,),
         ),
         migrations.AlterUniqueTogether(
-            name='tag',
-            unique_together=set([('db_key', 'db_category', 'db_tagtype')]),
+            name="tag", unique_together=set([("db_key", "db_category", "db_tagtype")])
         ),
         migrations.AlterIndexTogether(
-            name='tag',
-            index_together=set([('db_key', 'db_category', 'db_tagtype')]),
+            name="tag", index_together=set([("db_key", "db_category", "db_tagtype")])
         ),
     ]
     # if we are using Oracle, we need to remove the AlterIndexTogether operation
     # since Oracle seems to create its own index already at AlterUniqueTogether, meaning
     # there is a conflict (see issue #732).
-    if settings.DATABASES['default']['ENGINE'] == "django.db.backends.oracle":
+    if settings.DATABASES["default"]["ENGINE"] == "django.db.backends.oracle":
         del operations[3]
diff --git a/evennia/typeclasses/migrations/0002_auto_20150109_0913.py b/evennia/typeclasses/migrations/0002_auto_20150109_0913.py
index 3d3876ff379..1822b38bdef 100644
--- a/evennia/typeclasses/migrations/0002_auto_20150109_0913.py
+++ b/evennia/typeclasses/migrations/0002_auto_20150109_0913.py
@@ -7,14 +7,21 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('typeclasses', '0001_initial'),
-        ('auth', '0007_alter_validators_add_error_messages')
+        ("typeclasses", "0001_initial"),
+        ("auth", "0007_alter_validators_add_error_messages"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='attribute',
-            name='db_model',
-            field=models.CharField(max_length=32, blank=True, help_text="Which model of object this attribute is attached to (A natural key like 'objects.dbobject'). You should not change this value unless you know what you are doing.", null=True, verbose_name='model', db_index=True),
-        ),
+            model_name="attribute",
+            name="db_model",
+            field=models.CharField(
+                max_length=32,
+                blank=True,
+                help_text="Which model of object this attribute is attached to (A natural key like 'objects.dbobject'). You should not change this value unless you know what you are doing.",
+                null=True,
+                verbose_name="model",
+                db_index=True,
+            ),
+        )
     ]
diff --git a/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py b/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py
index 760e3177070..60a78a428c7 100644
--- a/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py
+++ b/evennia/typeclasses/migrations/0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono.py
@@ -8,107 +8,64 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('objects', '0005_auto_20150403_2339'),
-        ('scripts', '0007_auto_20150403_2339'),
-        ('accounts', '0004_auto_20150403_2339'),
-        ('typeclasses', '0002_auto_20150109_0913'),
+        ("objects", "0005_auto_20150403_2339"),
+        ("scripts", "0007_auto_20150403_2339"),
+        ("accounts", "0004_auto_20150403_2339"),
+        ("typeclasses", "0002_auto_20150109_0913"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='DefaultObject',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('objects.objectdb',),
+            name="DefaultObject", fields=[], options={"proxy": True}, bases=("objects.objectdb",)
         ),
         migrations.CreateModel(
-            name='DefaultAccount',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('accounts.accountdb',),
-            managers=[
-                ('objects', evennia.accounts.manager.AccountManager()),
-            ],
+            name="DefaultAccount",
+            fields=[],
+            options={"proxy": True},
+            bases=("accounts.accountdb",),
+            managers=[("objects", evennia.accounts.manager.AccountManager())],
         ),
         migrations.CreateModel(
-            name='ScriptBase',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('scripts.scriptdb',),
+            name="ScriptBase", fields=[], options={"proxy": True}, bases=("scripts.scriptdb",)
         ),
         migrations.CreateModel(
-            name='DefaultCharacter',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.defaultobject',),
+            name="DefaultCharacter",
+            fields=[],
+            options={"proxy": True},
+            bases=("typeclasses.defaultobject",),
         ),
         migrations.CreateModel(
-            name='DefaultExit',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.defaultobject',),
+            name="DefaultExit",
+            fields=[],
+            options={"proxy": True},
+            bases=("typeclasses.defaultobject",),
         ),
         migrations.CreateModel(
-            name='DefaultGuest',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.defaultaccount',),
-            managers=[
-                ('objects', evennia.accounts.manager.AccountManager()),
-            ],
+            name="DefaultGuest",
+            fields=[],
+            options={"proxy": True},
+            bases=("typeclasses.defaultaccount",),
+            managers=[("objects", evennia.accounts.manager.AccountManager())],
         ),
         migrations.CreateModel(
-            name='DefaultRoom',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.defaultobject',),
+            name="DefaultRoom",
+            fields=[],
+            options={"proxy": True},
+            bases=("typeclasses.defaultobject",),
         ),
         migrations.CreateModel(
-            name='DefaultScript',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.scriptbase',),
+            name="DefaultScript",
+            fields=[],
+            options={"proxy": True},
+            bases=("typeclasses.scriptbase",),
         ),
         migrations.CreateModel(
-            name='DoNothing',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.defaultscript',),
+            name="DoNothing",
+            fields=[],
+            options={"proxy": True},
+            bases=("typeclasses.defaultscript",),
         ),
         migrations.CreateModel(
-            name='Store',
-            fields=[
-            ],
-            options={
-                'proxy': True,
-            },
-            bases=('typeclasses.defaultscript',),
+            name="Store", fields=[], options={"proxy": True}, bases=("typeclasses.defaultscript",)
         ),
     ]
diff --git a/evennia/typeclasses/migrations/0004_auto_20151101_1759.py b/evennia/typeclasses/migrations/0004_auto_20151101_1759.py
index bb4949d0155..dfaf9ce7505 100644
--- a/evennia/typeclasses/migrations/0004_auto_20151101_1759.py
+++ b/evennia/typeclasses/migrations/0004_auto_20151101_1759.py
@@ -7,13 +7,23 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('typeclasses', '0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono'),
+        (
+            "typeclasses",
+            "0003_defaultcharacter_defaultexit_defaultguest_defaultobject_defaultplayer_defaultroom_defaultscript_dono",
+        )
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='attribute',
-            name='db_model',
-            field=models.CharField(max_length=32, blank=True, help_text="Which model of object this attribute is attached to (A natural key like 'objects.objectdb'). You should not change this value unless you know what you are doing.", null=True, verbose_name='model', db_index=True),
-        ),
+            model_name="attribute",
+            name="db_model",
+            field=models.CharField(
+                max_length=32,
+                blank=True,
+                help_text="Which model of object this attribute is attached to (A natural key like 'objects.objectdb'). You should not change this value unless you know what you are doing.",
+                null=True,
+                verbose_name="model",
+                db_index=True,
+            ),
+        )
     ]
diff --git a/evennia/typeclasses/migrations/0005_auto_20160625_1812.py b/evennia/typeclasses/migrations/0005_auto_20160625_1812.py
index 98997d89d1c..d92fa7a28dc 100644
--- a/evennia/typeclasses/migrations/0005_auto_20160625_1812.py
+++ b/evennia/typeclasses/migrations/0005_auto_20160625_1812.py
@@ -22,11 +22,9 @@ def update_nicks(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('typeclasses', '0004_auto_20151101_1759'),
-        ('comms', '0010_auto_20161206_1912'),
-        ('help', '0001_initial')
+        ("typeclasses", "0004_auto_20151101_1759"),
+        ("comms", "0010_auto_20161206_1912"),
+        ("help", "0001_initial"),
     ]
 
-    operations = [
-        migrations.RunPython(update_nicks)
-    ]
+    operations = [migrations.RunPython(update_nicks)]
diff --git a/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py b/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py
index 33cb0a8640a..e673d621ebc 100644
--- a/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py
+++ b/evennia/typeclasses/migrations/0006_auto_add_dbmodel_value_for_tags_attributes.py
@@ -7,41 +7,37 @@
 
 def update_tags_with_dbmodel(apps, schema_editor):
 
-    ObjectDB = apps.get_model('objects', 'ObjectDB')
+    ObjectDB = apps.get_model("objects", "ObjectDB")
     for obj in ObjectDB.objects.all():
         obj.db_attributes.all().update(db_model="objectdb")
         obj.db_tags.all().update(db_model="objectdb")
 
-    AccountDB = apps.get_model('accounts', 'AccountDB')
+    AccountDB = apps.get_model("accounts", "AccountDB")
     for obj in AccountDB.objects.all():
         obj.db_attributes.all().update(db_model="accountdb")
         obj.db_tags.all().update(db_model="accountdb")
 
-    ScriptDB = apps.get_model('scripts', 'ScriptDB')
+    ScriptDB = apps.get_model("scripts", "ScriptDB")
     for obj in ScriptDB.objects.all():
         obj.db_attributes.all().update(db_model="scriptdb")
         obj.db_tags.all().update(db_model="scriptdb")
 
-    ChannelDB = apps.get_model('comms', 'ChannelDB')
+    ChannelDB = apps.get_model("comms", "ChannelDB")
     for obj in ChannelDB.objects.all():
         obj.db_attributes.all().update(db_model="channeldb")
         obj.db_tags.all().update(db_model="channeldb")
 
-    HelpEntry = apps.get_model('help', 'HelpEntry')
+    HelpEntry = apps.get_model("help", "HelpEntry")
     for obj in HelpEntry.objects.all():
         obj.db_tags.all().update(db_model="helpentry")
 
-    Msg = apps.get_model('comms', 'Msg')
+    Msg = apps.get_model("comms", "Msg")
     for obj in Msg.objects.all():
         obj.db_tags.all().update(db_model="msg")
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0005_auto_20160625_1812'),
-    ]
+    dependencies = [("typeclasses", "0005_auto_20160625_1812")]
 
-    operations = [
-        migrations.RunPython(update_tags_with_dbmodel)
-    ]
+    operations = [migrations.RunPython(update_tags_with_dbmodel)]
diff --git a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
index db15e5b54f6..b76b6024afc 100644
--- a/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
+++ b/evennia/typeclasses/migrations/0007_tag_migrations_may_be_slow.py
@@ -7,79 +7,103 @@
 
 def update_tags_with_dbmodel(apps, schema_editor):
 
-    Tag = apps.get_model('typeclasses', 'Tag')
+    Tag = apps.get_model("typeclasses", "Tag")
 
-    ObjectDB = apps.get_model('objects', 'ObjectDB')
+    ObjectDB = apps.get_model("objects", "ObjectDB")
     for obj in ObjectDB.objects.all().exclude(db_tags__db_model="objectdb"):
         for tag in obj.db_tags.all().exclude(db_model="objectdb"):
             obj.db_tags.remove(tag)
-            newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
-                         db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="objectdb")
+            newtag = Tag(
+                db_key=tag.db_key,
+                db_category=tag.db_category,
+                db_data=tag.db_data,
+                db_tagtype=tag.db_tagtype,
+                db_model="objectdb",
+            )
             newtag.save()
             obj.db_tags.add(newtag)
 
-    AccountDB = apps.get_model('accounts', 'AccountDB')
+    AccountDB = apps.get_model("accounts", "AccountDB")
     for obj in AccountDB.objects.all().exclude(db_tags__db_model="accountdb"):
         for tag in obj.db_tags.all().exclude(db_model="accountdb"):
             obj.db_tags.remove(tag)
-            newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
-                         db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="accountdb")
+            newtag = Tag(
+                db_key=tag.db_key,
+                db_category=tag.db_category,
+                db_data=tag.db_data,
+                db_tagtype=tag.db_tagtype,
+                db_model="accountdb",
+            )
             newtag.save()
             obj.db_tags.add(newtag)
 
-    ScriptDB = apps.get_model('scripts', 'ScriptDB')
+    ScriptDB = apps.get_model("scripts", "ScriptDB")
     for obj in ScriptDB.objects.all().exclude(db_tags__db_model="scriptdb"):
         for tag in obj.db_tags.all().exclude(db_model="scriptdb"):
             obj.db_tags.remove(tag)
-            newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
-                         db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="scriptdb")
+            newtag = Tag(
+                db_key=tag.db_key,
+                db_category=tag.db_category,
+                db_data=tag.db_data,
+                db_tagtype=tag.db_tagtype,
+                db_model="scriptdb",
+            )
             newtag.save()
             obj.db_tags.add(newtag)
 
-    ChannelDB = apps.get_model('comms', 'ChannelDB')
+    ChannelDB = apps.get_model("comms", "ChannelDB")
     for obj in ChannelDB.objects.all().exclude(db_tags__db_model="channeldb"):
         for tag in obj.db_tags.all().exclude(db_model="channeldb"):
             obj.db_tags.remove(tag)
-            newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
-                         db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="channeldb")
+            newtag = Tag(
+                db_key=tag.db_key,
+                db_category=tag.db_category,
+                db_data=tag.db_data,
+                db_tagtype=tag.db_tagtype,
+                db_model="channeldb",
+            )
             newtag.save()
             obj.db_tags.add(newtag)
 
-    HelpEntry = apps.get_model('help', 'HelpEntry')
+    HelpEntry = apps.get_model("help", "HelpEntry")
     for obj in HelpEntry.objects.all().exclude(db_tags__db_model="helpentry"):
         for tag in obj.db_tags.all().exclude(db_model="helpentry"):
             obj.db_tags.remove(tag)
-            newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
-                         db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="helpentry")
+            newtag = Tag(
+                db_key=tag.db_key,
+                db_category=tag.db_category,
+                db_data=tag.db_data,
+                db_tagtype=tag.db_tagtype,
+                db_model="helpentry",
+            )
             newtag.save()
             obj.db_tags.add(newtag)
 
-    Msg = apps.get_model('comms', 'Msg')
+    Msg = apps.get_model("comms", "Msg")
     for obj in Msg.objects.all().exclude(db_tags__db_model="msg"):
         for tag in obj.db_tags.all().exclude(db_model="msg"):
             obj.db_tags.remove(tag)
-            newtag = Tag(db_key=tag.db_key, db_category=tag.db_category,
-                         db_data=tag.db_data, db_tagtype=tag.db_tagtype, db_model="msg")
+            newtag = Tag(
+                db_key=tag.db_key,
+                db_category=tag.db_category,
+                db_data=tag.db_data,
+                db_tagtype=tag.db_tagtype,
+                db_model="msg",
+            )
             newtag.save()
             obj.db_tags.add(newtag)
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0006_auto_add_dbmodel_value_for_tags_attributes'),
-    ]
+    dependencies = [("typeclasses", "0006_auto_add_dbmodel_value_for_tags_attributes")]
 
     operations = [
-
         migrations.AlterUniqueTogether(
-            name='tag',
-            unique_together=set([('db_key', 'db_category', 'db_tagtype', 'db_model')]),
+            name="tag", unique_together=set([("db_key", "db_category", "db_tagtype", "db_model")])
         ),
         migrations.AlterIndexTogether(
-            name='tag',
-            index_together=set([('db_key', 'db_category', 'db_tagtype', 'db_model')]),
+            name="tag", index_together=set([("db_key", "db_category", "db_tagtype", "db_model")])
         ),
-
-        migrations.RunPython(update_tags_with_dbmodel)
+        migrations.RunPython(update_tags_with_dbmodel),
     ]
diff --git a/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py b/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py
index 1044c042267..7df74a0d4bb 100644
--- a/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py
+++ b/evennia/typeclasses/migrations/0008_lock_and_perm_rename.py
@@ -9,9 +9,15 @@
 def update_perms_and_locks(apps, schema_editor):
 
     # update all permissions
-    Tag = apps.get_model('typeclasses', 'Tag')
-    perm_map = {"guests": "guest", "players": "player", "playerhelpers": "helper",
-                "builders": "builder", "wizards": "admin", "immortals": "developer"}
+    Tag = apps.get_model("typeclasses", "Tag")
+    perm_map = {
+        "guests": "guest",
+        "players": "player",
+        "playerhelpers": "helper",
+        "builders": "builder",
+        "wizards": "admin",
+        "immortals": "developer",
+    }
 
     for perm in Tag.objects.filter(db_tagtype="permission"):
         if perm.db_key in perm_map:
@@ -19,10 +25,15 @@ def update_perms_and_locks(apps, schema_editor):
             perm.save(update_fields=("db_key",))
 
     # update all locks on all entities
-    apps_models = [("objects", "ObjectDB"), ("accounts", "AccountDB"), ("scripts", "ScriptDB"),
-                   ("comms", "ChannelDB")]
-    p_reg = re.compile(r"(?<=perm\()(\w+)(?=\))|(?<=perm_above\()(\w+)(?=\))",
-                       re.IGNORECASE + re.UNICODE)
+    apps_models = [
+        ("objects", "ObjectDB"),
+        ("accounts", "AccountDB"),
+        ("scripts", "ScriptDB"),
+        ("comms", "ChannelDB"),
+    ]
+    p_reg = re.compile(
+        r"(?<=perm\()(\w+)(?=\))|(?<=perm_above\()(\w+)(?=\))", re.IGNORECASE + re.UNICODE
+    )
 
     def _sub(match):
         perm = match.group(1)
@@ -35,16 +46,11 @@ def _sub(match):
             repl_lock = p_reg.sub(_sub, orig_lock)
             if repl_lock != orig_lock:
                 obj.db_lock_storage = repl_lock
-                obj.save(update_fields=('db_lock_storage',))
+                obj.save(update_fields=("db_lock_storage",))
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0007_tag_migrations_may_be_slow'),
-    ]
-
-    operations = [
+    dependencies = [("typeclasses", "0007_tag_migrations_may_be_slow")]
 
-        migrations.RunPython(update_perms_and_locks)
-    ]
+    operations = [migrations.RunPython(update_perms_and_locks)]
diff --git a/evennia/typeclasses/migrations/0009_rename_player_cmdsets_typeclasses.py b/evennia/typeclasses/migrations/0009_rename_player_cmdsets_typeclasses.py
index 84523de9a59..c95d52e5310 100644
--- a/evennia/typeclasses/migrations/0009_rename_player_cmdsets_typeclasses.py
+++ b/evennia/typeclasses/migrations/0009_rename_player_cmdsets_typeclasses.py
@@ -22,6 +22,7 @@ def _case_sensitive_replace(string, old, new):
             `old` has been replaced with `new`, retaining case.
 
     """
+
     def repl(match):
         current = match.group()
         # treat multi-word sentences word-by-word
@@ -41,12 +42,12 @@ def repl(match):
                     all_upper = False
             # special cases - keep remaing case)
             if new_word.lower() in CASE_WORD_EXCEPTIONS:
-                result.append(new_word[ind + 1:])
+                result.append(new_word[ind + 1 :])
             # append any remaining characters from new
             elif all_upper:
-                result.append(new_word[ind + 1:].upper())
+                result.append(new_word[ind + 1 :].upper())
             else:
-                result.append(new_word[ind + 1:].lower())
+                result.append(new_word[ind + 1 :].lower())
             out.append("".join(result))
         # if we have more new words than old ones, just add them verbatim
         out.extend([new_word for ind, new_word in enumerate(new_words) if ind >= len(old_words)])
@@ -61,45 +62,41 @@ def repl(match):
 
 def update_typeclasses(apps, schema_editor):
 
-    ObjectDB = apps.get_model('objects', 'ObjectDB')
-    AccountDB = apps.get_model('accounts', 'AccountDB')
-    ScriptDB = apps.get_model('scripts', 'ScriptDB')
-    ChannelDB = apps.get_model('comms', 'ChannelDB')
-    Attributes = apps.get_model('typeclasses', 'Attribute')
-    Tags = apps.get_model('typeclasses', 'Tag')
+    ObjectDB = apps.get_model("objects", "ObjectDB")
+    AccountDB = apps.get_model("accounts", "AccountDB")
+    ScriptDB = apps.get_model("scripts", "ScriptDB")
+    ChannelDB = apps.get_model("comms", "ChannelDB")
+    Attributes = apps.get_model("typeclasses", "Attribute")
+    Tags = apps.get_model("typeclasses", "Tag")
 
     for obj in ObjectDB.objects.all():
-        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, 'player', 'account')
-        obj.db_cmdset_storage = _case_sensitive_replace(obj.db_cmdset_storage, 'player', 'account')
-        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, 'player', 'account')
-        obj.save(update_fields=['db_typeclass_path', 'db_cmdset_storage', 'db_lock_storage'])
+        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, "player", "account")
+        obj.db_cmdset_storage = _case_sensitive_replace(obj.db_cmdset_storage, "player", "account")
+        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, "player", "account")
+        obj.save(update_fields=["db_typeclass_path", "db_cmdset_storage", "db_lock_storage"])
     for obj in AccountDB.objects.all():
-        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, 'player', 'account')
-        obj.db_cmdset_storage = _case_sensitive_replace(obj.db_cmdset_storage, 'player', 'account')
-        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, 'player', 'account')
-        obj.save(update_fields=['db_typeclass_path', 'db_cmdset_storage', 'db_lock_storage'])
+        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, "player", "account")
+        obj.db_cmdset_storage = _case_sensitive_replace(obj.db_cmdset_storage, "player", "account")
+        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, "player", "account")
+        obj.save(update_fields=["db_typeclass_path", "db_cmdset_storage", "db_lock_storage"])
     for obj in ScriptDB.objects.all():
-        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, 'player', 'account')
-        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, 'player', 'account')
-        obj.save(update_fields=['db_typeclass_path', 'db_lock_storage'])
+        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, "player", "account")
+        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, "player", "account")
+        obj.save(update_fields=["db_typeclass_path", "db_lock_storage"])
     for obj in ChannelDB.objects.all():
-        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, 'player', 'account')
-        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, 'player', 'account')
-        obj.save(update_fields=['db_typeclass_path', 'db_lock_storage'])
-    for obj in Attributes.objects.filter(db_model='playerdb'):
-        obj.db_model = 'accountdb'
-        obj.save(update_fields=['db_model'])
-    for obj in Tags.objects.filter(db_model='playerdb'):
-        obj.db_model = 'accountdb'
-        obj.save(update_fields=['db_model'])
+        obj.db_typeclass_path = _case_sensitive_replace(obj.db_typeclass_path, "player", "account")
+        obj.db_lock_storage = _case_sensitive_replace(obj.db_lock_storage, "player", "account")
+        obj.save(update_fields=["db_typeclass_path", "db_lock_storage"])
+    for obj in Attributes.objects.filter(db_model="playerdb"):
+        obj.db_model = "accountdb"
+        obj.save(update_fields=["db_model"])
+    for obj in Tags.objects.filter(db_model="playerdb"):
+        obj.db_model = "accountdb"
+        obj.save(update_fields=["db_model"])
 
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0008_lock_and_perm_rename'),
-    ]
+    dependencies = [("typeclasses", "0008_lock_and_perm_rename")]
 
-    operations = [
-        migrations.RunPython(update_typeclasses),
-    ]
+    operations = [migrations.RunPython(update_typeclasses)]
diff --git a/evennia/typeclasses/migrations/0010_delete_old_player_tables.py b/evennia/typeclasses/migrations/0010_delete_old_player_tables.py
index 0c9e37364ff..0732f0fe99f 100644
--- a/evennia/typeclasses/migrations/0010_delete_old_player_tables.py
+++ b/evennia/typeclasses/migrations/0010_delete_old_player_tables.py
@@ -6,6 +6,7 @@
 
 _ENGINE = None
 
+
 def _table_exists(db_cursor, tablename):
     "Returns bool if table exists or not"
     return tablename in connection.introspection.table_names()
@@ -15,6 +16,7 @@ def _drop_table(db_cursor, table_name):
     global _ENGINE
     if not _ENGINE:
         from django.conf import settings
+
         try:
             _ENGINE = settings.DATABASES["default"]["ENGINE"]
         except KeyError:
@@ -47,10 +49,6 @@ def drop_tables(apps, schema_migrator):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0009_rename_player_cmdsets_typeclasses'),
-    ]
+    dependencies = [("typeclasses", "0009_rename_player_cmdsets_typeclasses")]
 
-    operations = [
-        migrations.RunPython(drop_tables)
-    ]
+    operations = [migrations.RunPython(drop_tables)]
diff --git a/evennia/typeclasses/migrations/0011_auto_20190128_1820.py b/evennia/typeclasses/migrations/0011_auto_20190128_1820.py
index 1d7bc4fb5de..67ba49affc4 100644
--- a/evennia/typeclasses/migrations/0011_auto_20190128_1820.py
+++ b/evennia/typeclasses/migrations/0011_auto_20190128_1820.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-28 18:20
-from __future__ import unicode_literals
 
 from django.db import migrations, models
 import evennia.utils.picklefield
@@ -8,104 +7,145 @@
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0010_delete_old_player_tables'),
-    ]
+    dependencies = [("typeclasses", "0010_delete_old_player_tables")]
 
     operations = [
-        migrations.DeleteModel(
-            name='DefaultAccount',
-        ),
-        migrations.DeleteModel(
-            name='DefaultCharacter',
-        ),
-        migrations.DeleteModel(
-            name='DefaultExit',
-        ),
-        migrations.DeleteModel(
-            name='DefaultGuest',
-        ),
-        migrations.DeleteModel(
-            name='DefaultObject',
-        ),
-        migrations.DeleteModel(
-            name='DefaultRoom',
-        ),
-        migrations.DeleteModel(
-            name='DefaultScript',
-        ),
-        migrations.DeleteModel(
-            name='DoNothing',
-        ),
-        migrations.DeleteModel(
-            name='ScriptBase',
-        ),
-        migrations.DeleteModel(
-            name='Store',
-        ),
+        migrations.DeleteModel(name="DefaultAccount"),
+        migrations.DeleteModel(name="DefaultCharacter"),
+        migrations.DeleteModel(name="DefaultExit"),
+        migrations.DeleteModel(name="DefaultGuest"),
+        migrations.DeleteModel(name="DefaultObject"),
+        migrations.DeleteModel(name="DefaultRoom"),
+        migrations.DeleteModel(name="DefaultScript"),
+        migrations.DeleteModel(name="DoNothing"),
+        migrations.DeleteModel(name="ScriptBase"),
+        migrations.DeleteModel(name="Store"),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_attrtype',
-            field=models.CharField(blank=True, db_index=True, help_text='Subclass of Attribute (None or nick)', max_length=16, null=True, verbose_name='attrtype'),
+            model_name="attribute",
+            name="db_attrtype",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                help_text="Subclass of Attribute (None or nick)",
+                max_length=16,
+                null=True,
+                verbose_name="attrtype",
+            ),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_category',
-            field=models.CharField(blank=True, db_index=True, help_text='Optional categorization of attribute.', max_length=128, null=True, verbose_name='category'),
+            model_name="attribute",
+            name="db_category",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                help_text="Optional categorization of attribute.",
+                max_length=128,
+                null=True,
+                verbose_name="category",
+            ),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_date_created',
-            field=models.DateTimeField(auto_now_add=True, verbose_name='date_created'),
+            model_name="attribute",
+            name="db_date_created",
+            field=models.DateTimeField(auto_now_add=True, verbose_name="date_created"),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_key',
-            field=models.CharField(db_index=True, max_length=255, verbose_name='key'),
+            model_name="attribute",
+            name="db_key",
+            field=models.CharField(db_index=True, max_length=255, verbose_name="key"),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_lock_storage',
-            field=models.TextField(blank=True, help_text='Lockstrings for this object are stored here.', verbose_name='locks'),
+            model_name="attribute",
+            name="db_lock_storage",
+            field=models.TextField(
+                blank=True,
+                help_text="Lockstrings for this object are stored here.",
+                verbose_name="locks",
+            ),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_model',
-            field=models.CharField(blank=True, db_index=True, help_text="Which model of object this attribute is attached to (A natural key like 'objects.objectdb'). You should not change this value unless you know what you are doing.", max_length=32, null=True, verbose_name='model'),
+            model_name="attribute",
+            name="db_model",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                help_text="Which model of object this attribute is attached to (A natural key like 'objects.objectdb'). You should not change this value unless you know what you are doing.",
+                max_length=32,
+                null=True,
+                verbose_name="model",
+            ),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_strvalue',
-            field=models.TextField(blank=True, help_text='String-specific storage for quick look-up', null=True, verbose_name='strvalue'),
+            model_name="attribute",
+            name="db_strvalue",
+            field=models.TextField(
+                blank=True,
+                help_text="String-specific storage for quick look-up",
+                null=True,
+                verbose_name="strvalue",
+            ),
         ),
         migrations.AlterField(
-            model_name='attribute',
-            name='db_value',
-            field=evennia.utils.picklefield.PickledObjectField(help_text='The data returned when the attribute is accessed. Must be written as a Python literal if editing through the admin interface. Attribute values which are not Python literals cannot be edited through the admin interface.', null=True, verbose_name='value'),
+            model_name="attribute",
+            name="db_value",
+            field=evennia.utils.picklefield.PickledObjectField(
+                help_text="The data returned when the attribute is accessed. Must be written as a Python literal if editing through the admin interface. Attribute values which are not Python literals cannot be edited through the admin interface.",
+                null=True,
+                verbose_name="value",
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='db_category',
-            field=models.CharField(db_index=True, help_text='tag category', max_length=64, null=True, verbose_name='category'),
+            model_name="tag",
+            name="db_category",
+            field=models.CharField(
+                db_index=True,
+                help_text="tag category",
+                max_length=64,
+                null=True,
+                verbose_name="category",
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='db_data',
-            field=models.TextField(blank=True, help_text='optional data field with extra information. This is not searched for.', null=True, verbose_name='data'),
+            model_name="tag",
+            name="db_data",
+            field=models.TextField(
+                blank=True,
+                help_text="optional data field with extra information. This is not searched for.",
+                null=True,
+                verbose_name="data",
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='db_key',
-            field=models.CharField(db_index=True, help_text='tag identifier', max_length=255, null=True, verbose_name='key'),
+            model_name="tag",
+            name="db_key",
+            field=models.CharField(
+                db_index=True,
+                help_text="tag identifier",
+                max_length=255,
+                null=True,
+                verbose_name="key",
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='db_model',
-            field=models.CharField(db_index=True, help_text='database model to Tag', max_length=32, null=True, verbose_name='model'),
+            model_name="tag",
+            name="db_model",
+            field=models.CharField(
+                db_index=True,
+                help_text="database model to Tag",
+                max_length=32,
+                null=True,
+                verbose_name="model",
+            ),
         ),
         migrations.AlterField(
-            model_name='tag',
-            name='db_tagtype',
-            field=models.CharField(db_index=True, help_text='overall type of Tag', max_length=16, null=True, verbose_name='tagtype'),
+            model_name="tag",
+            name="db_tagtype",
+            field=models.CharField(
+                db_index=True,
+                help_text="overall type of Tag",
+                max_length=16,
+                null=True,
+                verbose_name="tagtype",
+            ),
         ),
     ]
diff --git a/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py b/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py
index 2575ce064cc..023436784fc 100644
--- a/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py
+++ b/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2019-01-30 20:56
-from __future__ import unicode_literals
 
 from copy import deepcopy
 from base64 import b64encode, b64decode
@@ -10,7 +9,7 @@
 
 
 def forwards(apps, schema_editor):
-    Attribute = apps.get_model('typeclasses', 'Attribute')
+    Attribute = apps.get_model("typeclasses", "Attribute")
     for attr in Attribute.objects.all():
         # we need to re-assign the Attribute it's own value to make sure pickle switches from v2 to v4,
         # otherwise we will not be able to search db by-value.
@@ -20,10 +19,6 @@ def forwards(apps, schema_editor):
 
 class Migration(migrations.Migration):
 
-    dependencies = [
-        ('typeclasses', '0011_auto_20190128_1820'),
-    ]
+    dependencies = [("typeclasses", "0011_auto_20190128_1820")]
 
-    operations = [
-        migrations.RunPython(forwards, migrations.RunPython.noop),
-    ]
+    operations = [migrations.RunPython(forwards, migrations.RunPython.noop)]
diff --git a/evennia/typeclasses/migrations/0013_auto_20191015_1922.py b/evennia/typeclasses/migrations/0013_auto_20191015_1922.py
new file mode 100644
index 00000000000..6eff90077dc
--- /dev/null
+++ b/evennia/typeclasses/migrations/0013_auto_20191015_1922.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.6 on 2019-10-15 19:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("typeclasses", "0012_attrs_to_picklev4_may_be_slow")]
+
+    operations = [
+        migrations.AlterField(
+            model_name="tag",
+            name="db_tagtype",
+            field=models.CharField(
+                blank=True,
+                db_index=True,
+                help_text="overall type of Tag",
+                max_length=16,
+                null=True,
+                verbose_name="tagtype",
+            ),
+        )
+    ]
diff --git a/evennia/typeclasses/models.py b/evennia/typeclasses/models.py
index 7c24496220b..b20f7ca3d41 100644
--- a/evennia/typeclasses/models.py
+++ b/evennia/typeclasses/models.py
@@ -25,8 +25,6 @@ class needs to supply a ForeignKey field attr_object pointing to the kind
 these to create custom managers.
 
 """
-from builtins import object
-
 from django.db.models import signals
 
 from django.db.models.base import ModelBase
@@ -46,12 +44,10 @@ class needs to supply a ForeignKey field attr_object pointing to the kind
 
 from evennia.typeclasses import managers
 from evennia.locks.lockhandler import LockHandler
-from evennia.utils.utils import (
-    is_iter, inherits_from, lazy_property,
-    class_from_module)
+from evennia.utils.utils import is_iter, inherits_from, lazy_property, class_from_module
 from evennia.utils.logger import log_trace
 
-__all__ = ("TypedObject", )
+__all__ = ("TypedObject",)
 
 TICKER_HANDLER = None
 
@@ -63,6 +59,7 @@ class needs to supply a ForeignKey field attr_object pointing to the kind
 
 # signal receivers. Connected in __new__
 
+
 def call_at_first_save(sender, instance, created, **kwargs):
     """
     Receives a signal just after the object is saved.
@@ -109,9 +106,11 @@ def __new__(cls, name, bases, attrs):
 
         # typeclass proxy setup
         if "Meta" not in attrs:
+
             class Meta(object):
                 proxy = True
                 app_label = attrs.get("__applabel__", "typeclasses")
+
             attrs["Meta"] = Meta
         attrs["Meta"].proxy = True
 
@@ -126,27 +125,29 @@ class Meta(object):
 class DbHolder(object):
     "Holder for allowing property access of attributes"
 
-    def __init__(self, obj, name, manager_name='attributes'):
+    def __init__(self, obj, name, manager_name="attributes"):
         _SA(self, name, _GA(obj, manager_name))
-        _SA(self, 'name', name)
+        _SA(self, "name", name)
 
     def __getattribute__(self, attrname):
-        if attrname == 'all':
+        if attrname == "all":
             # we allow to overload our default .all
-            attr = _GA(self, _GA(self, 'name')).get("all")
+            attr = _GA(self, _GA(self, "name")).get("all")
             return attr if attr else _GA(self, "all")
-        return _GA(self, _GA(self, 'name')).get(attrname)
+        return _GA(self, _GA(self, "name")).get(attrname)
 
     def __setattr__(self, attrname, value):
-        _GA(self, _GA(self, 'name')).add(attrname, value)
+        _GA(self, _GA(self, "name")).add(attrname, value)
 
     def __delattr__(self, attrname):
-        _GA(self, _GA(self, 'name')).remove(attrname)
+        _GA(self, _GA(self, "name")).remove(attrname)
 
     def get_all(self):
-        return _GA(self, _GA(self, 'name')).all()
+        return _GA(self, _GA(self, "name")).all()
+
     all = property(get_all)
 
+
 #
 # Main TypedObject abstraction
 #
@@ -182,21 +183,33 @@ class TypedObject(SharedMemoryModel):
 
     # Main identifier of the object, for searching. Is accessed with self.key
     # or self.name
-    db_key = models.CharField('key', max_length=255, db_index=True)
+    db_key = models.CharField("key", max_length=255, db_index=True)
     # This is the python path to the type class this object is tied to. The
     # typeclass is what defines what kind of Object this is)
-    db_typeclass_path = models.CharField('typeclass', max_length=255, null=True,
-                                         help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.")
+    db_typeclass_path = models.CharField(
+        "typeclass",
+        max_length=255,
+        null=True,
+        help_text="this defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass.",
+        db_index=True,
+    )
     # Creation date. This is not changed once the object is created.
-    db_date_created = models.DateTimeField('creation date', editable=False, auto_now_add=True)
+    db_date_created = models.DateTimeField("creation date", editable=False, auto_now_add=True)
     # Lock storage
-    db_lock_storage = models.TextField('locks', blank=True,
-                                       help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.")
+    db_lock_storage = models.TextField(
+        "locks",
+        blank=True,
+        help_text="locks limit access to an entity. A lock is defined as a 'lock string' on the form 'type:lockfunctions', defining what functionality is locked and how to determine access. Not defining a lock means no access is granted.",
+    )
     # many2many relationships
-    db_attributes = models.ManyToManyField(Attribute,
-                                           help_text='attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).')
-    db_tags = models.ManyToManyField(Tag,
-                                     help_text='tags on this object. Tags are simple string markers to identify, group and alias objects.')
+    db_attributes = models.ManyToManyField(
+        Attribute,
+        help_text="attributes on this object. An attribute can hold any pickle-able python object (see docs for special cases).",
+    )
+    db_tags = models.ManyToManyField(
+        Tag,
+        help_text="tags on this object. Tags are simple string markers to identify, group and alias objects.",
+    )
 
     # Database manager
     objects = managers.TypedObjectManager()
@@ -209,7 +222,9 @@ class TypedObject(SharedMemoryModel):
     def set_class_from_typeclass(self, typeclass_path=None):
         if typeclass_path:
             try:
-                self.__class__ = class_from_module(typeclass_path, defaultpaths=settings.TYPECLASS_PATHS)
+                self.__class__ = class_from_module(
+                    typeclass_path, defaultpaths=settings.TYPECLASS_PATHS
+                )
             except Exception:
                 log_trace()
                 try:
@@ -243,7 +258,10 @@ def set_class_from_typeclass(self, typeclass_path=None):
             self.__class__ = class_from_module("evennia.objects.objects.DefaultObject")
             self.__dbclass__ = class_from_module("evennia.objects.models.ObjectDB")
             self.db_typeclass_path = "evennia.objects.objects.DefaultObject"
-            log_trace("Critical: Class %s of %s is not a valid typeclass!\nTemporarily falling back to %s." % (err_class, self, self.__class__))
+            log_trace(
+                "Critical: Class %s of %s is not a valid typeclass!\nTemporarily falling back to %s."
+                % (err_class, self, self.__class__)
+            )
 
     def __init__(self, *args, **kwargs):
         """
@@ -309,9 +327,10 @@ class Meta(object):
         """
         Django setup info.
         """
+
         abstract = True
         verbose_name = "Evennia Database Object"
-        ordering = ['-db_date_created', 'id', 'db_typeclass_path', 'db_key']
+        ordering = ["-db_date_created", "id", "db_typeclass_path", "db_key"]
 
     # wrapper
     # Wrapper properties to easily set database fields. These are
@@ -331,6 +350,7 @@ def __name_set(self, value):
 
     def __name_del(self):
         raise Exception("Cannot delete name")
+
     name = property(__name_get, __name_set, __name_del)
 
     # key property (overrides's the idmapper's db_key for the at_rename hook)
@@ -368,7 +388,7 @@ def __str__(self):
     def __repr__(self):
         return "%s" % self.db_key
 
-    #@property
+    # @property
     def __dbid_get(self):
         """
         Caches and returns the unique id of the object.
@@ -381,9 +401,10 @@ def __dbid_set(self, value):
 
     def __dbid_del(self):
         raise Exception("dbid cannot be deleted!")
+
     dbid = property(__dbid_get, __dbid_set, __dbid_del)
 
-    #@property
+    # @property
     def __dbref_get(self):
         """
         Returns the object's dbref on the form #NN.
@@ -395,6 +416,7 @@ def __dbref_set(self):
 
     def __dbref_del(self):
         raise Exception("dbref cannot be deleted!")
+
     dbref = property(__dbref_get, __dbref_set, __dbref_del)
 
     def at_idmapper_flush(self):
@@ -457,7 +479,9 @@ def is_typeclass(self, typeclass, exact=True):
 
         """
         if isinstance(typeclass, str):
-            typeclass = [typeclass] + ["%s.%s" % (prefix, typeclass) for prefix in settings.TYPECLASS_PATHS]
+            typeclass = [typeclass] + [
+                "%s.%s" % (prefix, typeclass) for prefix in settings.TYPECLASS_PATHS
+            ]
         else:
             typeclass = [typeclass.path]
 
@@ -467,10 +491,18 @@ def is_typeclass(self, typeclass, exact=True):
             return selfpath in typeclass
         else:
             # check parent chain
-            return any(hasattr(cls, "path") and cls.path in typeclass for cls in self.__class__.mro())
-
-    def swap_typeclass(self, new_typeclass, clean_attributes=False,
-                       run_start_hooks="all", no_default=True, clean_cmdsets=False):
+            return any(
+                hasattr(cls, "path") and cls.path in typeclass for cls in self.__class__.mro()
+            )
+
+    def swap_typeclass(
+        self,
+        new_typeclass,
+        clean_attributes=False,
+        run_start_hooks="all",
+        no_default=True,
+        clean_cmdsets=False,
+    ):
         """
         This performs an in-situ swap of the typeclass. This means
         that in-game, this object will suddenly be something else.
@@ -515,9 +547,11 @@ def swap_typeclass(self, new_typeclass, clean_attributes=False,
 
         if inherits_from(self, "evennia.scripts.models.ScriptDB"):
             if self.interval > 0:
-                raise RuntimeError("Cannot use swap_typeclass on time-dependent "
-                                   "Script '%s'.\nStop and start a new Script of the "
-                                   "right type instead." % self.key)
+                raise RuntimeError(
+                    "Cannot use swap_typeclass on time-dependent "
+                    "Script '%s'.\nStop and start a new Script of the "
+                    "right type instead." % self.key
+                )
 
         self.typeclass_path = new_typeclass.path
         self.__class__ = new_typeclass
@@ -538,7 +572,7 @@ def swap_typeclass(self, new_typeclass, clean_attributes=False,
             self.cmdset.clear()
             self.cmdset.remove_default()
 
-        if run_start_hooks == 'all':
+        if run_start_hooks == "all":
             # fake this call to mimic the first save
             self.at_first_save()
         elif run_start_hooks:
@@ -549,7 +583,9 @@ def swap_typeclass(self, new_typeclass, clean_attributes=False,
     # Lock / permission methods
     #
 
-    def access(self, accessing_obj, access_type='read', default=False, no_superuser_bypass=False, **kwargs):
+    def access(
+        self, accessing_obj, access_type="read", default=False, no_superuser_bypass=False, **kwargs
+    ):
         """
         Determines if another object has permission to access this one.
 
@@ -567,8 +603,12 @@ def access(self, accessing_obj, access_type='read', default=False, no_superuser_
                 use it to feed to its hook methods.
 
         """
-        return self.locks.check(accessing_obj, access_type=access_type, default=default,
-                                no_superuser_bypass=no_superuser_bypass)
+        return self.locks.check(
+            accessing_obj,
+            access_type=access_type,
+            default=default,
+            no_superuser_bypass=no_superuser_bypass,
+        )
 
     def check_permstring(self, permstring):
         """
@@ -583,7 +623,11 @@ def check_permstring(self, permstring):
 
         """
         if hasattr(self, "account"):
-            if self.account and self.account.is_superuser and not self.account.attributes.get("_quell"):
+            if (
+                self.account
+                and self.account.is_superuser
+                and not self.account.attributes.get("_quell")
+            ):
                 return True
         else:
             if self.is_superuser and not self.attributes.get("_quell"):
@@ -599,8 +643,11 @@ def check_permstring(self, permstring):
         if perm in _PERMISSION_HIERARCHY:
             # check if we have a higher hierarchy position
             ppos = _PERMISSION_HIERARCHY.index(perm)
-            return any(True for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
-                       if hperm in perms and hpos > ppos)
+            return any(
+                True
+                for hpos, hperm in enumerate(_PERMISSION_HIERARCHY)
+                if hperm in perms and hpos > ppos
+            )
         # we ignore pluralization (english only)
         if perm.endswith("s"):
             return self.check_permstring(perm[:-1])
@@ -636,7 +683,7 @@ def delete(self):
     # Attribute storage
     #
 
-    #@property db
+    # @property db
     def __db_get(self):
         """
         Attribute handler wrapper. Allows for the syntax
@@ -652,27 +699,28 @@ def __db_get(self):
         try:
             return self._db_holder
         except AttributeError:
-            self._db_holder = DbHolder(self, 'attributes')
+            self._db_holder = DbHolder(self, "attributes")
             return self._db_holder
 
-    #@db.setter
+    # @db.setter
     def __db_set(self, value):
         "Stop accidentally replacing the db object"
         string = "Cannot assign directly to db object! "
         string += "Use db.attr=value instead."
         raise Exception(string)
 
-    #@db.deleter
+    # @db.deleter
     def __db_del(self):
         "Stop accidental deletion."
         raise Exception("Cannot delete the db object!")
+
     db = property(__db_get, __db_set, __db_del)
 
     #
     # Non-persistent (ndb) storage
     #
 
-    #@property ndb
+    # @property ndb
     def __ndb_get(self):
         """
         A non-attr_obj store (ndb: NonDataBase). Everything stored
@@ -683,20 +731,21 @@ def __ndb_get(self):
         try:
             return self._ndb_holder
         except AttributeError:
-            self._ndb_holder = DbHolder(self, "nattrhandler", manager_name='nattributes')
+            self._ndb_holder = DbHolder(self, "nattrhandler", manager_name="nattributes")
             return self._ndb_holder
 
-    #@db.setter
+    # @db.setter
     def __ndb_set(self, value):
         "Stop accidentally replacing the ndb object"
         string = "Cannot assign directly to ndb object! "
         string += "Use ndb.attr=value instead."
         raise Exception(string)
 
-    #@db.deleter
+    # @db.deleter
     def __ndb_del(self):
         "Stop accidental deletion."
         raise Exception("Cannot delete the ndb object!")
+
     ndb = property(__ndb_get, __ndb_set, __ndb_del)
 
     def get_display_name(self, looker, **kwargs):
@@ -721,7 +770,7 @@ def get_display_name(self, looker, **kwargs):
             builders.
 
         """
-        if self.access(looker, access_type='controls'):
+        if self.access(looker, access_type="controls"):
             return "{}(#{})".format(self.name, self.id)
         return self.name
 
@@ -775,8 +824,9 @@ def web_get_admin_url(self):
 
         """
         content_type = ContentType.objects.get_for_model(self.__class__)
-        return reverse("admin:%s_%s_change" % (content_type.app_label,
-                                               content_type.model), args=(self.id,))
+        return reverse(
+            "admin:%s_%s_change" % (content_type.app_label, content_type.model), args=(self.id,)
+        )
 
     @classmethod
     def web_get_create_url(cls):
@@ -805,9 +855,9 @@ def web_get_create_url(cls):
 
         """
         try:
-            return reverse('%s-create' % slugify(cls._meta.verbose_name))
+            return reverse("%s-create" % slugify(cls._meta.verbose_name))
         except:
-            return '#'
+            return "#"
 
     def web_get_detail_url(self):
         """
@@ -836,10 +886,12 @@ def web_get_detail_url(self):
 
         """
         try:
-            return reverse('%s-detail' % slugify(self._meta.verbose_name),
-                           kwargs={'pk': self.pk, 'slug': slugify(self.name)})
+            return reverse(
+                "%s-detail" % slugify(self._meta.verbose_name),
+                kwargs={"pk": self.pk, "slug": slugify(self.name)},
+            )
         except:
-            return '#'
+            return "#"
 
     def web_get_puppet_url(self):
         """
@@ -868,10 +920,12 @@ def web_get_puppet_url(self):
 
         """
         try:
-            return reverse('%s-puppet' % slugify(self._meta.verbose_name),
-                           kwargs={'pk': self.pk, 'slug': slugify(self.name)})
+            return reverse(
+                "%s-puppet" % slugify(self._meta.verbose_name),
+                kwargs={"pk": self.pk, "slug": slugify(self.name)},
+            )
         except:
-            return '#'
+            return "#"
 
     def web_get_update_url(self):
         """
@@ -900,10 +954,12 @@ def web_get_update_url(self):
 
         """
         try:
-            return reverse('%s-update' % slugify(self._meta.verbose_name),
-                           kwargs={'pk': self.pk, 'slug': slugify(self.name)})
+            return reverse(
+                "%s-update" % slugify(self._meta.verbose_name),
+                kwargs={"pk": self.pk, "slug": slugify(self.name)},
+            )
         except:
-            return '#'
+            return "#"
 
     def web_get_delete_url(self):
         """
@@ -931,10 +987,12 @@ def web_get_delete_url(self):
 
         """
         try:
-            return reverse('%s-delete' % slugify(self._meta.verbose_name),
-                           kwargs={'pk': self.pk, 'slug': slugify(self.name)})
+            return reverse(
+                "%s-delete" % slugify(self._meta.verbose_name),
+                kwargs={"pk": self.pk, "slug": slugify(self.name)},
+            )
         except:
-            return '#'
+            return "#"
 
     # Used by Django Sites/Admin
     get_absolute_url = web_get_detail_url
diff --git a/evennia/typeclasses/tags.py b/evennia/typeclasses/tags.py
index a486835e50b..7dac017777e 100644
--- a/evennia/typeclasses/tags.py
+++ b/evennia/typeclasses/tags.py
@@ -9,7 +9,6 @@
 respective handlers.
 
 """
-from builtins import object
 from collections import defaultdict
 
 from django.conf import settings
@@ -19,11 +18,11 @@
 
 _TYPECLASS_AGGRESSIVE_CACHE = settings.TYPECLASS_AGGRESSIVE_CACHE
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Tags
 #
-#------------------------------------------------------------
+# ------------------------------------------------------------
 
 
 class Tag(models.Model):
@@ -49,40 +48,60 @@ class Tag(models.Model):
     default search functions of Evennia to allow quick searches by alias.
 
     """
-    db_key = models.CharField('key', max_length=255, null=True,
-                              help_text="tag identifier", db_index=True)
-    db_category = models.CharField('category', max_length=64, null=True,
-                                   help_text="tag category", db_index=True)
-    db_data = models.TextField('data', null=True, blank=True,
-                               help_text="optional data field with extra information. This is not searched for.")
+
+    db_key = models.CharField(
+        "key", max_length=255, null=True, help_text="tag identifier", db_index=True
+    )
+    db_category = models.CharField(
+        "category", max_length=64, null=True, help_text="tag category", db_index=True
+    )
+    db_data = models.TextField(
+        "data",
+        null=True,
+        blank=True,
+        help_text="optional data field with extra information. This is not searched for.",
+    )
     # this is "objectdb" etc. Required behind the scenes
-    db_model = models.CharField('model', max_length=32, null=True, help_text="database model to Tag", db_index=True)
+    db_model = models.CharField(
+        "model", max_length=32, null=True, help_text="database model to Tag", db_index=True
+    )
     # this is None, alias or permission
-    db_tagtype = models.CharField('tagtype', max_length=16, null=True, help_text="overall type of Tag", db_index=True)
+    db_tagtype = models.CharField(
+        "tagtype",
+        max_length=16,
+        null=True,
+        blank=True,
+        help_text="overall type of Tag",
+        db_index=True,
+    )
 
     class Meta(object):
         "Define Django meta options"
         verbose_name = "Tag"
-        unique_together = (('db_key', 'db_category', 'db_tagtype', 'db_model'),)
-        index_together = (('db_key', 'db_category', 'db_tagtype', 'db_model'),)
+        unique_together = (("db_key", "db_category", "db_tagtype", "db_model"),)
+        index_together = (("db_key", "db_category", "db_tagtype", "db_model"),)
 
     def __lt__(self, other):
         return str(self) < str(other)
 
-
     def __str__(self):
-        return str("<Tag: %s%s>" % (self.db_key, "(category:%s)" % self.db_category if self.db_category else ""))
+        return str(
+            "<Tag: %s%s>"
+            % (self.db_key, "(category:%s)" % self.db_category if self.db_category else "")
+        )
 
 
 #
 # Handlers making use of the Tags model
 #
 
+
 class TagHandler(object):
     """
     Generic tag-handler. Accessed via TypedObject.tags.
 
     """
+
     _m2m_fieldname = "db_tags"
     _tagtype = None
 
@@ -107,13 +126,26 @@ def __init__(self, obj):
 
     def _fullcache(self):
         "Cache all tags of this object"
-        query = {"%s__id" % self._model: self._objid,
-                 "tag__db_model": self._model,
-                 "tag__db_tagtype": self._tagtype}
-        tags = [conn.tag for conn in getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)]
-        self._cache = dict(("%s-%s" % (to_str(tag.db_key).lower(),
-                                       tag.db_category.lower() if tag.db_category else None),
-                            tag) for tag in tags)
+        query = {
+            "%s__id" % self._model: self._objid,
+            "tag__db_model": self._model,
+            "tag__db_tagtype": self._tagtype,
+        }
+        tags = [
+            conn.tag
+            for conn in getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)
+        ]
+        self._cache = dict(
+            (
+                "%s-%s"
+                % (
+                    to_str(tag.db_key).lower(),
+                    tag.db_category.lower() if tag.db_category else None,
+                ),
+                tag,
+            )
+            for tag in tags
+        )
         self._cache_complete = True
 
     def _getcache(self, key=None, category=None):
@@ -151,11 +183,13 @@ def _getcache(self, key=None, category=None):
             if tag:
                 return [tag]  # return cached entity
             else:
-                query = {"%s__id" % self._model: self._objid,
-                         "tag__db_model": self._model,
-                         "tag__db_tagtype": self._tagtype,
-                         "tag__db_key__iexact": key.lower(),
-                         "tag__db_category__iexact": category.lower() if category else None}
+                query = {
+                    "%s__id" % self._model: self._objid,
+                    "tag__db_model": self._model,
+                    "tag__db_tagtype": self._tagtype,
+                    "tag__db_key__iexact": key.lower(),
+                    "tag__db_category__iexact": category.lower() if category else None,
+                }
                 conn = getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query)
                 if conn:
                     tag = conn[0].tag
@@ -170,12 +204,18 @@ def _getcache(self, key=None, category=None):
                 return [tag for key, tag in self._cache.items() if key.endswith(catkey)]
             else:
                 # we have to query to make this category up-date in the cache
-                query = {"%s__id" % self._model: self._objid,
-                         "tag__db_model": self._model,
-                         "tag__db_tagtype": self._tagtype,
-                         "tag__db_category__iexact": category.lower() if category else None}
-                tags = [conn.tag for conn in getattr(self.obj,
-                                                     self._m2m_fieldname).through.objects.filter(**query)]
+                query = {
+                    "%s__id" % self._model: self._objid,
+                    "tag__db_model": self._model,
+                    "tag__db_tagtype": self._tagtype,
+                    "tag__db_category__iexact": category.lower() if category else None,
+                }
+                tags = [
+                    conn.tag
+                    for conn in getattr(self.obj, self._m2m_fieldname).through.objects.filter(
+                        **query
+                    )
+                ]
                 for tag in tags:
                     cachekey = "%s-%s" % (tag.db_key, category)
                     self._cache[cachekey] = tag
@@ -257,14 +297,15 @@ def add(self, tag=None, category=None, data=None):
         for tagstr in make_iter(tag):
             if not tagstr:
                 continue
-            tagstr = tagstr.strip().lower()
-            category = category.strip().lower() if category else category
+            tagstr = str(tagstr).strip().lower()
+            category = str(category).strip().lower() if category else category
             data = str(data) if data is not None else None
             # this will only create tag if no matches existed beforehand (it
             # will overload data on an existing tag since that is not
             # considered part of making the tag unique)
-            tagobj = self.obj.__class__.objects.create_tag(key=tagstr, category=category, data=data,
-                                                           tagtype=self._tagtype)
+            tagobj = self.obj.__class__.objects.create_tag(
+                key=tagstr, category=category, data=data, tagtype=self._tagtype
+            )
             getattr(self.obj, self._m2m_fieldname).add(tagobj)
             self._setcache(tagstr, category, tagobj)
 
@@ -294,8 +335,12 @@ def get(self, key=None, default=None, category=None, return_tagobj=False, return
         ret = []
         for keystr in make_iter(key):
             # note - the _getcache call removes case sensitivity for us
-            ret.extend([tag if return_tagobj else to_str(tag.db_key)
-                        for tag in self._getcache(keystr, category)])
+            ret.extend(
+                [
+                    tag if return_tagobj else to_str(tag.db_key)
+                    for tag in self._getcache(keystr, category)
+                ]
+            )
         if return_list:
             return ret if ret else [default] if default is not None else []
         return ret[0] if len(ret) == 1 else (ret if ret else default)
@@ -329,9 +374,8 @@ def remove(self, key=None, category=None):
             # that when no objects reference the tag anymore (but how to check)?
             # For now, tags are never deleted, only their connection to objects.
             tagobj = getattr(self.obj, self._m2m_fieldname).filter(
-                db_key=tagstr, db_category=category,
-                db_model=self._model,
-                db_tagtype=self._tagtype)
+                db_key=tagstr, db_category=category, db_model=self._model, db_tagtype=self._tagtype
+            )
             if tagobj:
                 getattr(self.obj, self._m2m_fieldname).remove(tagobj[0])
             self._delcache(key, category)
@@ -348,9 +392,11 @@ def clear(self, category=None):
         """
         if not self._cache_complete:
             self._fullcache()
-        query = {"%s__id" % self._model: self._objid,
-                 "tag__db_model": self._model,
-                 "tag__db_tagtype": self._tagtype}
+        query = {
+            "%s__id" % self._model: self._objid,
+            "tag__db_model": self._model,
+            "tag__db_tagtype": self._tagtype,
+        }
         if category:
             query["tag__db_category"] = category.strip().lower()
         getattr(self.obj, self._m2m_fieldname).through.objects.filter(**query).delete()
@@ -377,7 +423,7 @@ def all(self, return_key_and_category=False, return_objs=False):
             self._fullcache()
         tags = sorted(self._cache.values())
         if return_key_and_category:
-                # return tuple (key, category)
+            # return tuple (key, category)
             return [(to_str(tag.db_key), tag.db_category) for tag in tags]
         elif return_objs:
             return tags
@@ -423,6 +469,7 @@ class AliasHandler(TagHandler):
     A handler for the Alias Tag type.
 
     """
+
     _tagtype = "alias"
 
 
@@ -431,4 +478,5 @@ class PermissionHandler(TagHandler):
     A handler for the Permission Tag type.
 
     """
+
     _tagtype = "permission"
diff --git a/evennia/typeclasses/tests.py b/evennia/typeclasses/tests.py
index cb52015d851..2c52fa5c2f1 100644
--- a/evennia/typeclasses/tests.py
+++ b/evennia/typeclasses/tests.py
@@ -12,8 +12,8 @@
 
 class TestAttributes(EvenniaTest):
     def test_attrhandler(self):
-        key = 'testattr'
-        value = 'test attr value '
+        key = "testattr"
+        value = "test attr value "
         self.obj1.attributes.add(key, value)
         self.assertEqual(self.obj1.attributes.get(key), value)
         self.obj1.db.testattr = value
@@ -22,13 +22,13 @@ def test_attrhandler(self):
     def test_weird_text_save(self):
         "test 'weird' text type (different in py2 vs py3)"
         from django.utils.safestring import SafeText
-        key = 'test attr 2'
-        value = SafeText('test attr value 2')
+
+        key = "test attr 2"
+        value = SafeText("test attr value 2")
         self.obj1.attributes.add(key, value)
         self.assertEqual(self.obj1.attributes.get(key), value)
 
 
-
 class TestTypedObjectManager(EvenniaTest):
     def _manager(self, methodname, *args, **kwargs):
         return list(getattr(self.obj1.__class__.objects, methodname)(*args, **kwargs))
@@ -53,7 +53,7 @@ def test_get_by_tag_no_category(self):
 
     def test_get_by_tag_and_category(self):
         self.obj1.tags.add("tag5", "category1")
-        self.obj1.tags.add("tag6", )
+        self.obj1.tags.add("tag6")
         self.obj1.tags.add("tag7", "category1")
         self.obj1.tags.add("tag6", "category3")
         self.obj1.tags.add("tag7", "category4")
@@ -65,14 +65,19 @@ def test_get_by_tag_and_category(self):
         self.assertEqual(self._manager("get_by_tag", "tag5", "category1"), [self.obj1, self.obj2])
         self.assertEqual(self._manager("get_by_tag", "tag6", "category1"), [])
         self.assertEqual(self._manager("get_by_tag", "tag6", "category3"), [self.obj1, self.obj2])
-        self.assertEqual(self._manager("get_by_tag", ["tag5", "tag6"],
-                                        ["category1", "category3"]), [self.obj1, self.obj2])
-        self.assertEqual(self._manager("get_by_tag", ["tag5", "tag7"],
-                                        "category1"), [self.obj1, self.obj2])
+        self.assertEqual(
+            self._manager("get_by_tag", ["tag5", "tag6"], ["category1", "category3"]),
+            [self.obj1, self.obj2],
+        )
+        self.assertEqual(
+            self._manager("get_by_tag", ["tag5", "tag7"], "category1"), [self.obj1, self.obj2]
+        )
         self.assertEqual(self._manager("get_by_tag", category="category1"), [self.obj1, self.obj2])
         self.assertEqual(self._manager("get_by_tag", category="category2"), [self.obj2])
-        self.assertEqual(self._manager("get_by_tag", category=["category1", "category3"]),
-                          [self.obj1, self.obj2])
-        self.assertEqual(self._manager("get_by_tag", category=["category1", "category2"]),
-                          [self.obj2])
+        self.assertEqual(
+            self._manager("get_by_tag", category=["category1", "category3"]), [self.obj1, self.obj2]
+        )
+        self.assertEqual(
+            self._manager("get_by_tag", category=["category1", "category2"]), [self.obj2]
+        )
         self.assertEqual(self._manager("get_by_tag", category=["category5", "category4"]), [])
diff --git a/evennia/utils/ansi.py b/evennia/utils/ansi.py
index a10c6a4e2ca..ec2b1b3378e 100644
--- a/evennia/utils/ansi.py
+++ b/evennia/utils/ansi.py
@@ -14,7 +14,6 @@
 
 """
 import functools
-from builtins import object, range
 
 import re
 from collections import OrderedDict
@@ -25,7 +24,6 @@
 from evennia.utils import logger
 
 from evennia.utils.utils import to_str
-from future.utils import with_metaclass
 
 
 # ANSI definitions
@@ -92,57 +90,50 @@ class ANSIParser(object):
     # Mapping using {r {n etc
 
     ansi_map = [
-
         # alternative |-format
-
-        (r'|n', ANSI_NORMAL),          # reset
-        (r'|/', ANSI_RETURN),          # line break
-        (r'|-', ANSI_TAB),             # tab
-        (r'|_', ANSI_SPACE),           # space
-        (r'|*', ANSI_INVERSE),         # invert
-        (r'|^', ANSI_BLINK),           # blinking text (very annoying and not supported by all clients)
-        (r'|u', ANSI_UNDERLINE),       # underline
-
-        (r'|r', ANSI_HILITE + ANSI_RED),
-        (r'|g', ANSI_HILITE + ANSI_GREEN),
-        (r'|y', ANSI_HILITE + ANSI_YELLOW),
-        (r'|b', ANSI_HILITE + ANSI_BLUE),
-        (r'|m', ANSI_HILITE + ANSI_MAGENTA),
-        (r'|c', ANSI_HILITE + ANSI_CYAN),
-        (r'|w', ANSI_HILITE + ANSI_WHITE),  # pure white
-        (r'|x', ANSI_HILITE + ANSI_BLACK),  # dark grey
-
-        (r'|R', ANSI_UNHILITE + ANSI_RED),
-        (r'|G', ANSI_UNHILITE + ANSI_GREEN),
-        (r'|Y', ANSI_UNHILITE + ANSI_YELLOW),
-        (r'|B', ANSI_UNHILITE + ANSI_BLUE),
-        (r'|M', ANSI_UNHILITE + ANSI_MAGENTA),
-        (r'|C', ANSI_UNHILITE + ANSI_CYAN),
-        (r'|W', ANSI_UNHILITE + ANSI_WHITE),  # light grey
-        (r'|X', ANSI_UNHILITE + ANSI_BLACK),  # pure black
-
+        (r"|n", ANSI_NORMAL),  # reset
+        (r"|/", ANSI_RETURN),  # line break
+        (r"|-", ANSI_TAB),  # tab
+        (r"|_", ANSI_SPACE),  # space
+        (r"|*", ANSI_INVERSE),  # invert
+        (r"|^", ANSI_BLINK),  # blinking text (very annoying and not supported by all clients)
+        (r"|u", ANSI_UNDERLINE),  # underline
+        (r"|r", ANSI_HILITE + ANSI_RED),
+        (r"|g", ANSI_HILITE + ANSI_GREEN),
+        (r"|y", ANSI_HILITE + ANSI_YELLOW),
+        (r"|b", ANSI_HILITE + ANSI_BLUE),
+        (r"|m", ANSI_HILITE + ANSI_MAGENTA),
+        (r"|c", ANSI_HILITE + ANSI_CYAN),
+        (r"|w", ANSI_HILITE + ANSI_WHITE),  # pure white
+        (r"|x", ANSI_HILITE + ANSI_BLACK),  # dark grey
+        (r"|R", ANSI_UNHILITE + ANSI_RED),
+        (r"|G", ANSI_UNHILITE + ANSI_GREEN),
+        (r"|Y", ANSI_UNHILITE + ANSI_YELLOW),
+        (r"|B", ANSI_UNHILITE + ANSI_BLUE),
+        (r"|M", ANSI_UNHILITE + ANSI_MAGENTA),
+        (r"|C", ANSI_UNHILITE + ANSI_CYAN),
+        (r"|W", ANSI_UNHILITE + ANSI_WHITE),  # light grey
+        (r"|X", ANSI_UNHILITE + ANSI_BLACK),  # pure black
         # hilight-able colors
-        (r'|h', ANSI_HILITE),
-        (r'|H', ANSI_UNHILITE),
-
-        (r'|!R', ANSI_RED),
-        (r'|!G', ANSI_GREEN),
-        (r'|!Y', ANSI_YELLOW),
-        (r'|!B', ANSI_BLUE),
-        (r'|!M', ANSI_MAGENTA),
-        (r'|!C', ANSI_CYAN),
-        (r'|!W', ANSI_WHITE),  # light grey
-        (r'|!X', ANSI_BLACK),  # pure black
-
+        (r"|h", ANSI_HILITE),
+        (r"|H", ANSI_UNHILITE),
+        (r"|!R", ANSI_RED),
+        (r"|!G", ANSI_GREEN),
+        (r"|!Y", ANSI_YELLOW),
+        (r"|!B", ANSI_BLUE),
+        (r"|!M", ANSI_MAGENTA),
+        (r"|!C", ANSI_CYAN),
+        (r"|!W", ANSI_WHITE),  # light grey
+        (r"|!X", ANSI_BLACK),  # pure black
         # normal ANSI backgrounds
-        (r'|[R', ANSI_BACK_RED),
-        (r'|[G', ANSI_BACK_GREEN),
-        (r'|[Y', ANSI_BACK_YELLOW),
-        (r'|[B', ANSI_BACK_BLUE),
-        (r'|[M', ANSI_BACK_MAGENTA),
-        (r'|[C', ANSI_BACK_CYAN),
-        (r'|[W', ANSI_BACK_WHITE),    # light grey background
-        (r'|[X', ANSI_BACK_BLACK)     # pure black background
+        (r"|[R", ANSI_BACK_RED),
+        (r"|[G", ANSI_BACK_GREEN),
+        (r"|[Y", ANSI_BACK_YELLOW),
+        (r"|[B", ANSI_BACK_BLUE),
+        (r"|[M", ANSI_BACK_MAGENTA),
+        (r"|[C", ANSI_BACK_CYAN),
+        (r"|[W", ANSI_BACK_WHITE),  # light grey background
+        (r"|[X", ANSI_BACK_BLACK),  # pure black background
     ]
 
     ansi_xterm256_bright_bg_map = [
@@ -150,16 +141,16 @@ class ANSIParser(object):
         # standard does not support it (will
         # fallback to dark ANSI background colors if xterm256
         # is not supported by client)
-
         # |-style variations
-        (r'|[r', r'|[500'),
-        (r'|[g', r'|[050'),
-        (r'|[y', r'|[550'),
-        (r'|[b', r'|[005'),
-        (r'|[m', r'|[505'),
-        (r'|[c', r'|[055'),
-        (r'|[w', r'|[555'),     # white background
-        (r'|[x', r'|[222')]     # dark grey background
+        (r"|[r", r"|[500"),
+        (r"|[g", r"|[050"),
+        (r"|[y", r"|[550"),
+        (r"|[b", r"|[005"),
+        (r"|[m", r"|[505"),
+        (r"|[c", r"|[055"),
+        (r"|[w", r"|[555"),  # white background
+        (r"|[x", r"|[222"),
+    ]  # dark grey background
 
     # xterm256. These are replaced directly by
     # the sub_xterm256 method
@@ -172,10 +163,10 @@ class ANSIParser(object):
         xterm256_gbg = settings.COLOR_XTERM256_EXTRA_GBG
         ansi_xterm256_bright_bg_map = settings.COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP
     else:
-        xterm256_fg = [r'\|([0-5])([0-5])([0-5])']     # |123 - foreground colour
-        xterm256_bg = [r'\|\[([0-5])([0-5])([0-5])']   # |[123 - background colour
-        xterm256_gfg = [r'\|=([a-z])']      # |=a - greyscale foreground
-        xterm256_gbg = [r'\|\[=([a-z])']      # |[=a - greyscale background
+        xterm256_fg = [r"\|([0-5])([0-5])([0-5])"]  # |123 - foreground colour
+        xterm256_bg = [r"\|\[([0-5])([0-5])([0-5])"]  # |[123 - background colour
+        xterm256_gfg = [r"\|=([a-z])"]  # |=a - greyscale foreground
+        xterm256_gbg = [r"\|\[=([a-z])"]  # |[=a - greyscale background
         ansi_map += settings.COLOR_ANSI_EXTRA_MAP
         xterm256_fg += settings.COLOR_XTERM256_EXTRA_FG
         xterm256_bg += settings.COLOR_XTERM256_EXTRA_BG
@@ -183,11 +174,13 @@ class ANSIParser(object):
         xterm256_gbg += settings.COLOR_XTERM256_EXTRA_GBG
         ansi_xterm256_bright_bg_map += settings.COLOR_ANSI_XTERM256_BRIGHT_BG_EXTRA_MAP
 
-    mxp_re = r'\|lc(.*?)\|lt(.*?)\|le'
+    mxp_re = r"\|lc(.*?)\|lt(.*?)\|le"
 
     # prepare regex matching
-    brightbg_sub = re.compile(r"|".join([r"(?<!\|)%s" % re.escape(tup[0])
-                                         for tup in ansi_xterm256_bright_bg_map]), re.DOTALL)
+    brightbg_sub = re.compile(
+        r"|".join([r"(?<!\|)%s" % re.escape(tup[0]) for tup in ansi_xterm256_bright_bg_map]),
+        re.DOTALL,
+    )
     xterm256_fg_sub = re.compile(r"|".join(xterm256_fg), re.DOTALL)
     xterm256_bg_sub = re.compile(r"|".join(xterm256_bg), re.DOTALL)
     xterm256_gfg_sub = re.compile(r"|".join(xterm256_gfg), re.DOTALL)
@@ -258,7 +251,7 @@ def sub_xterm256(self, rgbmatch, use_xterm256=False, color_type="fg"):
             return ""
 
         # get tag, stripping the initial marker
-        #rgbtag = rgbmatch.group()[1:]
+        # rgbtag = rgbmatch.group()[1:]
 
         background = color_type in ("bg", "gbg")
         grayscale = color_type in ("gfg", "gbg")
@@ -278,10 +271,10 @@ def sub_xterm256(self, rgbmatch, use_xterm256=False, color_type="fg"):
                 logger.log_trace()
                 return rgbmatch.group(0)
 
-            if letter == 'a':
-                colval = 16     # pure black @ index 16 (first color cube entry)
-            elif letter == 'z':
-                colval = 231    # pure white @ index 231 (last color cube entry)
+            if letter == "a":
+                colval = 16  # pure black @ index 16 (first color cube entry)
+            elif letter == "z":
+                colval = 231  # pure white @ index 231 (last color cube entry)
             else:
                 # letter in range [b..y] (exactly 24 values!)
                 colval = 134 + ord(letter)
@@ -350,7 +343,7 @@ def sub_xterm256(self, rgbmatch, use_xterm256=False, color_type="fg"):
                     return ANSI_HILITE + ANSI_CYAN
                 else:
                     return ANSI_NORMAL + ANSI_CYAN
-            else:    # mostly blue
+            else:  # mostly blue
                 if background:
                     return ANSI_BACK_BLUE
                 elif blue >= 3:
@@ -382,7 +375,7 @@ def strip_mxp(self, string):
             string (str): The processed string.
 
         """
-        return self.mxp_sub.sub(r'\2', string)
+        return self.mxp_sub.sub(r"\2", string)
 
     def parse_ansi(self, string, strip_ansi=False, xterm256=False, mxp=False):
         """
@@ -400,14 +393,14 @@ def parse_ansi(self, string, strip_ansi=False, xterm256=False, mxp=False):
             string (str): The parsed string.
 
         """
-        if hasattr(string, '_raw_string'):
+        if hasattr(string, "_raw_string"):
             if strip_ansi:
                 return string.clean()
             else:
                 return string.raw()
 
         if not string:
-            return ''
+            return ""
 
         # check cached parsings
         global _PARSE_CACHE
@@ -467,6 +460,7 @@ def do_xterm256_gbg(part):
 # Access function
 #
 
+
 def parse_ansi(string, strip_ansi=False, parser=ANSI_PARSER, xterm256=False, mxp=False):
     """
     Parses a string, subbing color codes as needed.
@@ -526,7 +520,7 @@ def raw(string):
         string (str): The raw, escaped string.
 
     """
-    return string.replace('{', '{{').replace('|', '||')
+    return string.replace("{", "{{").replace("|", "||")
 
 
 def _spacing_preflight(func):
@@ -535,6 +529,7 @@ def _spacing_preflight(func):
     functions used for padding ANSIStrings.
 
     """
+
     @functools.wraps(func)
     def wrapped(self, width=78, fillchar=None):
         if fillchar is None:
@@ -547,6 +542,7 @@ def wrapped(self, width=78, fillchar=None):
         if _difference <= 0:
             return self
         return func(self, width, fillchar, _difference)
+
     return wrapped
 
 
@@ -556,8 +552,10 @@ def _query_super(func_name):
     of ANSIString.
 
     """
+
     def wrapped(self, *args, **kwargs):
         return getattr(self.clean(), func_name)(*args, **kwargs)
+
     return wrapped
 
 
@@ -566,11 +564,12 @@ def _on_raw(func_name):
     Like query_super, but makes the operation run on the raw string.
 
     """
+
     def wrapped(self, *args, **kwargs):
         args = list(args)
         try:
             string = args.pop(0)
-            if hasattr(string, '_raw_string'):
+            if hasattr(string, "_raw_string"):
                 args.insert(0, string.raw())
             else:
                 args.insert(0, string)
@@ -581,6 +580,7 @@ def wrapped(self, *args, **kwargs):
         if isinstance(result, str):
             return ANSIString(result, decoded=True)
         return result
+
     return wrapped
 
 
@@ -592,6 +592,7 @@ def _transform(func_name):
     with the resulting string.
 
     """
+
     def wrapped(self, *args, **kwargs):
         replacement_string = _query_super(func_name)(self, *args, **kwargs)
         to_string = []
@@ -603,9 +604,13 @@ def wrapped(self, *args, **kwargs):
                 to_string.append(replacement_string[char_counter])
                 char_counter += 1
         return ANSIString(
-            ''.join(to_string), decoded=True,
-            code_indexes=self._code_indexes, char_indexes=self._char_indexes,
-            clean_string=replacement_string)
+            "".join(to_string),
+            decoded=True,
+            code_indexes=self._code_indexes,
+            char_indexes=self._char_indexes,
+            clean_string=replacement_string,
+        )
+
     return wrapped
 
 
@@ -615,23 +620,34 @@ class ANSIMeta(type):
     base class. We apply them here, as part of the classes construction.
 
     """
+
     def __init__(cls, *args, **kwargs):
         for func_name in [
-                'count', 'startswith', 'endswith', 'find', 'index', 'isalnum',
-                'isalpha', 'isdigit', 'islower', 'isspace', 'istitle', 'isupper',
-                'rfind', 'rindex', '__len__']:
+            "count",
+            "startswith",
+            "endswith",
+            "find",
+            "index",
+            "isalnum",
+            "isalpha",
+            "isdigit",
+            "islower",
+            "isspace",
+            "istitle",
+            "isupper",
+            "rfind",
+            "rindex",
+            "__len__",
+        ]:
             setattr(cls, func_name, _query_super(func_name))
-        for func_name in [
-                '__mod__', 'expandtabs', 'decode', 'replace', 'format',
-                'encode']:
+        for func_name in ["__mod__", "expandtabs", "decode", "replace", "format", "encode"]:
             setattr(cls, func_name, _on_raw(func_name))
-        for func_name in [
-                'capitalize', 'translate', 'lower', 'upper', 'swapcase']:
+        for func_name in ["capitalize", "translate", "lower", "upper", "swapcase"]:
             setattr(cls, func_name, _transform(func_name))
         super().__init__(*args, **kwargs)
 
 
-class ANSIString(with_metaclass(ANSIMeta, str)):
+class ANSIString(str, metaclass=ANSIMeta):
     """
     Unicode-like object that is aware of ANSI codes.
 
@@ -673,16 +689,18 @@ def __new__(cls, *args, **kwargs):
         string = args[0]
         if not isinstance(string, str):
             string = to_str(string)
-        parser = kwargs.get('parser', ANSI_PARSER)
-        decoded = kwargs.get('decoded', False) or hasattr(string, '_raw_string')
-        code_indexes = kwargs.pop('code_indexes', None)
-        char_indexes = kwargs.pop('char_indexes', None)
-        clean_string = kwargs.pop('clean_string', None)
+        parser = kwargs.get("parser", ANSI_PARSER)
+        decoded = kwargs.get("decoded", False) or hasattr(string, "_raw_string")
+        code_indexes = kwargs.pop("code_indexes", None)
+        char_indexes = kwargs.pop("char_indexes", None)
+        clean_string = kwargs.pop("clean_string", None)
         # All True, or All False, not just one.
         checks = [x is None for x in [code_indexes, char_indexes, clean_string]]
         if not len(set(checks)) == 1:
-            raise ValueError("You must specify code_indexes, char_indexes, "
-                             "and clean_string together, or not at all.")
+            raise ValueError(
+                "You must specify code_indexes, char_indexes, "
+                "and clean_string together, or not at all."
+            )
         if not all(checks):
             decoded = True
         if not decoded:
@@ -692,7 +710,7 @@ def __new__(cls, *args, **kwargs):
         elif clean_string is not None:
             # We have an explicit clean string.
             pass
-        elif hasattr(string, '_clean_string'):
+        elif hasattr(string, "_clean_string"):
             # It's already an ANSIString
             clean_string = string._clean_string
             code_indexes = string._code_indexes
@@ -703,7 +721,7 @@ def __new__(cls, *args, **kwargs):
             clean_string = parser.strip_raw_codes(string)
 
         if not isinstance(string, str):
-            string = string.decode('utf-8')
+            string = string.decode("utf-8")
 
         ansi_string = super().__new__(ANSIString, to_str(clean_string))
         ansi_string._raw_string = string
@@ -743,7 +761,7 @@ def __init__(self, *_, **kwargs):
         escapes, and which are for the readable text.
 
         """
-        self.parser = kwargs.pop('parser', ANSI_PARSER)
+        self.parser = kwargs.pop("parser", ANSI_PARSER)
         super().__init__()
         if self._code_indexes is None:
             self._code_indexes, self._char_indexes = self._get_indexes()
@@ -768,13 +786,14 @@ def _adder(cls, first, second):
         clean_string = first._clean_string + second._clean_string
         code_indexes = first._code_indexes[:]
         char_indexes = first._char_indexes[:]
-        code_indexes.extend(
-            cls._shifter(second._code_indexes, len(first._raw_string)))
-        char_indexes.extend(
-            cls._shifter(second._char_indexes, len(first._raw_string)))
-        return ANSIString(raw_string, code_indexes=code_indexes,
-                          char_indexes=char_indexes,
-                          clean_string=clean_string)
+        code_indexes.extend(cls._shifter(second._code_indexes, len(first._raw_string)))
+        char_indexes.extend(cls._shifter(second._char_indexes, len(first._raw_string)))
+        return ANSIString(
+            raw_string,
+            code_indexes=code_indexes,
+            char_indexes=char_indexes,
+            clean_string=clean_string,
+        )
 
     def __add__(self, other):
         """
@@ -827,11 +846,11 @@ def _slice(self, slc):
         slice_indexes = self._char_indexes[slc]
         # If it's the end of the string, we need to append final color codes.
         if not slice_indexes:
-            return ANSIString('')
+            return ANSIString("")
         try:
             string = self[slc.start or 0]._raw_string
         except IndexError:
-            return ANSIString('')
+            return ANSIString("")
         last_mark = slice_indexes[0]
         # Check between the slice intervals for escape sequences.
         i = None
@@ -848,7 +867,7 @@ def _slice(self, slc):
         if i is not None:
             append_tail = self._get_interleving(self._char_indexes.index(i) + 1)
         else:
-            append_tail = ''
+            append_tail = ""
         return ANSIString(string + append_tail, decoded=True)
 
     def __getitem__(self, item):
@@ -870,11 +889,11 @@ def __getitem__(self, item):
         if self._char_indexes[-1] == self._char_indexes[item]:
             append_tail = self._get_interleving(item + 1)
         else:
-            append_tail = ''
+            append_tail = ""
         item = self._char_indexes[item]
 
         clean = self._raw_string[item]
-        result = ''
+        result = ""
         # Get the character they're after, and replay all escape sequences
         # previous to it.
         for index in range(0, item + 1):
@@ -922,7 +941,7 @@ def partition(self, sep, reverse=False):
                    separator.
 
         """
-        if hasattr(sep, '_clean_string'):
+        if hasattr(sep, "_clean_string"):
             sep = sep.clean()
         if reverse:
             parent_result = self._clean_string.rpartition(sep)
@@ -931,7 +950,7 @@ def partition(self, sep, reverse=False):
         current_index = 0
         result = tuple()
         for section in parent_result:
-            result += (self[current_index:current_index + len(section)],)
+            result += (self[current_index : current_index + len(section)],)
             current_index += len(section)
         return result
 
@@ -973,8 +992,8 @@ def _get_interleving(self, index):
         try:
             index = self._char_indexes[index - 1]
         except IndexError:
-            return ''
-        s = ''
+            return ""
+        s = ""
         while True:
             index += 1
             if index in self._char_indexes:
@@ -997,13 +1016,14 @@ def __mul__(self, other):
         code_indexes = self._code_indexes[:]
         char_indexes = self._char_indexes[:]
         for i in range(1, other + 1):
-            code_indexes.extend(
-                self._shifter(self._code_indexes, i * len(self._raw_string)))
-            char_indexes.extend(
-                self._shifter(self._char_indexes, i * len(self._raw_string)))
+            code_indexes.extend(self._shifter(self._code_indexes, i * len(self._raw_string)))
+            char_indexes.extend(self._shifter(self._char_indexes, i * len(self._raw_string)))
         return ANSIString(
-            raw_string, code_indexes=code_indexes, char_indexes=char_indexes,
-            clean_string=clean_string)
+            raw_string,
+            code_indexes=code_indexes,
+            char_indexes=char_indexes,
+            clean_string=clean_string,
+        )
 
     def __rmul__(self, other):
         return self.__mul__(other)
@@ -1048,9 +1068,9 @@ def split(self, by=None, maxsplit=-1):
             # Get character codes after the index as well.
             res.append(self[start:next])
             start = next + bylen
-            maxsplit -= 1   # NB. if it's already < 0, it stays < 0
+            maxsplit -= 1  # NB. if it's already < 0, it stays < 0
 
-        res.append(self[start:len(self)])
+        res.append(self[start : len(self)])
         if drop_spaces:
             return [part for part in res if part != ""]
         return res
@@ -1093,9 +1113,9 @@ def rsplit(self, by=None, maxsplit=-1):
             if next < 0:
                 break
             # Get character codes after the index as well.
-            res.append(self[next + bylen:end])
+            res.append(self[next + bylen : end])
             end = next
-            maxsplit -= 1   # NB. if it's already < 0, it stays < 0
+            maxsplit -= 1  # NB. if it's already < 0, it stays < 0
 
         res.append(self[:end])
         res.reverse()
@@ -1147,7 +1167,7 @@ def strip(self, chars=None):
                 ic -= 1
             ir2 -= 1
         rstripped = rstripped[::-1]
-        return ANSIString(lstripped + raw[ir1:ir2 + 1] + rstripped)
+        return ANSIString(lstripped + raw[ir1 : ir2 + 1] + rstripped)
 
     def lstrip(self, chars=None):
         """
@@ -1210,7 +1230,7 @@ def rstrip(self, chars=None):
                 ic -= 1
             ir2 -= 1
         rstripped = rstripped[::-1]
-        return ANSIString(raw[:ir2 + 1] + rstripped)
+        return ANSIString(raw[: ir2 + 1] + rstripped)
 
     def join(self, iterable):
         """
@@ -1232,7 +1252,7 @@ def join(self, iterable):
                     ANSIString('up, right, left, down')
 
         """
-        result = ANSIString('')
+        result = ANSIString("")
         last_item = None
         for item in iterable:
             if last_item is not None:
@@ -1252,15 +1272,18 @@ def _filler(self, char, amount):
         if not isinstance(char, ANSIString):
             line = char * amount
             return ANSIString(
-                char * amount, code_indexes=[], char_indexes=list(range(0, len(line))),
-                clean_string=char)
+                char * amount,
+                code_indexes=[],
+                char_indexes=list(range(0, len(line))),
+                clean_string=char,
+            )
         try:
             start = char._code_indexes[0]
         except IndexError:
             start = None
         end = char._char_indexes[0]
         prefix = char._raw_string[start:end]
-        postfix = char._raw_string[end + 1:]
+        postfix = char._raw_string[end + 1 :]
         line = char._clean_string * amount
         code_indexes = [i for i in range(0, len(prefix))]
         length = len(prefix) + len(line)
@@ -1268,8 +1291,8 @@ def _filler(self, char, amount):
         char_indexes = self._shifter(list(range(0, len(line))), len(prefix))
         raw_string = prefix + line + postfix
         return ANSIString(
-            raw_string, clean_string=line, char_indexes=char_indexes,
-            code_indexes=code_indexes)
+            raw_string, clean_string=line, char_indexes=char_indexes, code_indexes=code_indexes
+        )
 
     # The following methods should not be called with the '_difference' argument explicitly. This is
     # data provided by the wrapper _spacing_preflight.
diff --git a/evennia/utils/batchprocessors.py b/evennia/utils/batchprocessors.py
index 913b9041bbc..abceb9cd4a2 100644
--- a/evennia/utils/batchprocessors.py
+++ b/evennia/utils/batchprocessors.py
@@ -145,7 +145,7 @@
 ```
 #HEADER
 
-from django.config import settings
+from django.conf import settings
 from evennia.utils import create
 from types import basetypes
 
@@ -170,8 +170,6 @@
 script = create.create_script()
 ```
 """
-from builtins import object
-
 import re
 import codecs
 import traceback
@@ -183,15 +181,18 @@
 _RE_INSERT = re.compile(r"^\#INSERT (.*)$", re.MULTILINE)
 _RE_CLEANBLOCK = re.compile(r"^\#.*?$|^\s*$", re.MULTILINE)
 _RE_CMD_SPLIT = re.compile(r"^\#.*?$", re.MULTILINE)
-_RE_CODE_OR_HEADER = re.compile(r"((?:\A|^)#CODE|(?:/A|^)#HEADER|\A)(.*?)$(.*?)(?=^#CODE.*?$|^#HEADER.*?$|\Z)",
-                                re.MULTILINE + re.DOTALL)
+_RE_CODE_OR_HEADER = re.compile(
+    r"((?:\A|^)#CODE|(?:/A|^)#HEADER|\A)(.*?)$(.*?)(?=^#CODE.*?$|^#HEADER.*?$|\Z)",
+    re.MULTILINE + re.DOTALL,
+)
 
 
 # -------------------------------------------------------------
 # Helper function
 # -------------------------------------------------------------
 
-def read_batchfile(pythonpath, file_ending='.py'):
+
+def read_batchfile(pythonpath, file_ending=".py"):
     """
     This reads the contents of a batch-file.  Filename is considered
     to be a python path to a batch file relative the directory
@@ -224,7 +225,7 @@ def read_batchfile(pythonpath, file_ending='.py'):
         for file_encoding in _ENCODINGS:
             # try different encodings, in order
             try:
-                with codecs.open(abspath, 'r', encoding=file_encoding) as fobj:
+                with codecs.open(abspath, "r", encoding=file_encoding) as fobj:
                     text = fobj.read()
             except (ValueError, UnicodeDecodeError) as e:
                 # this means an encoding error; try another encoding
@@ -232,7 +233,7 @@ def read_batchfile(pythonpath, file_ending='.py'):
                 continue
             break
     if not text and decoderr:
-        raise UnicodeDecodeError("\n".join(decoderr))
+        raise UnicodeDecodeError("\n".join(decoderr), bytearray(), 0, 0, "")
 
     return text
 
@@ -243,6 +244,7 @@ def read_batchfile(pythonpath, file_ending='.py'):
 #
 # -------------------------------------------------------------
 
+
 class BatchCommandProcessor(object):
     """
     This class implements a batch-command processor.
@@ -269,7 +271,7 @@ def parse_file(self, pythonpath):
 
         """
 
-        text = "".join(read_batchfile(pythonpath, file_ending='.ev'))
+        text = "".join(read_batchfile(pythonpath, file_ending=".ev"))
 
         def replace_insert(match):
             """Map replace entries"""
@@ -281,7 +283,7 @@ def replace_insert(match):
 
         text = _RE_INSERT.sub(replace_insert, text)
         commands = _RE_CMD_SPLIT.split(text)
-        commands = [c.strip('\r\n') for c in commands]
+        commands = [c.strip("\r\n") for c in commands]
         commands = [c for c in commands if c]
 
         return commands
@@ -293,6 +295,7 @@ def replace_insert(match):
 #
 # -------------------------------------------------------------
 
+
 def tb_filename(tb):
     """Helper to get filename from traceback"""
     return tb.tb_frame.f_code.co_filename
@@ -338,7 +341,7 @@ def parse_file(self, pythonpath):
 
         """
 
-        text = "".join(read_batchfile(pythonpath, file_ending='.py'))
+        text = "".join(read_batchfile(pythonpath, file_ending=".py"))
 
         def replace_insert(match):
             """Run parse_file on the import before sub:ing it into this file"""
@@ -393,10 +396,12 @@ def code_exec(self, code, extra_environ=None, debug=False):
             environdict[key] = value
 
         # initializing the django settings at the top of code
-        code = "# batchcode evennia initialization: \n" \
-               "try: settings_module.configure()\n" \
-               "except RuntimeError: pass\n" \
-               "finally: del settings_module\n\n%s" % code
+        code = (
+            "# batchcode evennia initialization: \n"
+            "try: settings_module.configure()\n"
+            "except RuntimeError: pass\n"
+            "finally: del settings_module\n\n%s" % code
+        )
 
         # execute the block
         try:
diff --git a/evennia/utils/containers.py b/evennia/utils/containers.py
index 615b22ebc1b..2450a6869f1 100644
--- a/evennia/utils/containers.py
+++ b/evennia/utils/containers.py
@@ -16,6 +16,9 @@
 from evennia.utils import logger
 
 
+SCRIPTDB = None
+
+
 class Container(object):
     """
     Base container class. A container is simply a storage object whose
@@ -25,6 +28,7 @@ class Container(object):
     The container is initialized by a list of modules containing callables.
 
     """
+
     storage_modules = []
 
     def __init__(self):
@@ -81,14 +85,15 @@ class OptionContainer(Container):
 
     Can access these as properties or dictionary-contents.
     """
+
     storage_modules = settings.OPTION_CLASS_MODULES
 
 
 class GlobalScriptContainer(Container):
     """
     Simple Handler object loaded by the Evennia API to contain and manage a
-    game's Global Scripts. Scripts to start are defined by
-    `settings.GLOBAL_SCRIPTS`.
+    game's Global Scripts. This will list global Scripts created on their own
+    but will also auto-(re)create scripts defined in `settings.GLOBAL_SCRIPTS`.
 
     Example:
         import evennia
@@ -99,72 +104,105 @@ class GlobalScriptContainer(Container):
         callables from settings but a custom dict of tuples.
 
     """
+
     def __init__(self):
         """
-        Initialize the container by preparing scripts. Lazy-load only when the
-        script is requested.
-
         Note: We must delay loading of typeclasses since this module may get
         initialized before Scripts are actually initialized.
 
         """
-        self.loaded_data = {key: {} if data is None else data
-                            for key, data in settings.GLOBAL_SCRIPTS.items()}
-        self.script_storage = {}
         self.typeclass_storage = None
-
-    def load_data(self):
-        """
-        This delayed import avoids trying to load Scripts before they are
-        initialized.
-
-        """
-        if self.typeclass_storage is None:
-            self.typeclass_storage = {}
-            for key, data in self.loaded_data.items():
-                try:
-                    typeclass = data.get('typeclass', settings.BASE_SCRIPT_TYPECLASS)
-                    self.typeclass_storage[key] = class_from_module(typeclass)
-                except ImportError as err:
-                    logger.log_err(
-                            f"GlobalScriptContainer could not start global script {key}: {err}")
+        self.loaded_data = {
+            key: {} if data is None else data for key, data in settings.GLOBAL_SCRIPTS.items()
+        }
+
+    def _get_scripts(self, key=None, default=None):
+        global SCRIPTDB
+        if not SCRIPTDB:
+            from evennia.scripts.models import ScriptDB as SCRIPTDB
+        if key:
+            try:
+                return SCRIPTDB.objects.get(db_key__exact=key, db_obj__isnull=True)
+            except SCRIPTDB.DoesNotExist:
+                return default
+        else:
+            return SCRIPTDB.objects.filter(db_obj__isnull=True)
 
     def _load_script(self, key):
-
         self.load_data()
 
         typeclass = self.typeclass_storage[key]
         found = typeclass.objects.filter(db_key=key).first()
-        interval = self.loaded_data[key].get('interval', None)
-        start_delay = self.loaded_data[key].get('start_delay', None)
-        repeats = self.loaded_data[key].get('repeats', 0)
-        desc = self.loaded_data[key].get('desc', '')
+        interval = self.loaded_data[key].get("interval", None)
+        start_delay = self.loaded_data[key].get("start_delay", None)
+        repeats = self.loaded_data[key].get("repeats", 0)
+        desc = self.loaded_data[key].get("desc", "")
 
         if not found:
-            new_script, errors = typeclass.create(key=key, persistent=True,
-                                                  interval=interval,
-                                                  start_delay=start_delay,
-                                                  repeats=repeats, desc=desc)
+            logger.log_info(f"GLOBAL_SCRIPTS: (Re)creating {key} ({typeclass}).")
+            new_script, errors = typeclass.create(
+                key=key,
+                persistent=True,
+                interval=interval,
+                start_delay=start_delay,
+                repeats=repeats,
+                desc=desc,
+            )
             if errors:
                 logger.log_err("\n".join(errors))
                 return None
 
             new_script.start()
-            self.script_storage[key] = new_script
             return new_script
 
-        if ((found.interval != interval) or
-                (found.start_delay != start_delay) or
-                (found.repeats != repeats)):
+        if (
+            (found.interval != interval)
+            or (found.start_delay != start_delay)
+            or (found.repeats != repeats)
+        ):
             found.restart(interval=interval, start_delay=start_delay, repeats=repeats)
         if found.desc != desc:
             found.desc = desc
-        self.script_storage[key] = found
         return found
 
+    def start(self):
+        """
+        Called last in evennia.__init__ to initialize the container late
+        (after script typeclasses have finished loading).
+
+        We include all global scripts in the handler and
+        make sure to auto-load time-based scripts.
+
+        """
+        # populate self.typeclass_storage
+        self.load_data()
+
+        # start registered scripts
+        for key in self.loaded_data:
+            self._load_script(key)
+
+    def load_data(self):
+        """
+        This delayed import avoids trying to load Scripts before they are
+        initialized.
+
+        """
+        if self.typeclass_storage is None:
+            self.typeclass_storage = {}
+            for key, data in self.loaded_data.items():
+                try:
+                    typeclass = data.get("typeclass", settings.BASE_SCRIPT_TYPECLASS)
+                    self.typeclass_storage[key] = class_from_module(typeclass)
+                except ImportError as err:
+                    logger.log_err(
+                        f"GlobalScriptContainer could not start global script {key}: {err}"
+                    )
+
     def get(self, key, default=None):
         """
-        Retrive data by key (in case of not knowing it beforehand).
+        Retrive data by key (in case of not knowing it beforehand). Any
+        scripts that are in settings.GLOBAL_SCRIPTS that are not found
+        will be recreated on-demand.
 
         Args:
             key (str): The name of the script.
@@ -174,20 +212,28 @@ def get(self, key, default=None):
         Returns:
             any (any): The data loaded on this container.
         """
-
-        if key not in self.loaded_data:
+        res = self._get_scripts(key)
+        if not res:
+            if key in self.loaded_data:
+                # recreate if we have the info
+                return self._load_script(key) or default
             return default
-        return self.script_storage.get(key) or self._load_script(key)
+        return res
 
     def all(self):
         """
-        Get all scripts.
+        Get all global scripts. Note that this will not auto-start
+        scripts defined in settings.
 
         Returns:
             scripts (list): All global script objects stored on the container.
 
         """
-        return [self.__getattr__(key) for key in self.loaded_data]
+        self.typeclass_storage = None
+        self.load_data()
+        for key in self.loaded_data:
+            self._load_script(key)
+        return self._get_scripts(None)
 
 
 # Create all singletons
diff --git a/evennia/utils/create.py b/evennia/utils/create.py
index 36729a62eb1..0f6c1f22dd7 100644
--- a/evennia/utils/create.py
+++ b/evennia/utils/create.py
@@ -44,8 +44,14 @@
 
 
 # limit symbol import from API
-__all__ = ("create_object", "create_script", "create_help_entry",
-           "create_message", "create_channel", "create_account")
+__all__ = (
+    "create_object",
+    "create_script",
+    "create_help_entry",
+    "create_message",
+    "create_channel",
+    "create_account",
+)
 
 _GA = object.__getattribute__
 
@@ -53,10 +59,21 @@
 # Game Object creation
 
 
-def create_object(typeclass=None, key=None, location=None, home=None,
-                  permissions=None, locks=None, aliases=None, tags=None,
-                  destination=None, report_to=None, nohome=False, attributes=None,
-                  nattributes=None):
+def create_object(
+    typeclass=None,
+    key=None,
+    location=None,
+    home=None,
+    permissions=None,
+    locks=None,
+    aliases=None,
+    tags=None,
+    destination=None,
+    report_to=None,
+    nohome=False,
+    attributes=None,
+    nattributes=None,
+):
     """
 
     Create a new in-game object.
@@ -120,18 +137,34 @@ def create_object(typeclass=None, key=None, location=None, home=None,
             home = dbid_to_obj(settings.DEFAULT_HOME, _ObjectDB) if not nohome else None
         except _ObjectDB.DoesNotExist:
             raise _ObjectDB.DoesNotExist(
-                "settings.DEFAULT_HOME (= '%s') does not exist, or the setting is malformed." %
-                settings.DEFAULT_HOME)
+                "settings.DEFAULT_HOME (= '%s') does not exist, or the setting is malformed."
+                % settings.DEFAULT_HOME
+            )
 
     # create new instance
-    new_object = typeclass(db_key=key, db_location=location,
-                           db_destination=destination, db_home=home,
-                           db_typeclass_path=typeclass.path)
+    new_object = typeclass(
+        db_key=key,
+        db_location=location,
+        db_destination=destination,
+        db_home=home,
+        db_typeclass_path=typeclass.path,
+    )
     # store the call signature for the signal
-    new_object._createdict = dict(key=key, location=location, destination=destination, home=home,
-                                  typeclass=typeclass.path, permissions=permissions, locks=locks,
-                                  aliases=aliases, tags=tags, report_to=report_to, nohome=nohome,
-                                  attributes=attributes, nattributes=nattributes)
+    new_object._createdict = dict(
+        key=key,
+        location=location,
+        destination=destination,
+        home=home,
+        typeclass=typeclass.path,
+        permissions=permissions,
+        locks=locks,
+        aliases=aliases,
+        tags=tags,
+        report_to=report_to,
+        nohome=nohome,
+        attributes=attributes,
+        nattributes=nattributes,
+    )
     # this will trigger the save signal which in turn calls the
     # at_first_save hook on the typeclass, where the _createdict can be
     # used.
@@ -149,10 +182,23 @@ def create_object(typeclass=None, key=None, location=None, home=None,
 #
 # Script creation
 
-def create_script(typeclass=None, key=None, obj=None, account=None, locks=None,
-                  interval=None, start_delay=None, repeats=None,
-                  persistent=None, autostart=True, report_to=None, desc=None,
-                  tags=None, attributes=None):
+
+def create_script(
+    typeclass=None,
+    key=None,
+    obj=None,
+    account=None,
+    locks=None,
+    interval=None,
+    start_delay=None,
+    repeats=None,
+    persistent=None,
+    autostart=True,
+    report_to=None,
+    desc=None,
+    tags=None,
+    attributes=None,
+):
     """
     Create a new script. All scripts are a combination of a database
     object that communicates with the database, and an typeclass that
@@ -225,10 +271,21 @@ def create_script(typeclass=None, key=None, obj=None, account=None, locks=None,
     new_script = typeclass(**kwarg)
 
     # store the call signature for the signal
-    new_script._createdict = dict(key=key, obj=obj, account=account, locks=locks, interval=interval,
-                                  start_delay=start_delay, repeats=repeats, persistent=persistent,
-                                  autostart=autostart, report_to=report_to, desc=desc,
-                                  tags=tags, attributes=attributes)
+    new_script._createdict = dict(
+        key=key,
+        obj=obj,
+        account=account,
+        locks=locks,
+        interval=interval,
+        start_delay=start_delay,
+        repeats=repeats,
+        persistent=persistent,
+        autostart=autostart,
+        report_to=report_to,
+        desc=desc,
+        tags=tags,
+        attributes=attributes,
+    )
     # this will trigger the save signal which in turn calls the
     # at_first_save hook on the typeclass, where the _createdict
     # can be used.
@@ -252,6 +309,7 @@ def create_script(typeclass=None, key=None, obj=None, account=None, locks=None,
 # Help entry creation
 #
 
+
 def create_help_entry(key, entrytext, category="General", locks=None, aliases=None):
     """
     Create a static help entry in the help database. Note that Command
@@ -304,6 +362,7 @@ def create_help_entry(key, entrytext, category="General", locks=None, aliases=No
 #
 # Comm system methods
 
+
 def create_message(senderobj, message, channels=None, receivers=None, locks=None, header=None):
     """
     Create a new communication Msg. Msgs represent a unit of
@@ -351,11 +410,10 @@ def create_message(senderobj, message, channels=None, receivers=None, locks=None
 
 
 message = create_message
+create_msg = create_message
 
 
-def create_channel(key, aliases=None, desc=None,
-                   locks=None, keep_log=True,
-                   typeclass=None):
+def create_channel(key, aliases=None, desc=None, locks=None, keep_log=True, typeclass=None):
     """
     Create A communication Channel. A Channel serves as a central hub
     for distributing Msgs to groups of people without specifying the
@@ -389,7 +447,9 @@ def create_channel(key, aliases=None, desc=None,
     new_channel = typeclass(db_key=key)
 
     # store call signature for the signal
-    new_channel._createdict = dict(key=key, aliases=aliases, desc=desc, locks=locks, keep_log=keep_log)
+    new_channel._createdict = dict(
+        key=key, aliases=aliases, desc=desc, locks=locks, keep_log=keep_log
+    )
 
     # this will trigger the save signal which in turn calls the
     # at_first_save hook on the typeclass, where the _createdict can be
@@ -409,12 +469,18 @@ def create_channel(key, aliases=None, desc=None,
 #
 
 
-def create_account(key, email, password,
-                   typeclass=None,
-                   is_superuser=False,
-                   locks=None, permissions=None,
-                   tags=None, attributes=None,
-                   report_to=None):
+def create_account(
+    key,
+    email,
+    password,
+    typeclass=None,
+    is_superuser=False,
+    locks=None,
+    permissions=None,
+    tags=None,
+    attributes=None,
+    report_to=None,
+):
     """
     This creates a new account.
 
@@ -477,9 +543,14 @@ def create_account(key, email, password,
     # base django auth.
     now = timezone.now()
     email = typeclass.objects.normalize_email(email)
-    new_account = typeclass(username=key, email=email,
-                            is_staff=is_superuser, is_superuser=is_superuser,
-                            last_login=now, date_joined=now)
+    new_account = typeclass(
+        username=key,
+        email=email,
+        is_staff=is_superuser,
+        is_superuser=is_superuser,
+        last_login=now,
+        date_joined=now,
+    )
     if password is not None:
         # the password may be None for 'fake' accounts, like bots
         valid, error = new_account.validate_password(password, new_account)
@@ -488,8 +559,9 @@ def create_account(key, email, password,
 
         new_account.set_password(password)
 
-    new_account._createdict = dict(locks=locks, permissions=permissions, report_to=report_to,
-                                   tags=tags, attributes=attributes)
+    new_account._createdict = dict(
+        locks=locks, permissions=permissions, report_to=report_to, tags=tags, attributes=attributes
+    )
     # saving will trigger the signal that calls the
     # at_first_save hook on the typeclass, where the _createdict
     # can be used.
diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py
index 6be5bebe5ad..b3e55d1ca67 100644
--- a/evennia/utils/dbserialize.py
+++ b/evennia/utils/dbserialize.py
@@ -18,11 +18,10 @@
 be out of sync with the database.
 
 """
-from builtins import object, int
-
 from functools import update_wrapper
 from collections import defaultdict, MutableSequence, MutableSet, MutableMapping
 from collections import OrderedDict, deque
+
 try:
     from pickle import dumps, loads
 except ImportError:
@@ -33,8 +32,7 @@
 from evennia.utils.utils import uses_database, is_iter, to_str, to_bytes
 from evennia.utils import logger
 
-__all__ = ("to_pickle", "from_pickle", "do_pickle", "do_unpickle",
-           "dbserialize", "dbunserialize")
+__all__ = ("to_pickle", "from_pickle", "do_pickle", "do_unpickle", "dbserialize", "dbunserialize")
 
 PICKLE_PROTOCOL = 2
 
@@ -42,7 +40,8 @@
 # message to send if editing an already deleted Attribute in a savermutable
 _ERROR_DELETED_ATTR = (
     "{cls_name} {obj} has had its root Attribute deleted. "
-    "It must be cast to a {non_saver_name} before it can be modified further.")
+    "It must be cast to a {non_saver_name} before it can be modified further."
+)
 
 
 def _get_mysql_db_version():
@@ -56,11 +55,13 @@ def _get_mysql_db_version():
 
     """
     from django.db import connection
+
     conn = connection.cursor()
     conn.execute("SELECT VERSION()")
     version = conn.fetchone()
     return version and str(version[0]) or ""
 
+
 # initialization and helpers
 
 
@@ -73,14 +74,14 @@ def _get_mysql_db_version():
 
 
 def _IS_PACKED_DBOBJ(o):
-    return isinstance(o, tuple) and len(o) == 4 and o[0] == '__packed_dbobj__'
+    return isinstance(o, tuple) and len(o) == 4 and o[0] == "__packed_dbobj__"
 
 
 def _IS_PACKED_SESSION(o):
-    return isinstance(o, tuple) and len(o) == 3 and o[0] == '__packed_session__'
+    return isinstance(o, tuple) and len(o) == 3 and o[0] == "__packed_session__"
 
 
-if uses_database("mysql") and _get_mysql_db_version() < '5.6.4':
+if uses_database("mysql") and _get_mysql_db_version() < "5.6.4":
     # mysql <5.6.4 don't support millisecond precision
     _DATESTRING = "%Y:%m:%d-%H:%M:%S:000000"
 else:
@@ -118,8 +119,11 @@ def _init_globals():
         _FROM_MODEL_MAP.update(dict((c.model, c.natural_key()) for c in ContentType.objects.all()))
     if not _TO_MODEL_MAP:
         from django.conf import settings
+
         _TO_MODEL_MAP = defaultdict(str)
-        _TO_MODEL_MAP.update(dict((c.natural_key(), c.model_class()) for c in ContentType.objects.all()))
+        _TO_MODEL_MAP.update(
+            dict((c.natural_key(), c.model_class()) for c in ContentType.objects.all())
+        )
         _IGNORE_DATETIME_MODELS = []
         for src_key, dst_key in settings.ATTRIBUTE_STORED_MODEL_RENAME:
             _TO_MODEL_MAP[src_key] = _TO_MODEL_MAP.get(dst_key, None)
@@ -141,6 +145,7 @@ def save_wrapper(self, *args, **kwargs):
         ret = method(self, *args, **kwargs)
         self._save_tree()
         return ret
+
     return update_wrapper(save_wrapper, method)
 
 
@@ -173,14 +178,18 @@ def _save_tree(self):
                     non_saver_name = cls_name.split("_Saver", 1)[1].lower()
                 except IndexError:
                     non_saver_name = cls_name
-                raise ValueError(_ERROR_DELETED_ATTR.format(cls_name=cls_name, obj=self,
-                                                            non_saver_name=non_saver_name))
+                raise ValueError(
+                    _ERROR_DELETED_ATTR.format(
+                        cls_name=cls_name, obj=self, non_saver_name=non_saver_name
+                    )
+                )
             self._db_obj.value = self
         else:
             logger.log_err("_SaverMutable %s has no root Attribute to save to." % self)
 
     def _convert_mutables(self, data):
         """converts mutables to Saver* variants and assigns ._parent property"""
+
         def process_tree(item, parent):
             """recursively populate the tree, storing parents"""
             dtype = type(item)
@@ -199,6 +208,7 @@ def process_tree(item, parent):
                 dat._data.update(process_tree(val, dat) for val in item)
                 return dat
             return item
+
         return process_tree(data, self)
 
     def __repr__(self):
@@ -261,7 +271,6 @@ def __ne__(self, other):
         except TypeError:
             return True
 
-
     def index(self, value, *args):
         return self._data.index(value, *args)
 
@@ -347,6 +356,7 @@ def _setmaxlen(self, value):
 
     def _delmaxlen(self):
         del self._data.maxlen
+
     maxlen = property(_getmaxlen, _setmaxlen, _delmaxlen)
 
     @_save
@@ -366,9 +376,13 @@ def rotate(self, *args):
         self._data.rotate(*args)
 
 
-_DESERIALIZE_MAPPING = {_SaverList.__name__: list, _SaverDict.__name__: dict,
-                        _SaverSet.__name__: set, _SaverOrderedDict.__name__: OrderedDict,
-                        _SaverDeque.__name__: deque}
+_DESERIALIZE_MAPPING = {
+    _SaverList.__name__: list,
+    _SaverDict.__name__: dict,
+    _SaverSet.__name__: set,
+    _SaverOrderedDict.__name__: OrderedDict,
+    _SaverDeque.__name__: deque,
+}
 
 
 def deserialize(obj):
@@ -377,16 +391,18 @@ def deserialize(obj):
     inside it back into their normal Python forms.
 
     """
+
     def _iter(obj):
         typ = type(obj)
         tname = typ.__name__
-        if tname in ('_SaverDict', 'dict'):
+        if tname in ("_SaverDict", "dict"):
             return {_iter(key): _iter(val) for key, val in obj.items()}
         elif tname in _DESERIALIZE_MAPPING:
             return _DESERIALIZE_MAPPING[tname](_iter(val) for val in obj)
         elif is_iter(obj):
             return typ(_iter(val) for val in obj)
         return obj
+
     return _iter(obj)
 
 
@@ -408,12 +424,19 @@ def pack_dbobj(item):
     """
     _init_globals()
     obj = item
-    natural_key = _FROM_MODEL_MAP[hasattr(obj, "id") and hasattr(obj, "db_date_created") and
-                                  hasattr(obj, '__dbclass__') and obj.__dbclass__.__name__.lower()]
+    natural_key = _FROM_MODEL_MAP[
+        hasattr(obj, "id")
+        and hasattr(obj, "db_date_created")
+        and hasattr(obj, "__dbclass__")
+        and obj.__dbclass__.__name__.lower()
+    ]
     # build the internal representation as a tuple
     #  ("__packed_dbobj__", key, creation_time, id)
-    return natural_key and ('__packed_dbobj__', natural_key,
-                            _TO_DATESTRING(obj), _GA(obj, "id")) or item
+    return (
+        natural_key
+        and ("__packed_dbobj__", natural_key, _TO_DATESTRING(obj), _GA(obj, "id"))
+        or item
+    )
 
 
 def unpack_dbobj(item):
@@ -472,9 +495,11 @@ def pack_session(item):
         # we require connection times to be identical for the Session
         # to be accepted as actually being a session (sessids gets
         # reused all the time).
-        return item.conn_time and item.sessid and ('__packed_session__',
-                                                   _GA(item, "sessid"),
-                                                   _GA(item, "conn_time"))
+        return (
+            item.conn_time
+            and item.sessid
+            and ("__packed_session__", _GA(item, "sessid"), _GA(item, "conn_time"))
+        )
     return None
 
 
@@ -500,6 +525,7 @@ def unpack_session(item):
         return session
     return None
 
+
 #
 # Access methods
 
@@ -519,6 +545,7 @@ def to_pickle(data):
         data (any): Pickled data.
 
     """
+
     def process_item(item):
         """Recursive processor and identification of data"""
         dtype = type(item)
@@ -537,7 +564,7 @@ def process_item(item):
         elif dtype in (deque, _SaverDeque):
             return deque(process_item(val) for val in item)
 
-        elif hasattr(item, '__iter__'):
+        elif hasattr(item, "__iter__"):
             # we try to conserve the iterable class, if not convert to list
             try:
                 return item.__class__([process_item(val) for val in item])
@@ -545,7 +572,14 @@ def process_item(item):
                 return [process_item(val) for val in item]
         elif hasattr(item, "sessid") and hasattr(item, "conn_time"):
             return pack_session(item)
-        return pack_dbobj(item)
+        try:
+            return pack_dbobj(item)
+        except TypeError:
+            return item
+        except Exception:
+            logger.log_error(f"The object {item} of type {type(item)} could not be stored.")
+            raise
+
     return process_item(data)
 
 
@@ -571,6 +605,7 @@ def from_pickle(data, db_obj=None):
         data (any): Unpickled data.
 
     """
+
     def process_item(item):
         """Recursive processor and identification of data"""
         dtype = type(item)
@@ -591,7 +626,7 @@ def process_item(item):
             return OrderedDict((process_item(key), process_item(val)) for key, val in item.items())
         elif dtype == deque:
             return deque(process_item(val) for val in item)
-        elif hasattr(item, '__iter__'):
+        elif hasattr(item, "__iter__"):
             try:
                 # we try to conserve the iterable class if
                 # it accepts an iterator
@@ -616,8 +651,9 @@ def process_tree(item, parent):
             return dat
         elif dtype == dict:
             dat = _SaverDict(_parent=parent)
-            dat._data.update((process_item(key), process_tree(val, dat))
-                             for key, val in item.items())
+            dat._data.update(
+                (process_item(key), process_tree(val, dat)) for key, val in item.items()
+            )
             return dat
         elif dtype == set:
             dat = _SaverSet(_parent=parent)
@@ -625,14 +661,15 @@ def process_tree(item, parent):
             return dat
         elif dtype == OrderedDict:
             dat = _SaverOrderedDict(_parent=parent)
-            dat._data.update((process_item(key), process_tree(val, dat))
-                             for key, val in item.items())
+            dat._data.update(
+                (process_item(key), process_tree(val, dat)) for key, val in item.items()
+            )
             return dat
         elif dtype == deque:
             dat = _SaverDeque(_parent=parent)
             dat._data.extend(process_item(val) for val in item)
             return dat
-        elif hasattr(item, '__iter__'):
+        elif hasattr(item, "__iter__"):
             try:
                 # we try to conserve the iterable class if it
                 # accepts an iterator
@@ -653,8 +690,9 @@ def process_tree(item, parent):
             return dat
         elif dtype == dict:
             dat = _SaverDict(_db_obj=db_obj)
-            dat._data.update((process_item(key), process_tree(val, dat))
-                             for key, val in data.items())
+            dat._data.update(
+                (process_item(key), process_tree(val, dat)) for key, val in data.items()
+            )
             return dat
         elif dtype == set:
             dat = _SaverSet(_db_obj=db_obj)
@@ -662,8 +700,9 @@ def process_tree(item, parent):
             return dat
         elif dtype == OrderedDict:
             dat = _SaverOrderedDict(_db_obj=db_obj)
-            dat._data.update((process_item(key), process_tree(val, dat))
-                             for key, val in data.items())
+            dat._data.update(
+                (process_item(key), process_tree(val, dat)) for key, val in data.items()
+            )
             return dat
         elif dtype == deque:
             dat = _SaverDeque(_db_obj=db_obj)
@@ -674,12 +713,20 @@ def process_tree(item, parent):
 
 def do_pickle(data):
     """Perform pickle to string"""
-    return dumps(data, protocol=PICKLE_PROTOCOL)
+    try:
+        return dumps(data, protocol=PICKLE_PROTOCOL)
+    except Exception:
+        logger.log_error(f"Could not pickle data for storage: {data}")
+        raise
 
 
 def do_unpickle(data):
     """Retrieve pickle from pickled string"""
-    return loads(to_bytes(data))
+    try:
+        return loads(to_bytes(data))
+    except Exception:
+        logger.log_error(f"Could not unpickle data from storage: {data}")
+        raise
 
 
 def dbserialize(data):
diff --git a/evennia/utils/eveditor.py b/evennia/utils/eveditor.py
index d2955c65008..3268c553f89 100644
--- a/evennia/utils/eveditor.py
+++ b/evennia/utils/eveditor.py
@@ -42,8 +42,6 @@
 and offers basic handling of indentation.
 
 """
-from builtins import object
-
 import re
 
 from django.conf import settings
@@ -117,7 +115,9 @@
  :<    - Decrease the level of automatic indentation for the next lines
  :>    - Increase the level of automatic indentation for the next lines
  :=    - Switch automatic indentation on/off
-""".lstrip("\n")
+""".lstrip(
+    "\n"
+)
 
 _ERROR_LOADFUNC = """
 {error}
@@ -150,10 +150,11 @@
 an eventual server reload - so save often!)|n
 """
 
-_TRACE_PERSISTENT_SAVING = \
-    "EvEditor persistent-mode error. Commonly, this is because one or " \
-    "more of the EvEditor callbacks could not be pickled, for example " \
+_TRACE_PERSISTENT_SAVING = (
+    "EvEditor persistent-mode error. Commonly, this is because one or "
+    "more of the EvEditor callbacks could not be pickled, for example "
     "because it's a class method or is defined inside another function."
+)
 
 
 _MSG_NO_UNDO = "Nothing to undo."
@@ -174,6 +175,7 @@ class CmdSaveYesNo(Command):
     nomatches (defaults to Yes), and avoid saves only if
     command was given specifically as "no" or "n".
     """
+
     key = _CMD_NOMATCH
     aliases = _CMD_NOINPUT
     locks = "cmd:all()"
@@ -196,6 +198,7 @@ def func(self):
 
 class SaveYesNoCmdSet(CmdSet):
     """Stores the yesno question"""
+
     key = "quitsave_yesno"
     priority = 1
     mergetype = "Replace"
@@ -211,10 +214,12 @@ def at_cmdset_creation(self):
 #
 # -------------------------------------------------------------
 
+
 class CmdEditorBase(Command):
     """
     Base parent for editor commands
     """
+
     locks = "cmd:all()"
     help_entry = "LineEditor"
 
@@ -275,8 +280,8 @@ def parse(self):
 
         lstart, lend = cline, cline + 1
         linerange = False
-        if arglist and arglist[0].count(':') == 1:
-            part1, part2 = arglist[0].split(':')
+        if arglist and arglist[0].count(":") == 1:
+            part1, part2 = arglist[0].split(":")
             if part1 and part1.isdigit():
                 lstart = min(max(0, int(part1)) - 1, nlines)
                 linerange = True
@@ -291,7 +296,11 @@ def parse(self):
             arglist = arglist[1:]
 
         # nicer output formatting of the line range.
-        lstr = "line %i" % (lstart + 1) if not linerange or lstart + 1 == lend else "lines %i-%i" % (lstart + 1, lend)
+        lstr = (
+            "line %i" % (lstart + 1)
+            if not linerange or lstart + 1 == lend
+            else "lines %i-%i" % (lstart + 1, lend)
+        )
 
         # arg1 and arg2 is whatever arguments. Line numbers or -ranges are
         # never included here.
@@ -347,6 +356,7 @@ class CmdLineInput(CmdEditorBase):
     """
     No command match - Inputs line of text into buffer.
     """
+
     key = _CMD_NOMATCH
     aliases = _CMD_NOINPUT
 
@@ -370,15 +380,14 @@ def func(self):
         self.editor.update_buffer(buf)
         if self.editor._echo_mode:
             # need to do it here or we will be off one line
-            cline = len(self.editor.get_buffer().split('\n'))
+            cline = len(self.editor.get_buffer().split("\n"))
             if editor._codefunc:
                 # display the current level of identation
                 indent = editor._indent
                 if indent < 0:
                     indent = "off"
 
-                self.caller.msg("|b%02i|||n (|g%s|n) %s" % (
-                    cline, indent, raw(line)))
+                self.caller.msg("|b%02i|||n (|g%s|n) %s" % (cline, indent, raw(line)))
             else:
                 self.caller.msg("|b%02i|||n %s" % (cline, raw(self.args)))
 
@@ -387,11 +396,42 @@ class CmdEditorGroup(CmdEditorBase):
     """
     Commands for the editor
     """
+
     key = ":editor_command_group"
-    aliases = [":", "::", ":::", ":h", ":w", ":wq", ":q", ":q!", ":u", ":uu", ":UU",
-               ":dd", ":dw", ":DD", ":y", ":x", ":p", ":i", ":j",
-               ":r", ":I", ":A", ":s", ":S", ":f", ":fi", ":fd", ":echo",
-               ":!", ":<", ":>", ":="]
+    aliases = [
+        ":",
+        "::",
+        ":::",
+        ":h",
+        ":w",
+        ":wq",
+        ":q",
+        ":q!",
+        ":u",
+        ":uu",
+        ":UU",
+        ":dd",
+        ":dw",
+        ":DD",
+        ":y",
+        ":x",
+        ":p",
+        ":i",
+        ":j",
+        ":r",
+        ":I",
+        ":A",
+        ":s",
+        ":S",
+        ":f",
+        ":fi",
+        ":fd",
+        ":echo",
+        ":!",
+        ":<",
+        ":>",
+        ":=",
+    ]
     arg_regex = r"\s.*?|$"
 
     def func(self):
@@ -419,9 +459,7 @@ def func(self):
             # Echo buffer without the line numbers and syntax parsing
             if self.linerange:
                 buf = linebuffer[lstart:lend]
-                editor.display_buffer(buf=buf,
-                                      offset=lstart,
-                                      linenums=False, options={"raw": True})
+                editor.display_buffer(buf=buf, offset=lstart, linenums=False, options={"raw": True})
             else:
                 editor.display_buffer(linenums=False, options={"raw": True})
         elif cmd == ":::":
@@ -477,7 +515,7 @@ def func(self):
                 else:
                     caller.msg("Removed %s for %s." % (self.arg1, self.lstr))
                 sarea = "\n".join(linebuffer[lstart:lend])
-                sarea = re.sub(r"%s" % self.arg1.strip("\'").strip('\"'), "", sarea, re.MULTILINE)
+                sarea = re.sub(r"%s" % self.arg1.strip("'").strip('"'), "", sarea, re.MULTILINE)
                 buf = linebuffer[:lstart] + sarea.split("\n") + linebuffer[lend:]
                 editor.update_buffer(buf)
         elif cmd == ":DD":
@@ -513,7 +551,7 @@ def func(self):
                 caller.msg("Pasted buffer %s to %s." % (editor._copy_buffer, self.lstr))
         elif cmd == ":i":
             # :i <l> <txt> - insert new line
-            new_lines = self.args.split('\n')
+            new_lines = self.args.split("\n")
             if not new_lines:
                 caller.msg("You need to enter a new line and where to insert it.")
             else:
@@ -522,7 +560,7 @@ def func(self):
                 caller.msg("Inserted %i new line(s) at %s." % (len(new_lines), self.lstr))
         elif cmd == ":r":
             # :r <l> <txt> - replace lines
-            new_lines = self.args.split('\n')
+            new_lines = self.args.split("\n")
             if not new_lines:
                 caller.msg("You need to enter a replacement string.")
             else:
@@ -534,8 +572,11 @@ def func(self):
             if not self.raw_string and not editor._codefunc:
                 caller.msg("You need to enter text to insert.")
             else:
-                buf = linebuffer[:lstart] + ["%s%s" % (self.args, line)
-                                             for line in linebuffer[lstart:lend]] + linebuffer[lend:]
+                buf = (
+                    linebuffer[:lstart]
+                    + ["%s%s" % (self.args, line) for line in linebuffer[lstart:lend]]
+                    + linebuffer[lend:]
+                )
                 editor.update_buffer(buf)
                 caller.msg("Inserted text at beginning of %s." % self.lstr)
         elif cmd == ":A":
@@ -543,8 +584,11 @@ def func(self):
             if not self.args:
                 caller.msg("You need to enter text to append.")
             else:
-                buf = linebuffer[:lstart] + ["%s%s" % (line, self.args)
-                                             for line in linebuffer[lstart:lend]] + linebuffer[lend:]
+                buf = (
+                    linebuffer[:lstart]
+                    + ["%s%s" % (line, self.args) for line in linebuffer[lstart:lend]]
+                    + linebuffer[lend:]
+                )
                 editor.update_buffer(buf)
                 caller.msg("Appended text to end of %s." % self.lstr)
         elif cmd == ":s":
@@ -556,17 +600,26 @@ def func(self):
                 if not self.linerange:
                     lstart = 0
                     lend = self.cline + 1
-                    caller.msg("Search-replaced %s -> %s for lines %i-%i." % (self.arg1, self.arg2, lstart + 1, lend))
+                    caller.msg(
+                        "Search-replaced %s -> %s for lines %i-%i."
+                        % (self.arg1, self.arg2, lstart + 1, lend)
+                    )
                 else:
-                    caller.msg("Search-replaced %s -> %s for %s." % (self.arg1, self.arg2, self.lstr))
+                    caller.msg(
+                        "Search-replaced %s -> %s for %s." % (self.arg1, self.arg2, self.lstr)
+                    )
                 sarea = "\n".join(linebuffer[lstart:lend])
 
                 regex = r"%s|^%s(?=\s)|(?<=\s)%s(?=\s)|^%s$|(?<=\s)%s$"
-                regarg = self.arg1.strip("\'").strip('\"')
+                regarg = self.arg1.strip("'").strip('"')
                 if " " in regarg:
                     regarg = regarg.replace(" ", " +")
-                sarea = re.sub(regex % (regarg, regarg, regarg, regarg, regarg), self.arg2.strip("\'").strip('\"'),
-                               sarea, re.MULTILINE)
+                sarea = re.sub(
+                    regex % (regarg, regarg, regarg, regarg, regarg),
+                    self.arg2.strip("'").strip('"'),
+                    sarea,
+                    re.MULTILINE,
+                )
                 buf = linebuffer[:lstart] + sarea.split("\n") + linebuffer[lend:]
                 editor.update_buffer(buf)
         elif cmd == ":f":
@@ -585,14 +638,24 @@ def func(self):
         elif cmd == ":j":
             # :f <l> <w>  justify buffer of <l> with <w> as align (one of
             # f(ull), c(enter), r(ight) or l(left). Default is full.
-            align_map = {"full": "f", "f": "f", "center": "c", "c": "c",
-                         "right": "r", "r": "r", "left": "l", "l": "l"}
+            align_map = {
+                "full": "f",
+                "f": "f",
+                "center": "c",
+                "c": "c",
+                "right": "r",
+                "r": "r",
+                "left": "l",
+                "l": "l",
+            }
             align_name = {"f": "Full", "c": "Center", "l": "Left", "r": "Right"}
             width = _DEFAULT_WIDTH
             if self.arg1 and self.arg1.lower() not in align_map:
-                self.caller.msg("Valid justifications are [f]ull (default), [c]enter, [r]right or [l]eft")
+                self.caller.msg(
+                    "Valid justifications are [f]ull (default), [c]enter, [r]right or [l]eft"
+                )
                 return
-            align = align_map[self.arg1.lower()] if self.arg1 else 'f'
+            align = align_map[self.arg1.lower()] if self.arg1 else "f"
             if not self.linerange:
                 lstart = 0
                 lend = self.cline + 1
@@ -642,8 +705,7 @@ def func(self):
                 editor.decrease_indent()
                 indent = editor._indent
                 if indent >= 0:
-                    caller.msg("Decreased indentation: new indentation is {}.".format(
-                        indent))
+                    caller.msg("Decreased indentation: new indentation is {}.".format(indent))
                 else:
                     caller.msg("|rManual indentation is OFF.|n Use := to turn it on.")
             else:
@@ -654,8 +716,7 @@ def func(self):
                 editor.increase_indent()
                 indent = editor._indent
                 if indent >= 0:
-                    caller.msg("Increased indentation: new indentation is {}.".format(
-                        indent))
+                    caller.msg("Increased indentation: new indentation is {}.".format(indent))
                 else:
                     caller.msg("|rManual indentation is OFF.|n Use := to turn it on.")
             else:
@@ -675,6 +736,7 @@ def func(self):
 
 class EvEditorCmdSet(CmdSet):
     """CmdSet for the editor commands"""
+
     key = "editorcmdset"
     mergetype = "Replace"
 
@@ -682,6 +744,7 @@ def at_cmdset_creation(self):
         self.add(CmdLineInput())
         self.add(CmdEditorGroup())
 
+
 # -------------------------------------------------------------
 #
 # Main Editor object
@@ -697,8 +760,16 @@ class EvEditor(object):
 
     """
 
-    def __init__(self, caller, loadfunc=None, savefunc=None,
-                 quitfunc=None, key="", persistent=False, codefunc=False):
+    def __init__(
+        self,
+        caller,
+        loadfunc=None,
+        savefunc=None,
+        quitfunc=None,
+        key="",
+        persistent=False,
+        codefunc=False,
+    ):
         """
         Launches a full in-game line editor, mimicking the functionality of VIM.
 
@@ -773,10 +844,20 @@ def __init__(self, caller, loadfunc=None, savefunc=None,
         if persistent:
             # save in tuple {kwargs, other options}
             try:
-                caller.attributes.add("_eveditor_saved", (
-                    dict(loadfunc=loadfunc, savefunc=savefunc, quitfunc=quitfunc,
-                         codefunc=codefunc, key=key, persistent=persistent),
-                    dict(_pristine_buffer=self._pristine_buffer, _sep=self._sep)))
+                caller.attributes.add(
+                    "_eveditor_saved",
+                    (
+                        dict(
+                            loadfunc=loadfunc,
+                            savefunc=savefunc,
+                            quitfunc=quitfunc,
+                            codefunc=codefunc,
+                            key=key,
+                            persistent=persistent,
+                        ),
+                        dict(_pristine_buffer=self._pristine_buffer, _sep=self._sep),
+                    ),
+                )
                 caller.attributes.add("_eveditor_buffer_temp", (self._buffer, self._undo_buffer))
                 caller.attributes.add("_eveditor_unsaved", False)
                 caller.attributes.add("_eveditor_indent", 0)
@@ -805,6 +886,7 @@ def load_buffer(self):
                 self._caller.msg("|rNote: input buffer was converted to a string.|n")
         except Exception as e:
             from evennia.utils import logger
+
             logger.log_trace()
             self._caller.msg(_ERROR_LOADFUNC.format(error=e))
 
@@ -833,7 +915,9 @@ def update_buffer(self, buf):
             self.update_undo()
             self._unsaved = True
             if self._persistent:
-                self._caller.attributes.add("_eveditor_buffer_temp", (self._buffer, self._undo_buffer))
+                self._caller.attributes.add(
+                    "_eveditor_buffer_temp", (self._buffer, self._undo_buffer)
+                )
                 self._caller.attributes.add("_eveditor_unsaved", True)
                 self._caller.attributes.add("_eveditor_indent", self._indent)
 
@@ -896,12 +980,16 @@ def update_undo(self, step=None):
             if self._undo_pos >= len(self._undo_buffer) - 1 or self._undo_pos + 1 >= self._undo_max:
                 self._caller.msg(_MSG_NO_REDO)
             else:
-                self._undo_pos = min(self._undo_pos + step, min(len(self._undo_buffer), self._undo_max) - 1)
+                self._undo_pos = min(
+                    self._undo_pos + step, min(len(self._undo_buffer), self._undo_max) - 1
+                )
                 self._buffer = self._undo_buffer[self._undo_pos]
                 self._caller.msg(_MSG_REDO)
-        if not self._undo_buffer or (self._undo_buffer and self._buffer != self._undo_buffer[self._undo_pos]):
+        if not self._undo_buffer or (
+            self._undo_buffer and self._buffer != self._undo_buffer[self._undo_pos]
+        ):
             # save undo state
-            self._undo_buffer = self._undo_buffer[:self._undo_pos + 1] + [self._buffer]
+            self._undo_buffer = self._undo_buffer[: self._undo_pos + 1] + [self._buffer]
             self._undo_pos = len(self._undo_buffer) - 1
 
     def display_buffer(self, buf=None, offset=0, linenums=True, options={"raw": False}):
@@ -923,17 +1011,31 @@ def display_buffer(self, buf=None, offset=0, linenums=True, options={"raw": Fals
         if is_iter(buf):
             buf = "\n".join(buf)
 
-        lines = buf.split('\n')
+        lines = buf.split("\n")
         nlines = len(lines)
         nwords = len(buf.split())
         nchars = len(buf)
 
         sep = self._sep
-        header = "|n" + sep * 10 + "Line Editor [%s]" % self._key + sep * (_DEFAULT_WIDTH - 24 - len(self._key))
-        footer = "|n" + sep * 10 +\
-                 "[l:%02i w:%03i c:%04i]" % (nlines, nwords, nchars) + sep * 12 + "(:h for help)" + sep * (_DEFAULT_WIDTH - 54)
+        header = (
+            "|n"
+            + sep * 10
+            + "Line Editor [%s]" % self._key
+            + sep * (_DEFAULT_WIDTH - 24 - len(self._key))
+        )
+        footer = (
+            "|n"
+            + sep * 10
+            + "[l:%02i w:%03i c:%04i]" % (nlines, nwords, nchars)
+            + sep * 12
+            + "(:h for help)"
+            + sep * (_DEFAULT_WIDTH - 54)
+        )
         if linenums:
-            main = "\n".join("|b%02i|||n %s" % (iline + 1 + offset, raw(line)) for iline, line in enumerate(lines))
+            main = "\n".join(
+                "|b%02i|||n %s" % (iline + 1 + offset, raw(line))
+                for iline, line in enumerate(lines)
+            )
         else:
             main = "\n".join([raw(line) for line in lines])
         string = "%s\n%s\n%s" % (header, main, footer)
diff --git a/evennia/utils/evform.py b/evennia/utils/evform.py
index f8affb7eb74..1d5a0a08be2 100644
--- a/evennia/utils/evform.py
+++ b/evennia/utils/evform.py
@@ -129,8 +129,6 @@
 
 """
 
-from builtins import object, range
-
 import re
 import copy
 from evennia.utils.evtable import EvCell, EvTable
@@ -160,7 +158,7 @@ def _to_rect(lines):
 
     """
     maxl = max(len(line) for line in lines)
-    return [line + ' ' * (maxl - len(line)) for line in lines]
+    return [line + " " * (maxl - len(line)) for line in lines]
 
 
 def _to_ansi(obj, regexable=False):
@@ -206,8 +204,12 @@ def __init__(self, filename=None, cells=None, tables=None, form=None, **kwargs):
         self.filename = filename
         self.input_form_dict = form
 
-        self.cells_mapping = dict((to_str(key), value) for key, value in cells.items()) if cells else {}
-        self.tables_mapping = dict((to_str(key), value) for key, value in tables.items()) if tables else {}
+        self.cells_mapping = (
+            dict((to_str(key), value) for key, value in cells.items()) if cells else {}
+        )
+        self.tables_mapping = (
+            dict((to_str(key), value) for key, value in tables.items()) if tables else {}
+        )
 
         self.cellchar = "x"
         self.tablechar = "c"
@@ -244,8 +246,12 @@ def _parse_rectangles(self, cellchar, tablechar, form, **kwargs):
         table_coords = {}
 
         # Locate the identifier tags and the horizontal end coords for all forms
-        re_cellchar = re.compile(r"%s+([^%s%s]+)%s+" % (cellchar, INVALID_FORMCHARS, cellchar, cellchar))
-        re_tablechar = re.compile(r"%s+([^%s%s|+])%s+" % (tablechar, INVALID_FORMCHARS, tablechar, tablechar))
+        re_cellchar = re.compile(
+            r"%s+([^%s%s]+)%s+" % (cellchar, INVALID_FORMCHARS, cellchar, cellchar)
+        )
+        re_tablechar = re.compile(
+            r"%s+([^%s%s|+])%s+" % (tablechar, INVALID_FORMCHARS, tablechar, tablechar)
+        )
         for iy, line in enumerate(_to_ansi(form, regexable=True)):
             # find cells
             ix0 = 0
@@ -297,11 +303,25 @@ def _parse_rectangles(self, cellchar, tablechar, form, **kwargs):
             data = self.cells_mapping.get(key, "")
             # if key == "1":
 
-            options = {"pad_left": 0, "pad_right": 0, "pad_top": 0, "pad_bottom": 0, "align": "l", "valign": "t", "enforce_size": True}
+            options = {
+                "pad_left": 0,
+                "pad_right": 0,
+                "pad_top": 0,
+                "pad_bottom": 0,
+                "align": "l",
+                "valign": "t",
+                "enforce_size": True,
+            }
             options.update(custom_options)
             # if key=="4":
 
-            mapping[key] = (iyup, leftix, width, height, EvCell(data, width=width, height=height, **options))
+            mapping[key] = (
+                iyup,
+                leftix,
+                width,
+                height,
+                EvCell(data, width=width, height=height, **options),
+            )
 
         # get rectangles and assign Tables
         for key, (iy, leftix, rightix) in table_coords.items():
@@ -332,8 +352,15 @@ def _parse_rectangles(self, cellchar, tablechar, form, **kwargs):
             # we have all the coordinates we need. Create Table.
             table = self.tables_mapping.get(key, None)
 
-            options = {"pad_left": 0, "pad_right": 0, "pad_top": 0, "pad_bottom": 0,
-                       "align": "l", "valign": "t", "enforce_size": True}
+            options = {
+                "pad_left": 0,
+                "pad_right": 0,
+                "pad_top": 0,
+                "pad_bottom": 0,
+                "align": "l",
+                "valign": "t",
+                "enforce_size": True,
+            }
             options.update(custom_options)
 
             if table:
@@ -356,7 +383,7 @@ def _populate_form(self, raw_form, mapping):
             for il, rectline in enumerate(rect):
                 formline = form[iy0 + il]
                 # insert new content, replacing old
-                form[iy0 + il] = formline[:ix0] + rectline + formline[ix0 + width:]
+                form[iy0 + il] = formline[:ix0] + rectline + formline[ix0 + width :]
         return form
 
     def map(self, cells=None, tables=None, **kwargs):
@@ -426,7 +453,9 @@ def reload(self, filename=None, form=None, **kwargs):
         self.options.update(kwargs)
 
         # parse and replace
-        self.mapping = self._parse_rectangles(self.cellchar, self.tablechar, self.raw_form, **kwargs)
+        self.mapping = self._parse_rectangles(
+            self.cellchar, self.tablechar, self.raw_form, **kwargs
+        )
         self.form = self._populate_form(self.raw_form, self.mapping)
 
     def __str__(self):
@@ -439,25 +468,33 @@ def _test():
     form = EvForm("evennia.utils.tests.data.evform_example")
 
     # add data to each tagged form cell
-    form.map(cells={"AA": "|gTom the Bouncer",
-                    2: "|yGriatch",
-                    3: "A sturdy fellow",
-                    4: 12,
-                    5: 10,
-                    6: 5,
-                    7: 18,
-                    8: 10,
-                    9: 3,
-                    "F": "rev 1"})
+    form.map(
+        cells={
+            "AA": "|gTom the Bouncer",
+            2: "|yGriatch",
+            3: "A sturdy fellow",
+            4: 12,
+            5: 10,
+            6: 5,
+            7: 18,
+            8: 10,
+            9: 3,
+            "F": "rev 1",
+        }
+    )
     # create the EvTables
-    tableA = EvTable("HP", "MV", "MP",
-                     table=[["**"], ["*****"], ["***"]],
-                     border="incols")
-    tableB = EvTable("Skill", "Value", "Exp",
-                     table=[["Shooting", "Herbalism", "Smithing"],
-                            [12, 14, 9], ["550/1200", "990/1400", "205/900"]],
-                     border="incols")
+    tableA = EvTable("HP", "MV", "MP", table=[["**"], ["*****"], ["***"]], border="incols")
+    tableB = EvTable(
+        "Skill",
+        "Value",
+        "Exp",
+        table=[
+            ["Shooting", "Herbalism", "Smithing"],
+            [12, 14, 9],
+            ["550/1200", "990/1400", "205/900"],
+        ],
+        border="incols",
+    )
     # add the tables to the proper ids in the form
-    form.map(tables={"A": tableA,
-                     "B": tableB})
+    form.map(tables={"A": tableA, "B": tableB})
     return str(form)
diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py
index 8e4eb065683..0bc5b374758 100644
--- a/evennia/utils/evmenu.py
+++ b/evennia/utils/evmenu.py
@@ -166,7 +166,6 @@ def node3(caller):
 
 import random
 import inspect
-from builtins import object, range
 
 from inspect import isfunction, getargspec
 from django.conf import settings
@@ -189,8 +188,10 @@ def node3(caller):
 
 # i18n
 from django.utils.translation import ugettext as _
-_ERR_NOT_IMPLEMENTED = _("Menu node '{nodename}' is either not implemented or "
-                         "caused an error. Make another choice.")
+
+_ERR_NOT_IMPLEMENTED = _(
+    "Menu node '{nodename}' is either not implemented or " "caused an error. Make another choice."
+)
 _ERR_GENERAL = _("Error in menu node '{nodename}'.")
 _ERR_NO_OPTION_DESC = _("No description.")
 _HELP_FULL = _("Commands: <menu option>, help, quit")
@@ -207,9 +208,11 @@ def node3(caller):
 an eventual server reload).|n
 """
 
-_TRACE_PERSISTENT_SAVING = "EvMenu persistent-mode error. Commonly, this is because one or " \
-                           "more of the EvEditor callbacks could not be pickled, for example " \
-                           "because it's a class method or is defined inside another function."
+_TRACE_PERSISTENT_SAVING = (
+    "EvMenu persistent-mode error. Commonly, this is because one or "
+    "more of the EvEditor callbacks could not be pickled, for example "
+    "because it's a class method or is defined inside another function."
+)
 
 
 class EvMenuError(RuntimeError):
@@ -217,8 +220,10 @@ class EvMenuError(RuntimeError):
     Error raised by menu when facing internal errors.
 
     """
+
     pass
 
+
 # -------------------------------------------------------------
 #
 # Menu command and command set
@@ -230,6 +235,7 @@ class CmdEvMenuNode(Command):
     """
     Menu options.
     """
+
     key = _CMD_NOINPUT
     aliases = [_CMD_NOMATCH]
     locks = "cmd:all()"
@@ -239,6 +245,7 @@ def func(self):
         """
         Implement all menu commands.
         """
+
         def _restore(caller):
             # check if there is a saved menu available.
             # this will re-start a completely new evmenu call.
@@ -276,7 +283,9 @@ def _restore(caller):
                 if not menu:
                     # can't restore from a session
                     err = "Menu object not found as %s.ndb._menutree!" % orig_caller
-                    orig_caller.msg(err)  # don't give the session as a kwarg here, direct to original
+                    orig_caller.msg(
+                        err
+                    )  # don't give the session as a kwarg here, direct to original
                     raise EvMenuError(err)
         # we must do this after the caller with the menu has been correctly identified since it
         # can be either Account, Object or Session (in the latter case this info will be superfluous).
@@ -290,6 +299,7 @@ class EvMenuCmdSet(CmdSet):
     The Menu cmdset replaces the current cmdset.
 
     """
+
     key = "menu_cmdset"
     priority = 1
     mergetype = "Replace"
@@ -304,7 +314,7 @@ def at_cmdset_creation(self):
         self.add(CmdEvMenuNode())
 
 
-#------------------------------------------------------------
+# ------------------------------------------------------------
 #
 # Menu main class
 #
@@ -321,12 +331,23 @@ class EvMenu(object):
     # convenient helpers for easy overloading
     node_border_char = "_"
 
-    def __init__(self, caller, menudata, startnode="start",
-                 cmdset_mergetype="Replace", cmdset_priority=1,
-                 auto_quit=True, auto_look=True, auto_help=True,
-                 cmd_on_exit="look",
-                 persistent=False, startnode_input="", session=None,
-                 debug=False, **kwargs):
+    def __init__(
+        self,
+        caller,
+        menudata,
+        startnode="start",
+        cmdset_mergetype="Replace",
+        cmdset_priority=1,
+        auto_quit=True,
+        auto_look=True,
+        auto_help=True,
+        cmd_on_exit="look",
+        persistent=False,
+        startnode_input="",
+        session=None,
+        debug=False,
+        **kwargs,
+    ):
         """
         Initialize the menu tree and start the caller onto the first node.
 
@@ -436,7 +457,9 @@ def __init__(self, caller, menudata, startnode="start",
         if isinstance(cmd_on_exit, str):
             # At this point menu._session will have been replaced by the
             # menu command to the actual session calling.
-            self.cmd_on_exit = lambda caller, menu: caller.execute_cmd(cmd_on_exit, session=menu._session)
+            self.cmd_on_exit = lambda caller, menu: caller.execute_cmd(
+                cmd_on_exit, session=menu._session
+            )
         elif callable(cmd_on_exit):
             self.cmd_on_exit = cmd_on_exit
         else:
@@ -454,10 +477,24 @@ def __init__(self, caller, menudata, startnode="start",
         self.test_nodetext = ""
 
         # assign kwargs as initialization vars on ourselves.
-        if set(("_startnode", "_menutree", "_session", "_persistent",
-                "cmd_on_exit", "default", "nodetext", "helptext",
-                "options", "cmdset_mergetype", "auto_quit")).intersection(set(kwargs.keys())):
-            raise RuntimeError("One or more of the EvMenu `**kwargs` is reserved by EvMenu for internal use.")
+        if set(
+            (
+                "_startnode",
+                "_menutree",
+                "_session",
+                "_persistent",
+                "cmd_on_exit",
+                "default",
+                "nodetext",
+                "helptext",
+                "options",
+                "cmdset_mergetype",
+                "auto_quit",
+            )
+        ).intersection(set(kwargs.keys())):
+            raise RuntimeError(
+                "One or more of the EvMenu `**kwargs` is reserved by EvMenu for internal use."
+            )
         for key, val in kwargs.items():
             setattr(self, key, val)
 
@@ -474,17 +511,19 @@ def __init__(self, caller, menudata, startnode="start",
 
         if persistent:
             # save the menu to the database
-            calldict = {"startnode": startnode,
-                        "cmdset_mergetype": cmdset_mergetype,
-                        "cmdset_priority": cmdset_priority,
-                        "auto_quit": auto_quit,
-                        "auto_look": auto_look,
-                        "auto_help": auto_help,
-                        "cmd_on_exit": cmd_on_exit,
-                        "persistent": persistent}
+            calldict = {
+                "startnode": startnode,
+                "cmdset_mergetype": cmdset_mergetype,
+                "cmdset_priority": cmdset_priority,
+                "auto_quit": auto_quit,
+                "auto_look": auto_look,
+                "auto_help": auto_help,
+                "cmd_on_exit": cmd_on_exit,
+                "persistent": persistent,
+            }
             calldict.update(kwargs)
             try:
-                caller.attributes.add("_menutree_saved", (self.__class__, (menudata, ), calldict))
+                caller.attributes.add("_menutree_saved", (self.__class__, (menudata,), calldict))
                 caller.attributes.add("_menutree_saved_startnode", (startnode, startnode_input))
             except Exception as err:
                 caller.msg(_ERROR_PERSISTENT_SAVING.format(error=err), session=self._session)
@@ -527,8 +566,11 @@ def _parse_menudata(self, menudata):
         else:
             # a python path of a module
             module = mod_import(menudata)
-            return dict((key, func) for key, func in module.__dict__.items()
-                        if isfunction(func) and not key.startswith("_"))
+            return dict(
+                (key, func)
+                for key, func in module.__dict__.items()
+                if isfunction(func) and not key.startswith("_")
+            )
 
     def _format_node(self, nodetext, optionlist):
         """
@@ -666,7 +708,9 @@ def run_exec(self, nodename, raw_string, **kwargs):
                 ret = self._safe_call(nodename, raw_string, **kwargs)
                 if isinstance(ret, (tuple, list)):
                     if not len(ret) > 1 or not isinstance(ret[1], dict):
-                        raise EvMenuError("exec callable must return either None, str or (str, dict)")
+                        raise EvMenuError(
+                            "exec callable must return either None, str or (str, dict)"
+                        )
                     ret, kwargs = ret[:2]
             else:
                 # nodename is a string; lookup as node and run as node in-place (don't goto it)
@@ -712,8 +756,11 @@ def extract_goto_exec(self, nodename, option_dict):
                 goto, goto_kwargs = goto[:2]  # ignore any extra arguments
                 if not hasattr(goto_kwargs, "__getitem__"):
                     #  not a dict-like structure
-                    raise EvMenuError("EvMenu node {}: goto kwargs is not a dict: {}".format(
-                                                            nodename, goto_kwargs))
+                    raise EvMenuError(
+                        "EvMenu node {}: goto kwargs is not a dict: {}".format(
+                            nodename, goto_kwargs
+                        )
+                    )
             else:
                 goto = goto[0]
         if execute and isinstance(execute, (tuple, list)):
@@ -721,8 +768,11 @@ def extract_goto_exec(self, nodename, option_dict):
                 execute, exec_kwargs = execute[:2]  # ignore any extra arguments
                 if not hasattr(exec_kwargs, "__getitem__"):
                     #  not a dict-like structure
-                    raise EvMenuError("EvMenu node {}: exec kwargs is not a dict: {}".format(
-                                                            nodename, goto_kwargs))
+                    raise EvMenuError(
+                        "EvMenu node {}: exec kwargs is not a dict: {}".format(
+                            nodename, goto_kwargs
+                        )
+                    )
             else:
                 execute = execute[0]
         return goto, goto_kwargs, execute, exec_kwargs
@@ -751,7 +801,8 @@ def goto(self, nodename, raw_string, **kwargs):
             if isinstance(nodename, (tuple, list)):
                 if not len(nodename) > 1 or not isinstance(nodename[1], dict):
                     raise EvMenuError(
-                            "{}: goto callable must return str or (str, dict)".format(inp_nodename))
+                        "{}: goto callable must return str or (str, dict)".format(inp_nodename)
+                    )
                 nodename, kwargs = nodename[:2]
             if not nodename:
                 # no nodename return. Re-run current node
@@ -763,8 +814,9 @@ def goto(self, nodename, raw_string, **kwargs):
             return
 
         if self._persistent:
-            self.caller.attributes.add("_menutree_saved_startnode",
-                                       (nodename, (raw_string, kwargs)))
+            self.caller.attributes.add(
+                "_menutree_saved_startnode", (nodename, (raw_string, kwargs))
+            )
 
         # validation of the node return values
         helptext = ""
@@ -798,8 +850,12 @@ def goto(self, nodename, raw_string, **kwargs):
                     display_options.append((keys[0], desc))
                     for key in keys:
                         if goto or execute:
-                            self.options[strip_ansi(key).strip().lower()] = \
-                                    (goto, goto_kwargs, execute, exec_kwargs)
+                            self.options[strip_ansi(key).strip().lower()] = (
+                                goto,
+                                goto_kwargs,
+                                execute,
+                                exec_kwargs,
+                            )
 
         self.nodetext = self._format_node(nodetext, display_options)
         self.node_kwargs = kwargs
@@ -834,10 +890,9 @@ def run_exec_then_goto(self, runexec, goto, raw_string, runexec_kwargs=None, got
         """
         if runexec:
             # replace goto only if callback returns
-            goto, goto_kwargs = (
-                    self.run_exec(runexec, raw_string,
-                                  **(runexec_kwargs if runexec_kwargs else {})) or
-                    (goto, goto_kwargs))
+            goto, goto_kwargs = self.run_exec(
+                runexec, raw_string, **(runexec_kwargs if runexec_kwargs else {})
+            ) or (goto, goto_kwargs)
         if goto:
             self.goto(goto, raw_string, **(goto_kwargs if goto_kwargs else {}))
 
@@ -868,37 +923,51 @@ def print_debug_info(self, arg):
         all_props = inspect.getmembers(self)
         all_methods = [name for name, _ in inspect.getmembers(self, predicate=inspect.ismethod)]
         all_builtins = [name for name, _ in inspect.getmembers(self, predicate=inspect.isbuiltin)]
-        props = {prop: value for prop, value in all_props if prop not in all_methods and
-                 prop not in all_builtins and not prop.endswith("__")}
-
-        local = {key: var for key, var in locals().items()
-                 if key not in all_props and not key.endswith("__")}
+        props = {
+            prop: value
+            for prop, value in all_props
+            if prop not in all_methods and prop not in all_builtins and not prop.endswith("__")
+        }
+
+        local = {
+            key: var
+            for key, var in locals().items()
+            if key not in all_props and not key.endswith("__")
+        }
 
         if arg:
             if arg in props:
                 debugtxt = " |y* {}:|n\n{}".format(arg, props[arg])
             elif arg in local:
                 debugtxt = " |y* {}:|n\n{}".format(arg, local[arg])
-            elif arg == 'full':
-                debugtxt = ("|yMENU DEBUG full ... |n\n" + "\n".join(
-                                "|y *|n {}: {}".format(key, val)
-                                for key, val in sorted(props.items())) +
-                            "\n |yLOCAL VARS:|n\n" + "\n".join(
-                                "|y *|n {}: {}".format(key, val)
-                                for key, val in sorted(local.items())) +
-                            "\n |y... END MENU DEBUG|n")
+            elif arg == "full":
+                debugtxt = (
+                    "|yMENU DEBUG full ... |n\n"
+                    + "\n".join(
+                        "|y *|n {}: {}".format(key, val) for key, val in sorted(props.items())
+                    )
+                    + "\n |yLOCAL VARS:|n\n"
+                    + "\n".join(
+                        "|y *|n {}: {}".format(key, val) for key, val in sorted(local.items())
+                    )
+                    + "\n |y... END MENU DEBUG|n"
+                )
             else:
                 debugtxt = "|yUsage: menudebug full|<name of property>|n"
         else:
-                debugtxt = ("|yMENU DEBUG properties ... |n\n" + "\n".join(
-                                "|y *|n {}: {}".format(
-                                    key, crop(to_str(val, force_string=True), width=50))
-                                for key, val in sorted(props.items())) +
-                            "\n |yLOCAL VARS:|n\n" + "\n".join(
-                                "|y *|n {}: {}".format(
-                                    key, crop(to_str(val, force_string=True), width=50))
-                                for key, val in sorted(local.items())) +
-                            "\n |y... END MENU DEBUG|n")
+            debugtxt = (
+                "|yMENU DEBUG properties ... |n\n"
+                + "\n".join(
+                    "|y *|n {}: {}".format(key, crop(to_str(val, force_string=True), width=50))
+                    for key, val in sorted(props.items())
+                )
+                + "\n |yLOCAL VARS:|n\n"
+                + "\n".join(
+                    "|y *|n {}: {}".format(key, crop(to_str(val, force_string=True), width=50))
+                    for key, val in sorted(local.items())
+                )
+                + "\n |y... END MENU DEBUG|n"
+            )
         self.caller.msg(debugtxt)
 
     def parse_input(self, raw_string):
@@ -954,7 +1023,7 @@ def nodetext_formatter(self, nodetext):
             nodetext (str): The formatted node text.
 
         """
-        return dedent(nodetext.strip('\n'), baseline_index=0).rstrip()
+        return dedent(nodetext.strip("\n"), baseline_index=0).rstrip()
 
     def helptext_formatter(self, helptext):
         """
@@ -967,7 +1036,7 @@ def helptext_formatter(self, helptext):
             helptext (str): The formatted help text.
 
         """
-        return dedent(helptext.strip('\n'), baseline_index=0).rstrip()
+        return dedent(helptext.strip("\n"), baseline_index=0).rstrip()
 
     def options_formatter(self, optionlist):
         """
@@ -996,9 +1065,12 @@ def options_formatter(self, optionlist):
         for key, desc in optionlist:
             if key or desc:
                 desc_string = ": %s" % desc if desc else ""
-                table_width_max = max(table_width_max,
-                                      max(m_len(p) for p in key.split("\n")) +
-                                      max(m_len(p) for p in desc_string.split("\n")) + colsep)
+                table_width_max = max(
+                    table_width_max,
+                    max(m_len(p) for p in key.split("\n"))
+                    + max(m_len(p) for p in desc_string.split("\n"))
+                    + colsep,
+                )
                 raw_key = strip_ansi(key)
                 if raw_key != key:
                     # already decorations in key definition
@@ -1006,7 +1078,7 @@ def options_formatter(self, optionlist):
                 else:
                     # add a default white color to key
                     table.append(" |lc%s|lt|w%s|n|le%s" % (raw_key, raw_key, desc_string))
-        ncols = (_MAX_TEXT_WIDTH // table_width_max)  # number of ncols
+        ncols = _MAX_TEXT_WIDTH // table_width_max  # number of ncols
 
         if ncols < 0:
             # no visible option at all
@@ -1027,11 +1099,13 @@ def options_formatter(self, optionlist):
             table.extend([" " for i in range(nrows - nlastcol)])
 
         # build the actual table grid
-        table = [table[icol * nrows: (icol * nrows) + nrows] for icol in range(0, ncols)]
+        table = [table[icol * nrows : (icol * nrows) + nrows] for icol in range(0, ncols)]
 
         # adjust the width of each column
         for icol in range(len(table)):
-            col_width = max(max(m_len(p) for p in part.split("\n")) for part in table[icol]) + colsep
+            col_width = (
+                max(max(m_len(p) for p in part.split("\n")) for part in table[icol]) + colsep
+            )
             table[icol] = [pad(part, width=col_width + colsep, align="l") for part in table[icol]]
 
         # format the table into columns
@@ -1053,8 +1127,7 @@ def node_formatter(self, nodetext, optionstext):
         sep = self.node_border_char
 
         if self._session:
-            screen_width = self._session.protocol_flags.get(
-                    "SCREENWIDTH", {0: _MAX_TEXT_WIDTH})[0]
+            screen_width = self._session.protocol_flags.get("SCREENWIDTH", {0: _MAX_TEXT_WIDTH})[0]
         else:
             screen_width = _MAX_TEXT_WIDTH
 
@@ -1073,6 +1146,7 @@ def node_formatter(self, nodetext, optionstext):
 #
 # -----------------------------------------------------------
 
+
 def list_node(option_generator, select=None, pagesize=10):
     """
     Decorator for making an EvMenu node into a multi-page list node. Will add new options,
@@ -1105,7 +1179,6 @@ def node_index(caller):
     """
 
     def decorator(func):
-
         def _select_parser(caller, raw_string, **kwargs):
             """
             Parse the select action
@@ -1129,15 +1202,16 @@ def _select_parser(caller, raw_string, **kwargs):
                 elif select:
                     # we assume a string was given, we inject the result into the kwargs
                     # to pass on to the next node
-                    kwargs['selection'] = selection
+                    kwargs["selection"] = selection
                     return str(select)
             # this means the previous node will be re-run with these same kwargs
             return None
 
         def _list_node(caller, raw_string, **kwargs):
 
-            option_list = option_generator(caller) \
-                    if callable(option_generator) else option_generator
+            option_list = (
+                option_generator(caller) if callable(option_generator) else option_generator
+            )
 
             npages = 0
             page_index = 0
@@ -1146,8 +1220,9 @@ def _list_node(caller, raw_string, **kwargs):
 
             if option_list:
                 nall_options = len(option_list)
-                pages = [option_list[ind:ind + pagesize]
-                         for ind in range(0, nall_options, pagesize)]
+                pages = [
+                    option_list[ind : ind + pagesize] for ind in range(0, nall_options, pagesize)
+                ]
                 npages = len(pages)
 
                 page_index = max(0, min(npages - 1, kwargs.get("optionpage_index", 0)))
@@ -1158,26 +1233,38 @@ def _list_node(caller, raw_string, **kwargs):
 
             # dynamic, multi-page option list. Each selection leads to the `select`
             # callback being called with a result from the available choices
-            options.extend([{"desc": opt,
-                             "goto": (_select_parser,
-                                      {"available_choices": page})} for opt in page])
+            options.extend(
+                [
+                    {"desc": opt, "goto": (_select_parser, {"available_choices": page})}
+                    for opt in page
+                ]
+            )
 
             if npages > 1:
                 # if the goto callable returns None, the same node is rerun, and
                 # kwargs not used by the callable are passed on to the node. This
                 # allows us to call ourselves over and over, using different kwargs.
-                options.append({"key": ("|Wcurrent|n", "c"),
-                                "desc": "|W({}/{})|n".format(page_index + 1, npages),
-                                "goto": (lambda caller: None,
-                                         {"optionpage_index": page_index})})
+                options.append(
+                    {
+                        "key": ("|Wcurrent|n", "c"),
+                        "desc": "|W({}/{})|n".format(page_index + 1, npages),
+                        "goto": (lambda caller: None, {"optionpage_index": page_index}),
+                    }
+                )
                 if page_index > 0:
-                    options.append({"key": ("|wp|Wrevious page|n", "p"),
-                                    "goto": (lambda caller: None,
-                                             {"optionpage_index": page_index - 1})})
+                    options.append(
+                        {
+                            "key": ("|wp|Wrevious page|n", "p"),
+                            "goto": (lambda caller: None, {"optionpage_index": page_index - 1}),
+                        }
+                    )
                 if page_index < npages - 1:
-                    options.append({"key": ("|wn|Wext page|n", "n"),
-                                    "goto": (lambda caller: None,
-                                             {"optionpage_index": page_index + 1})})
+                    options.append(
+                        {
+                            "key": ("|wn|Wext page|n", "n"),
+                            "goto": (lambda caller: None, {"optionpage_index": page_index + 1}),
+                        }
+                    )
 
             # add data from the decorated node
 
@@ -1223,8 +1310,10 @@ def _list_node(caller, raw_string, **kwargs):
                             eopt[cback] = (signature[0], {"available_choices": page})
                         else:
                             # malformed input.
-                            logger.log_err("EvMenu @list_node decorator found "
-                                           "malformed option to decorate: {}".format(eopt))
+                            logger.log_err(
+                                "EvMenu @list_node decorator found "
+                                "malformed option to decorate: {}".format(eopt)
+                            )
                 extra_options.append(eopt)
 
             options.extend(extra_options)
@@ -1233,6 +1322,7 @@ def _list_node(caller, raw_string, **kwargs):
             return text, options
 
         return _list_node
+
     return decorator
 
 
@@ -1242,10 +1332,12 @@ def _list_node(caller, raw_string, **kwargs):
 #
 # -------------------------------------------------------------------------------------------------
 
+
 class CmdGetInput(Command):
     """
     Enter your data and press return.
     """
+
     key = _CMD_NOMATCH
     aliases = _CMD_NOINPUT
 
@@ -1282,6 +1374,7 @@ class InputCmdSet(CmdSet):
     """
     This stores the input command
     """
+
     key = "input_cmdset"
     priority = 1
     mergetype = "Replace"
@@ -1296,6 +1389,7 @@ def at_cmdset_creation(self):
 
 class _Prompt(object):
     """Dummy holder"""
+
     pass
 
 
@@ -1375,6 +1469,7 @@ def get_input(caller, prompt, callback, session=None, *args, **kwargs):
 #
 # -------------------------------------------------------------
 
+
 def _generate_goto(caller, **kwargs):
     return kwargs.get("name", "test_dynamic_node"), {"name": "replaced!"}
 
@@ -1391,39 +1486,52 @@ def test_start_node(caller):
     Select options or use 'quit' to exit the menu.
 
     The menu was initialized with two variables: %s and %s.
-    """ % (menu.testval, menu.testval2)
-
-    options = ({"key": ("|yS|net", "s"),
-                "desc": "Set an attribute on yourself.",
-                "exec": lambda caller: caller.attributes.add("menuattrtest", "Test value"),
-                "goto": "test_set_node"},
-               {"key": ("|yL|nook", "l"),
-                "desc": "Look and see a custom message.",
-                "goto": "test_look_node"},
-               {"key": ("|yV|niew", "v"),
-                "desc": "View your own name",
-                "goto": "test_view_node"},
-               {"key": ("|yD|nynamic", "d"),
-                "desc": "Dynamic node",
-                "goto": (_generate_goto, {"name": "test_dynamic_node"})},
-               {"key": ("|yQ|nuit", "quit", "q", "Q"),
-                "desc": "Quit this menu example.",
-                "goto": "test_end_node"},
-               {"key": "_default",
-                "goto": "test_displayinput_node"})
+    """ % (
+        menu.testval,
+        menu.testval2,
+    )
+
+    options = (
+        {
+            "key": ("|yS|net", "s"),
+            "desc": "Set an attribute on yourself.",
+            "exec": lambda caller: caller.attributes.add("menuattrtest", "Test value"),
+            "goto": "test_set_node",
+        },
+        {
+            "key": ("|yL|nook", "l"),
+            "desc": "Look and see a custom message.",
+            "goto": "test_look_node",
+        },
+        {"key": ("|yV|niew", "v"), "desc": "View your own name", "goto": "test_view_node"},
+        {
+            "key": ("|yD|nynamic", "d"),
+            "desc": "Dynamic node",
+            "goto": (_generate_goto, {"name": "test_dynamic_node"}),
+        },
+        {
+            "key": ("|yQ|nuit", "quit", "q", "Q"),
+            "desc": "Quit this menu example.",
+            "goto": "test_end_node",
+        },
+        {"key": "_default", "goto": "test_displayinput_node"},
+    )
     return text, options
 
 
 def test_look_node(caller):
     text = "This is a custom look location!"
-    options = {"key": ("|yL|nook", "l"),
-               "desc": "Go back to the previous menu.",
-               "goto": "test_start_node"}
+    options = {
+        "key": ("|yL|nook", "l"),
+        "desc": "Go back to the previous menu.",
+        "goto": "test_start_node",
+    }
     return text, options
 
 
 def test_set_node(caller):
-    text = ("""
+    text = (
+        """
     The attribute 'menuattrtest' was set to
 
             |w%s|n
@@ -1434,20 +1542,22 @@ def test_set_node(caller):
     string "_default", meaning it will catch any input, in this case
     to return to the main menu.  So you can e.g. press <return> to go
     back now.
-    """ % caller.db.menuattrtest,  # optional help text for this node
-            """
+    """
+        % caller.db.menuattrtest,  # optional help text for this node
+        """
     This is the help entry for this node. It is created by returning
     the node text as a tuple - the second string in that tuple will be
     used as the help text.
-    """)
+    """,
+    )
 
-    options = {"key": ("back (default)", "_default"),
-               "goto": "test_start_node"}
+    options = {"key": ("back (default)", "_default"), "goto": "test_start_node"}
     return text, options
 
 
 def test_view_node(caller, **kwargs):
-    text = """
+    text = (
+        """
     Your name is |g%s|n!
 
     click |lclook|lthere|le to trigger a look command under MXP.
@@ -1455,19 +1565,21 @@ def test_view_node(caller, **kwargs):
     set), and so gets assigned a number automatically. You can infact
     -always- use numbers (1...N) to refer to listed options also if you
     don't see a string option key (try it!).
-    """ % caller.key
+    """
+        % caller.key
+    )
     if kwargs.get("executed_from_dynamic_node", False):
         # we are calling this node as a exec, skip return values
         caller.msg("|gCalled from dynamic node:|n \n {}".format(text))
         return
     else:
-        options = {"desc": "back to main",
-                   "goto": "test_start_node"}
+        options = {"desc": "back to main", "goto": "test_start_node"}
         return text, options
 
 
 def test_displayinput_node(caller, raw_string):
-    text = """
+    text = (
+        """
     You entered the text:
 
         "|w%s|n"
@@ -1479,18 +1591,22 @@ def test_displayinput_node(caller, raw_string):
     makes it hidden from view. It catches all input (except the
     in-menu help/quit commands) and will, in this case, bring you back
     to the start node.
-    """ % raw_string.rstrip()
-    options = {"key": "_default",
-               "goto": "test_start_node"}
+    """
+        % raw_string.rstrip()
+    )
+    options = {"key": "_default", "goto": "test_start_node"}
     return text, options
 
 
 def _test_call(caller, raw_input, **kwargs):
     mode = kwargs.get("mode", "exec")
 
-    caller.msg("\n|y'{}' |n_test_call|y function called with\n "
-               "caller: |n{}\n |yraw_input: \"|n{}|y\" \n kwargs: |n{}\n".format(
-                    mode, caller, raw_input.rstrip(), kwargs))
+    caller.msg(
+        "\n|y'{}' |n_test_call|y function called with\n "
+        'caller: |n{}\n |yraw_input: "|n{}|y" \n kwargs: |n{}\n'.format(
+            mode, caller, raw_input.rstrip(), kwargs
+        )
+    )
 
     if mode == "exec":
         kwargs = {"random": random.random()}
@@ -1505,18 +1621,26 @@ def test_dynamic_node(caller, **kwargs):
     text = """
     This is a dynamic node with input:
         {}
-    """.format(kwargs)
-    options = ({"desc": "pass a new random number to this node",
-                "goto": ("test_dynamic_node", {"random": random.random()})},
-               {"desc": "execute a func with kwargs",
-                "exec": (_test_call, {"mode": "exec", "test_random": random.random()})},
-               {"desc": "dynamic_goto",
-                "goto": (_test_call, {"mode": "goto", "goto_input": "test"})},
-               {"desc": "exec test_view_node with kwargs",
-                "exec": ("test_view_node", {"executed_from_dynamic_node": True}),
-                "goto": "test_dynamic_node"},
-               {"desc": "back to main",
-                "goto": "test_start_node"})
+    """.format(
+        kwargs
+    )
+    options = (
+        {
+            "desc": "pass a new random number to this node",
+            "goto": ("test_dynamic_node", {"random": random.random()}),
+        },
+        {
+            "desc": "execute a func with kwargs",
+            "exec": (_test_call, {"mode": "exec", "test_random": random.random()}),
+        },
+        {"desc": "dynamic_goto", "goto": (_test_call, {"mode": "goto", "goto_input": "test"})},
+        {
+            "desc": "exec test_view_node with kwargs",
+            "exec": ("test_view_node", {"executed_from_dynamic_node": True}),
+            "goto": "test_dynamic_node",
+        },
+        {"desc": "back to main", "goto": "test_start_node"},
+    )
 
     return text, options
 
@@ -1539,6 +1663,7 @@ class CmdTestMenu(Command):
     Starts a demo menu from a menu node definition module.
 
     """
+
     key = "testmenu"
 
     def func(self):
@@ -1547,5 +1672,12 @@ def func(self):
             self.caller.msg("Usage: testmenu menumodule")
             return
         # start menu
-        EvMenu(self.caller, self.args.strip(), startnode="test_start_node", persistent=True,
-               cmdset_mergetype="Replace", testval="val", testval2="val2")
+        EvMenu(
+            self.caller,
+            self.args.strip(),
+            startnode="test_start_node",
+            persistent=True,
+            cmdset_mergetype="Replace",
+            testval="val",
+            testval2="val2",
+        )
diff --git a/evennia/utils/evmore.py b/evennia/utils/evmore.py
index 547c2bcda80..e86715dcdf3 100644
--- a/evennia/utils/evmore.py
+++ b/evennia/utils/evmore.py
@@ -27,8 +27,6 @@
 caller.msg() construct every time the page is updated.
 
 """
-from builtins import object, range
-
 from django.conf import settings
 from evennia import Command, CmdSet
 from evennia.commands import cmdhandler
@@ -43,8 +41,7 @@
 
 # text
 
-_DISPLAY = \
-    """{text}
+_DISPLAY = """{text}
 (|wmore|n [{pageno}/{pagemax}] retur|wn|n|||wb|nack|||wt|nop|||we|nnd|||wq|nuit)"""
 
 
@@ -52,9 +49,9 @@ class CmdMore(Command):
     """
     Manipulate the text paging
     """
+
     key = _CMD_NOINPUT
-    aliases = ["quit", "q", "abort", "a", "next", "n",
-               "back", "b", "top", "t", "end", "e"]
+    aliases = ["quit", "q", "abort", "a", "next", "n", "back", "b", "top", "t", "end", "e"]
     auto_help = False
 
     def func(self):
@@ -87,6 +84,7 @@ class CmdMoreLook(Command):
     """
     Override look to display window and prevent OOCLook from firing
     """
+
     key = "look"
     aliases = ["l"]
     auto_help = False
@@ -108,6 +106,7 @@ class CmdSetMore(CmdSet):
     """
     Stores the more command
     """
+
     key = "more_commands"
     priority = 110
 
@@ -121,9 +120,17 @@ class EvMore(object):
     The main pager object
     """
 
-    def __init__(self, caller, text, always_page=False, session=None,
-                 justify_kwargs=None, exit_on_lastpage=False,
-                 exit_cmd=None, **kwargs):
+    def __init__(
+        self,
+        caller,
+        text,
+        always_page=False,
+        session=None,
+        justify_kwargs=None,
+        exit_on_lastpage=False,
+        exit_cmd=None,
+        **kwargs,
+    ):
         """
         Initialization of the text handler.
 
@@ -137,7 +144,8 @@ def __init__(self, caller, text, always_page=False, session=None,
                 to determine the screen width and will receive all output.
             justify_kwargs (dict, bool or None, optional): If given, this should
                 be valid keyword arguments to the utils.justify() function. If False,
-                no justification will be done.
+                no justification will be done (especially important for handling
+                fixed-width text content, like tables!).
             exit_on_lastpage (bool, optional): If reaching the last page without the
                 page being completely filled, exit pager immediately. If unset,
                 another move forward is required to exit. If set, the pager
@@ -184,7 +192,7 @@ def __init__(self, caller, text, always_page=False, session=None,
                 justify_kwargs = justify_kwargs or {}
                 width = justify_kwargs.get("width", width)
                 justify_kwargs["width"] = width
-                justify_kwargs["align"] = justify_kwargs.get("align", 'l')
+                justify_kwargs["align"] = justify_kwargs.get("align", "l")
                 justify_kwargs["indent"] = justify_kwargs.get("indent", 0)
 
                 lines = []
@@ -197,7 +205,7 @@ def __init__(self, caller, text, always_page=False, session=None,
             # always limit number of chars to 10 000 per page
             height = min(10000 // max(1, width), height)
 
-            self._pages = ["\n".join(lines[i:i + height]) for i in range(0, len(lines), height)]
+            self._pages = ["\n".join(lines[i : i + height]) for i in range(0, len(lines), height)]
             self._npages = len(self._pages)
             self._npos = 0
 
@@ -220,9 +228,7 @@ def display(self, show_footer=True):
         pos = self._pos
         text = self._pages[pos]
         if show_footer:
-            page = _DISPLAY.format(text=text,
-                                   pageno=pos + 1,
-                                   pagemax=self._npages)
+            page = _DISPLAY.format(text=text, pageno=pos + 1, pagemax=self._npages)
         else:
             page = text
         # check to make sure our session is still valid
@@ -284,8 +290,15 @@ def page_quit(self, quiet=False):
             self._caller.execute_cmd(self.exit_cmd, session=self._session)
 
 
-def msg(caller, text="", always_page=False, session=None,
-        justify_kwargs=None, exit_on_lastpage=True, **kwargs):
+def msg(
+    caller,
+    text="",
+    always_page=False,
+    session=None,
+    justify_kwargs=None,
+    exit_on_lastpage=True,
+    **kwargs,
+):
     """
     More-supported version of msg, mimicking the normal msg method.
 
@@ -305,5 +318,12 @@ def msg(caller, text="", always_page=False, session=None,
             to the `caller.msg` method.
 
     """
-    EvMore(caller, text, always_page=always_page, session=session,
-           justify_kwargs=justify_kwargs, exit_on_lastpage=exit_on_lastpage, **kwargs)
+    EvMore(
+        caller,
+        text,
+        always_page=always_page,
+        session=session,
+        justify_kwargs=justify_kwargs,
+        exit_on_lastpage=exit_on_lastpage,
+        **kwargs,
+    )
diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py
index 29c4340d005..e59e1d3a3cb 100644
--- a/evennia/utils/evtable.py
+++ b/evennia/utils/evtable.py
@@ -111,8 +111,6 @@
 
 """
 
-from future.utils import listitems
-
 from django.conf import settings
 from textwrap import TextWrapper
 from copy import deepcopy, copy
@@ -136,7 +134,7 @@ def _to_ansi(obj):
         return ANSIString(obj)
 
 
-_whitespace = '\t\n\x0b\x0c\r '
+_whitespace = "\t\n\x0b\x0c\r "
 
 
 class ANSITextWrapper(TextWrapper):
@@ -155,14 +153,15 @@ def _munge_whitespace(self, text):
         becomes " foo    bar  baz".
         """
         return text
-# TODO: Ignore expand_tabs/replace_whitespace until ANSIString handles them.
-# - don't remove this code. /Griatch
-#        if self.expand_tabs:
-#            text = text.expandtabs()
-#        if self.replace_whitespace:
-#            if isinstance(text, str):
-#                text = text.translate(self.whitespace_trans)
-#        return text
+
+    # TODO: Ignore expand_tabs/replace_whitespace until ANSIString handles them.
+    # - don't remove this code. /Griatch
+    #        if self.expand_tabs:
+    #            text = text.expandtabs()
+    #        if self.replace_whitespace:
+    #            if isinstance(text, str):
+    #                text = text.translate(self.whitespace_trans)
+    #        return text
 
     def _split(self, text):
         """_split(text : string) -> [string]
@@ -187,7 +186,7 @@ def _split(self, text):
         #               A less hackier solution would be appreciated.
         chunks = _to_ansi(text).split()
 
-        chunks = [chunk+' ' for chunk in chunks if chunk]  # remove empty chunks
+        chunks = [chunk + " " for chunk in chunks if chunk]  # remove empty chunks
 
         if len(chunks) > 1:
             chunks[-1] = chunks[-1][0:-1]
@@ -233,7 +232,7 @@ def _wrap_chunks(self, chunks):
 
             # First chunk on line is whitespace -- drop it, unless this
             # is the very beginning of the text (ie. no lines started yet).
-            if self.drop_whitespace and chunks[-1].strip() == '' and lines:
+            if self.drop_whitespace and chunks[-1].strip() == "" and lines:
                 del chunks[-1]
 
             while chunks:
@@ -254,21 +253,22 @@ def _wrap_chunks(self, chunks):
                 self._handle_long_word(chunks, cur_line, cur_len, width)
 
             # If the last chunk on this line is all whitespace, drop it.
-            if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
+            if self.drop_whitespace and cur_line and cur_line[-1].strip() == "":
                 del cur_line[-1]
 
             # Convert current line back to a string and store it in list
             # of all lines (return value).
             if cur_line:
                 l = ""
-                for w in cur_line:   # ANSI fix
-                    l += w           #
+                for w in cur_line:  # ANSI fix
+                    l += w  #
                 lines.append(indent + l)
         return lines
 
 
 # -- Convenience interface ---------------------------------------------
 
+
 def wrap(text, width=_DEFAULT_WIDTH, **kwargs):
     """
     Wrap a single paragraph of text, returning a list of wrapped lines.
@@ -311,6 +311,7 @@ def fill(text, width=_DEFAULT_WIDTH, **kwargs):
     w = ANSITextWrapper(width=width, **kwargs)
     return w.fill(text)
 
+
 # EvCell class (see further down for the EvTable itself)
 
 
@@ -419,11 +420,13 @@ def __init__(self, data, **kwargs):
 
         borderchar = kwargs.get("border_char", None)
         self.border_left_char = kwargs.get("border_left_char", borderchar if borderchar else "|")
-        self.border_right_char = kwargs.get("border_right_char",
-                                            borderchar if borderchar else self.border_left_char)
+        self.border_right_char = kwargs.get(
+            "border_right_char", borderchar if borderchar else self.border_left_char
+        )
         self.border_top_char = kwargs.get("border_top_char", borderchar if borderchar else "-")
-        self.border_bottom_char = kwargs.get("border_bottom_char",
-                                             borderchar if borderchar else self.border_top_char)
+        self.border_bottom_char = kwargs.get(
+            "border_bottom_char", borderchar if borderchar else self.border_top_char
+        )
 
         corner_char = kwargs.get("corner_char", "+")
         self.corner_top_left_char = kwargs.get("corner_top_left_char", corner_char)
@@ -446,14 +449,18 @@ def __init__(self, data, **kwargs):
         # width/height is given without left/right or top/bottom padding
         if "width" in kwargs:
             width = kwargs.pop("width")
-            self.width = width - self.pad_left - self.pad_right - self.border_left - self.border_right
+            self.width = (
+                width - self.pad_left - self.pad_right - self.border_left - self.border_right
+            )
             if self.width <= 0 < self.raw_width:
                 raise Exception("Cell width too small - no space for data.")
         else:
             self.width = self.raw_width
         if "height" in kwargs:
             height = kwargs.pop("height")
-            self.height = height - self.pad_top - self.pad_bottom - self.border_top - self.border_bottom
+            self.height = (
+                height - self.pad_top - self.pad_bottom - self.border_top - self.border_bottom
+            )
             if self.height <= 0 < self.raw_height:
                 raise Exception("Cell height too small - no space for data.")
         else:
@@ -473,7 +480,7 @@ def _crop(self, text, width):
         """
         if m_len(text) > width:
             crop_string = self.crop_string
-            return text[:width - m_len(crop_string)] + crop_string
+            return text[: width - m_len(crop_string)] + crop_string
         return text
 
     def _reformat(self):
@@ -517,8 +524,12 @@ def _fit_width(self, data):
             if 0 < width < m_len(line):
                 # replace_whitespace=False, expand_tabs=False is a
                 # fix for ANSIString not supporting expand_tabs/translate
-                adjusted_data.extend([ANSIString(part + ANSIString("|n"))
-                                      for part in wrap(line, width=width, drop_whitespace=False)])
+                adjusted_data.extend(
+                    [
+                        ANSIString(part + ANSIString("|n"))
+                        for part in wrap(line, width=width, drop_whitespace=False)
+                    ]
+                )
             else:
                 adjusted_data.append(line)
         if self.enforce_size:
@@ -586,13 +597,26 @@ def _align(self, data):
         hfill_char = self.hfill_char
         width = self.width
         if align == "l":
-            lines = [(line.lstrip(" ") + " " if line.startswith(" ") and not line.startswith("  ")
-                      else line) + hfill_char * (width - m_len(line)) for line in data]
+            lines = [
+                (
+                    line.lstrip(" ") + " "
+                    if line.startswith(" ") and not line.startswith("  ")
+                    else line
+                )
+                + hfill_char * (width - m_len(line))
+                for line in data
+            ]
             return lines
         elif align == "r":
-            return [hfill_char * (width - m_len(line)) + (" " + line.rstrip(" ")
-                                                          if line.endswith(" ") and not line.endswith("  ")
-                                                          else line) for line in data]
+            return [
+                hfill_char * (width - m_len(line))
+                + (
+                    " " + line.rstrip(" ")
+                    if line.endswith(" ") and not line.endswith("  ")
+                    else line
+                )
+                for line in data
+            ]
         else:  # center, 'c'
             return [self._center(line, self.width, self.hfill_char) for line in data]
 
@@ -616,9 +640,9 @@ def _valign(self, data):
         if excess <= 0:
             return data
         # only care if we need to add new lines
-        if valign == 't':
+        if valign == "t":
             return data + [padline for _ in range(excess)]
-        elif valign == 'b':
+        elif valign == "b":
             return [padline for _ in range(excess)] + data
         else:  # center
             narrowside = [padline for _ in range(excess // 2)]
@@ -663,10 +687,16 @@ def _border(self, data):
 
         """
 
-        left = self.border_left_char * self.border_left + ANSIString('|n')
-        right = ANSIString('|n') + self.border_right_char * self.border_right
+        left = self.border_left_char * self.border_left + ANSIString("|n")
+        right = ANSIString("|n") + self.border_right_char * self.border_right
 
-        cwidth = self.width + self.pad_left + self.pad_right + max(0, self.border_left - 1) + max(0, self.border_right - 1)
+        cwidth = (
+            self.width
+            + self.pad_left
+            + self.pad_right
+            + max(0, self.border_left - 1)
+            + max(0, self.border_right - 1)
+        )
 
         vfill = self.corner_top_left_char if left else ""
         vfill += cwidth * self.border_top_char
@@ -754,10 +784,18 @@ def reformat(self, **kwargs):
         # keywords that require manipulation
         padwidth = kwargs.get("pad_width", None)
         padwidth = int(padwidth) if padwidth is not None else None
-        self.pad_left = int(kwargs.pop("pad_left", padwidth if padwidth is not None else self.pad_left))
-        self.pad_right = int(kwargs.pop("pad_right", padwidth if padwidth is not None else self.pad_right))
-        self.pad_top = int(kwargs.pop("pad_top", padwidth if padwidth is not None else self.pad_top))
-        self.pad_bottom = int(kwargs.pop("pad_bottom", padwidth if padwidth is not None else self.pad_bottom))
+        self.pad_left = int(
+            kwargs.pop("pad_left", padwidth if padwidth is not None else self.pad_left)
+        )
+        self.pad_right = int(
+            kwargs.pop("pad_right", padwidth if padwidth is not None else self.pad_right)
+        )
+        self.pad_top = int(
+            kwargs.pop("pad_top", padwidth if padwidth is not None else self.pad_top)
+        )
+        self.pad_bottom = int(
+            kwargs.pop("pad_bottom", padwidth if padwidth is not None else self.pad_bottom)
+        )
 
         self.enforce_size = kwargs.get("enforce_size", False)
 
@@ -775,33 +813,48 @@ def reformat(self, **kwargs):
 
         borderwidth = kwargs.get("border_width", None)
         self.border_left = kwargs.pop(
-            "border_left", borderwidth if borderwidth is not None else self.border_left)
+            "border_left", borderwidth if borderwidth is not None else self.border_left
+        )
         self.border_right = kwargs.pop(
-            "border_right", borderwidth if borderwidth is not None else self.border_right)
+            "border_right", borderwidth if borderwidth is not None else self.border_right
+        )
         self.border_top = kwargs.pop(
-            "border_top", borderwidth if borderwidth is not None else self.border_top)
+            "border_top", borderwidth if borderwidth is not None else self.border_top
+        )
         self.border_bottom = kwargs.pop(
-            "border_bottom", borderwidth if borderwidth is not None else self.border_bottom)
+            "border_bottom", borderwidth if borderwidth is not None else self.border_bottom
+        )
 
         borderchar = kwargs.get("border_char", None)
         self.border_left_char = kwargs.pop(
-            "border_left_char", borderchar if borderchar else self.border_left_char)
+            "border_left_char", borderchar if borderchar else self.border_left_char
+        )
         self.border_right_char = kwargs.pop(
-            "border_right_char", borderchar if borderchar else self.border_right_char)
+            "border_right_char", borderchar if borderchar else self.border_right_char
+        )
         self.border_top_char = kwargs.pop(
-            "border_topchar", borderchar if borderchar else self.border_top_char)
+            "border_topchar", borderchar if borderchar else self.border_top_char
+        )
         self.border_bottom_char = kwargs.pop(
-            "border_bottom_char", borderchar if borderchar else self.border_bottom_char)
+            "border_bottom_char", borderchar if borderchar else self.border_bottom_char
+        )
 
         corner_char = kwargs.get("corner_char", None)
         self.corner_top_left_char = kwargs.pop(
-            "corner_top_left", corner_char if corner_char is not None else self.corner_top_left_char)
+            "corner_top_left", corner_char if corner_char is not None else self.corner_top_left_char
+        )
         self.corner_top_right_char = kwargs.pop(
-            "corner_top_right", corner_char if corner_char is not None else self.corner_top_right_char)
+            "corner_top_right",
+            corner_char if corner_char is not None else self.corner_top_right_char,
+        )
         self.corner_bottom_left_char = kwargs.pop(
-            "corner_bottom_left", corner_char if corner_char is not None else self.corner_bottom_left_char)
+            "corner_bottom_left",
+            corner_char if corner_char is not None else self.corner_bottom_left_char,
+        )
         self.corner_bottom_right_char = kwargs.pop(
-            "corner_bottom_right", corner_char if corner_char is not None else self.corner_bottom_right_char)
+            "corner_bottom_right",
+            corner_char if corner_char is not None else self.corner_bottom_right_char,
+        )
 
         # this is used by the table to adjust size of cells with borders in the middle
         # of the table
@@ -815,15 +868,27 @@ def reformat(self, **kwargs):
         # Handle sizes
         if "width" in kwargs:
             width = kwargs.pop("width")
-            self.width = width - self.pad_left - self.pad_right\
-                - self.border_left - self.border_right + self.trim_horizontal
+            self.width = (
+                width
+                - self.pad_left
+                - self.pad_right
+                - self.border_left
+                - self.border_right
+                + self.trim_horizontal
+            )
             # if self.width <= 0 and self.raw_width > 0:
             if self.width <= 0 < self.raw_width:
                 raise Exception("Cell width too small, no room for data.")
         if "height" in kwargs:
             height = kwargs.pop("height")
-            self.height = height - self.pad_top - self.pad_bottom\
-                - self.border_top - self.border_bottom + self.trim_vertical
+            self.height = (
+                height
+                - self.pad_top
+                - self.pad_bottom
+                - self.border_top
+                - self.border_bottom
+                + self.trim_vertical
+            )
             if self.height <= 0 < self.raw_height:
                 raise Exception("Cell height too small, no room for data.")
 
@@ -850,6 +915,7 @@ def __str__(self):
 
 # EvColumn class
 
+
 class EvColumn(object):
     """
     This class holds a list of Cells to represent a column of a table.
@@ -893,7 +959,9 @@ def _balance(self, **kwargs):
         kwargs.update(self.options)
         # use fixed width or adjust to the largest cell
         if "width" not in kwargs:
-            [cell.reformat() for cell in col]  # this is necessary to get initial widths of all cells
+            [
+                cell.reformat() for cell in col
+            ]  # this is necessary to get initial widths of all cells
             kwargs["width"] = max(cell.get_width() for cell in col) if col else 0
         [cell.reformat(**kwargs) for cell in col]
 
@@ -973,6 +1041,7 @@ def __delitem__(self, index):
 
 # Main Evtable class
 
+
 class EvTable(object):
     """
     The table class holds a list of EvColumns, each consisting of EvCells so
@@ -1072,8 +1141,16 @@ def __init__(self, *args, **kwargs):
         border = kwargs.pop("border", "tablecols")
         if border is None:
             border = "none"
-        if border not in ("none", "table", "tablecols",
-                          "header", "incols", "cols", "rows", "cells"):
+        if border not in (
+            "none",
+            "table",
+            "tablecols",
+            "header",
+            "incols",
+            "cols",
+            "rows",
+            "cells",
+        ):
             raise Exception("Unsupported border type: '%s'" % border)
         self.border = border
 
@@ -1081,14 +1158,18 @@ def __init__(self, *args, **kwargs):
         self.border_width = kwargs.get("border_width", 1)
         self.corner_char = kwargs.get("corner_char", "+")
         pcorners = kwargs.pop("pretty_corners", False)
-        self.corner_top_left_char = _to_ansi(kwargs.pop(
-            "corner_top_left_char", '.' if pcorners else self.corner_char))
-        self.corner_top_right_char = _to_ansi(kwargs.pop(
-            "corner_top_right_char", '.' if pcorners else self.corner_char))
-        self.corner_bottom_left_char = _to_ansi(kwargs.pop(
-            "corner_bottom_left_char", ' ' if pcorners else self.corner_char))
-        self.corner_bottom_right_char = _to_ansi(kwargs.pop(
-            "corner_bottom_right_char", ' ' if pcorners else self.corner_char))
+        self.corner_top_left_char = _to_ansi(
+            kwargs.pop("corner_top_left_char", "." if pcorners else self.corner_char)
+        )
+        self.corner_top_right_char = _to_ansi(
+            kwargs.pop("corner_top_right_char", "." if pcorners else self.corner_char)
+        )
+        self.corner_bottom_left_char = _to_ansi(
+            kwargs.pop("corner_bottom_left_char", " " if pcorners else self.corner_char)
+        )
+        self.corner_bottom_right_char = _to_ansi(
+            kwargs.pop("corner_bottom_right_char", " " if pcorners else self.corner_char)
+        )
 
         self.width = kwargs.pop("width", None)
         self.height = kwargs.pop("height", None)
@@ -1244,8 +1325,8 @@ def _balance(self):
         # actual table. This allows us to add columns/rows
         # and re-balance over and over without issue.
         self.worktable = deepcopy(self.table)
-#        self._borders()
-#        return
+        #        self._borders()
+        #        return
         options = copy(self.options)
 
         # balance number of rows to make a rectangular table
@@ -1283,23 +1364,30 @@ def _balance(self):
                 # get which cols have separately set widths - these should be locked
                 # note that we need to remove cwidths_min for each lock to avoid counting
                 # it twice (in cwmin and in locked_cols)
-                locked_cols = {icol: col.options['width'] - cwidths_min[icol]
-                               for icol, col in enumerate(self.worktable) if 'width' in col.options}
+                locked_cols = {
+                    icol: col.options["width"] - cwidths_min[icol]
+                    for icol, col in enumerate(self.worktable)
+                    if "width" in col.options
+                }
                 locked_width = sum(locked_cols.values())
 
                 excess = width - cwmin - locked_width
 
                 if len(locked_cols) >= ncols and excess:
                     # we can't adjust the width at all - all columns are locked
-                    raise Exception("Cannot balance table to width %s - "
-                                    "all columns have a set, fixed width summing to %s!" % (
-                                        self.width, sum(cwidths)))
+                    raise Exception(
+                        "Cannot balance table to width %s - "
+                        "all columns have a set, fixed width summing to %s!"
+                        % (self.width, sum(cwidths))
+                    )
 
                 if excess < 0:
                     # the locked cols makes it impossible
-                    raise Exception("Cannot shrink table width to %s. "
-                                    "Minimum size (and/or fixed-width columns) "
-                                    "sets minimum at %s." % (self.width, cwmin + locked_width))
+                    raise Exception(
+                        "Cannot shrink table width to %s. "
+                        "Minimum size (and/or fixed-width columns) "
+                        "sets minimum at %s." % (self.width, cwmin + locked_width)
+                    )
 
                 if self.evenwidth:
                     # make each column of equal width
@@ -1343,31 +1431,41 @@ def _balance(self):
                 raise
 
         # equalize heights for each row (we must do this here, since it may have changed to fit new widths)
-        cheights = [max(cell.get_height() for cell in (col[iy] for col in self.worktable)) for iy in range(nrowmax)]
+        cheights = [
+            max(cell.get_height() for cell in (col[iy] for col in self.worktable))
+            for iy in range(nrowmax)
+        ]
 
         if self.height:
             # if we are fixing the table height, it means cells must crop text instead of resizing.
             if nrowmax:
 
                 # get minimum possible cell heights for each column
-                cheights_min = [max(cell.get_min_height()
-                                    for cell in (col[iy] for col in self.worktable)) for iy in range(nrowmax)]
+                cheights_min = [
+                    max(cell.get_min_height() for cell in (col[iy] for col in self.worktable))
+                    for iy in range(nrowmax)
+                ]
                 chmin = sum(cheights_min)
 
                 # get which cols have separately set heights - these should be locked
                 # note that we need to remove cheights_min for each lock to avoid counting
                 # it twice (in chmin and in locked_cols)
-                locked_cols = {icol: col.options['height'] - cheights_min[icol]
-                               for icol, col in enumerate(self.worktable) if 'height' in col.options}
+                locked_cols = {
+                    icol: col.options["height"] - cheights_min[icol]
+                    for icol, col in enumerate(self.worktable)
+                    if "height" in col.options
+                }
                 locked_height = sum(locked_cols.values())
 
                 excess = self.height - chmin - locked_height
 
                 if chmin > self.height:
                     # we cannot shrink any more
-                    raise Exception("Cannot shrink table height to %s. Minimum "
-                                    "size (and/or fixed-height rows) sets minimum at %s." % (
-                                        self.height, chmin + locked_height))
+                    raise Exception(
+                        "Cannot shrink table height to %s. Minimum "
+                        "size (and/or fixed-height rows) sets minimum at %s."
+                        % (self.height, chmin + locked_height)
+                    )
 
                 # now we add all the extra height up to the desired table-height.
                 # We do this so that the tallest cells gets expanded first (and
@@ -1464,7 +1562,7 @@ def add_column(self, *args, **kwargs):
 
         """
         # this will replace default options with new ones without changing default
-        options = dict(listitems(self.options) + listitems(kwargs))
+        options = dict(list(self.options.items()) + list(kwargs.items()))
 
         xpos = kwargs.get("xpos", None)
         column = EvColumn(*args, **options)
@@ -1529,7 +1627,7 @@ def add_row(self, *args, **kwargs):
         """
         # this will replace default options with new ones without changing default
         row = list(args)
-        options = dict(listitems(self.options) + listitems(kwargs))
+        options = dict(list(self.options.items()) + list(kwargs.items()))
 
         ypos = kwargs.get("ypos", None)
         wtable = self.ncols
@@ -1581,8 +1679,12 @@ def reformat(self, **kwargs):
 
         self.corner_top_left_char = _to_ansi(kwargs.pop("corner_top_left_char", self.corner_char))
         self.corner_top_right_char = _to_ansi(kwargs.pop("corner_top_right_char", self.corner_char))
-        self.corner_bottom_left_char = _to_ansi(kwargs.pop("corner_bottom_left_char", self.corner_char))
-        self.corner_bottom_right_char = _to_ansi(kwargs.pop("corner_bottom_right_char", self.corner_char))
+        self.corner_bottom_left_char = _to_ansi(
+            kwargs.pop("corner_bottom_left_char", self.corner_char)
+        )
+        self.corner_bottom_right_char = _to_ansi(
+            kwargs.pop("corner_bottom_right_char", self.corner_char)
+        )
 
         self.options.update(kwargs)
 
@@ -1626,13 +1728,19 @@ def __str__(self):
 
 def _test():
     """Test"""
-    table = EvTable("|yHeading1|n", "|gHeading2|n", table=[[1, 2, 3], [4, 5, 6], [7, 8, 9]], border="cells", align="l")
+    table = EvTable(
+        "|yHeading1|n",
+        "|gHeading2|n",
+        table=[[1, 2, 3], [4, 5, 6], [7, 8, 9]],
+        border="cells",
+        align="l",
+    )
     table.add_column("|rThis is long data|n", "|bThis is even longer data|n")
     table.add_row("This is a single row")
     print(str(table))
     table.reformat(width=50)
     print(str(table))
-    table.reformat_column(3, width=30, align='r')
+    table.reformat_column(3, width=30, align="r")
     print(str(table))
     return table
 
@@ -1640,5 +1748,9 @@ def _test():
 def _test2():
     table = EvTable("|yHeading1|n", "|B|[GHeading2|n", "Heading3")
     for i in range(100):
-        table.add_row("This is col 0, row %i" % i, "|gThis is col 1, row |w%i|n|g.|n" % i, "This is col 2, row %i" % i)
+        table.add_row(
+            "This is col 0, row %i" % i,
+            "|gThis is col 1, row |w%i|n|g.|n" % i,
+            "This is col 2, row %i" % i,
+        )
     return table
diff --git a/evennia/utils/gametime.py b/evennia/utils/gametime.py
index f964c4b053e..b280a839991 100644
--- a/evennia/utils/gametime.py
+++ b/evennia/utils/gametime.py
@@ -61,6 +61,7 @@ def at_repeat(self):
         seconds = real_seconds_until(**self.db.gametime)
         self.restart(interval=seconds)
 
+
 # Access functions
 
 
@@ -87,8 +88,9 @@ def server_epoch():
     """
     global _SERVER_EPOCH
     if not _SERVER_EPOCH:
-        _SERVER_EPOCH = ServerConfig.objects.conf("server_epoch", default=None) \
-            or time.time() - runtime()
+        _SERVER_EPOCH = (
+            ServerConfig.objects.conf("server_epoch", default=None) or time.time() - runtime()
+        )
     return _SERVER_EPOCH
 
 
@@ -115,6 +117,7 @@ def portal_uptime():
         time (float): The uptime of the portal.
     """
     from evennia.server.sessionhandler import SESSIONS
+
     return time.time() - SESSIONS.portal_start_time
 
 
@@ -153,8 +156,7 @@ def gametime(absolute=False):
     return gtime
 
 
-def real_seconds_until(sec=None, min=None, hour=None,
-                       day=None, month=None, year=None):
+def real_seconds_until(sec=None, min=None, hour=None, day=None, month=None, year=None):
     """
     Return the real seconds until game time.
 
@@ -190,10 +192,10 @@ def real_seconds_until(sec=None, min=None, hour=None,
     if projected <= current:
         # We increase one unit of time depending on parameters
         if month is not None:
-            projected = projected.replace(year=s_year+1)
+            projected = projected.replace(year=s_year + 1)
         elif day is not None:
             try:
-                projected = projected.replace(month=s_month+1)
+                projected = projected.replace(month=s_month + 1)
             except ValueError:
                 projected = projected.replace(month=1)
         elif hour is not None:
@@ -208,8 +210,9 @@ def real_seconds_until(sec=None, min=None, hour=None,
     return seconds / TIMEFACTOR
 
 
-def schedule(callback, repeat=False, sec=None, min=None,
-             hour=None, day=None, month=None, year=None):
+def schedule(
+    callback, repeat=False, sec=None, min=None, hour=None, day=None, month=None, year=None
+):
     """
     Call a callback at a given in-game time.
 
@@ -233,12 +236,15 @@ def schedule(callback, repeat=False, sec=None, min=None,
         schedule(func, min=5, sec=0) # Will call 5 minutes past the next (in-game) hour.
         schedule(func, hour=2, min=30, sec=0) # Will call the next (in-game) day at 02:30.
     """
-    seconds = real_seconds_until(sec=sec, min=min, hour=hour,
-                                 day=day, month=month, year=year)
-    script = create_script("evennia.utils.gametime.TimeScript",
-                           key="TimeScript", desc="A gametime-sensitive script",
-                           interval=seconds, start_delay=True,
-                           repeats=-1 if repeat else 1)
+    seconds = real_seconds_until(sec=sec, min=min, hour=hour, day=day, month=month, year=year)
+    script = create_script(
+        "evennia.utils.gametime.TimeScript",
+        key="TimeScript",
+        desc="A gametime-sensitive script",
+        interval=seconds,
+        start_delay=True,
+        repeats=-1 if repeat else 1,
+    )
     script.db.callback = callback
     script.db.gametime = {
         "sec": sec,
diff --git a/evennia/utils/idmapper/manager.py b/evennia/utils/idmapper/manager.py
index 2fb8fa16907..c60c6d89a73 100644
--- a/evennia/utils/idmapper/manager.py
+++ b/evennia/utils/idmapper/manager.py
@@ -18,9 +18,9 @@ def get(self, *args, **kwargs):
         if len(items) == 1:
             # CL: support __exact
             key = items[0]
-            if key.endswith('__exact'):
-                key = key[:-len('__exact')]
-            if key in ('pk', self.model._meta.pk.attname):
+            if key.endswith("__exact"):
+                key = key[: -len("__exact")]
+            if key in ("pk", self.model._meta.pk.attname):
                 try:
                     inst = self.model.get_cached_instance(kwargs[items[0]])
                     # we got the item from cache, but if this is a fk, check it's ours
diff --git a/evennia/utils/idmapper/models.py b/evennia/utils/idmapper/models.py
index 57a7cbaacd4..d2d46493a31 100644
--- a/evennia/utils/idmapper/models.py
+++ b/evennia/utils/idmapper/models.py
@@ -7,9 +7,6 @@
 Also adds `cache_size()` for monitoring the size of the cache.
 """
 
-from builtins import object
-from future.utils import listitems, listvalues, with_metaclass
-
 import os
 import threading
 import gc
@@ -61,6 +58,7 @@ def __call__(cls, *args, **kwargs):
         populated whenever possible (ie when it is possible to infer the pk value).
 
         """
+
         def new_instance():
             return super(SharedMemoryModelBase, cls).__call__(*args, **kwargs)
 
@@ -112,16 +110,21 @@ def __new__(cls, name, bases, attrs):
         # set up the typeclass handling only if a variable _is_typeclass is set on the class
         def create_wrapper(cls, fieldname, wrappername, editable=True, foreignkey=False):
             "Helper method to create property wrappers with unique names (must be in separate call)"
+
             def _get(cls, fname):
                 "Wrapper for getting database field"
                 if _GA(cls, "_is_deleted"):
-                    raise ObjectDoesNotExist("Cannot access %s: Hosting object was already deleted." % fname)
+                    raise ObjectDoesNotExist(
+                        "Cannot access %s: Hosting object was already deleted." % fname
+                    )
                 return _GA(cls, fieldname)
 
             def _get_foreign(cls, fname):
                 "Wrapper for returning foreignkey fields"
                 if _GA(cls, "_is_deleted"):
-                    raise ObjectDoesNotExist("Cannot access %s: Hosting object was already deleted." % fname)
+                    raise ObjectDoesNotExist(
+                        "Cannot access %s: Hosting object was already deleted." % fname
+                    )
                 return _GA(cls, fieldname)
 
             def _set_nonedit(cls, fname, value):
@@ -131,20 +134,26 @@ def _set_nonedit(cls, fname, value):
             def _set(cls, fname, value):
                 "Wrapper for setting database field"
                 if _GA(cls, "_is_deleted"):
-                    raise ObjectDoesNotExist("Cannot set %s to %s: Hosting object was already deleted!" % (fname, value))
+                    raise ObjectDoesNotExist(
+                        "Cannot set %s to %s: Hosting object was already deleted!" % (fname, value)
+                    )
                 _SA(cls, fname, value)
                 # only use explicit update_fields in save if we actually have a
                 # primary key assigned already (won't be set when first creating object)
-                update_fields = [fname] if _GA(cls, "_get_pk_val")(_GA(cls, "_meta")) is not None else None
+                update_fields = (
+                    [fname] if _GA(cls, "_get_pk_val")(_GA(cls, "_meta")) is not None else None
+                )
                 _GA(cls, "save")(update_fields=update_fields)
 
             def _set_foreign(cls, fname, value):
                 "Setter only used on foreign key relations, allows setting with #dbref"
                 if _GA(cls, "_is_deleted"):
-                    raise ObjectDoesNotExist("Cannot set %s to %s: Hosting object was already deleted!" % (fname, value))
+                    raise ObjectDoesNotExist(
+                        "Cannot set %s to %s: Hosting object was already deleted!" % (fname, value)
+                    )
                 if isinstance(value, (str, int)):
                     value = to_str(value)
-                    if (value.isdigit() or value.startswith("#")):
+                    if value.isdigit() or value.startswith("#"):
                         # we also allow setting using dbrefs, if so we try to load the matching object.
                         # (we assume the object is of the same type as the class holding the field, if
                         # not a custom handler must be used for that field)
@@ -159,7 +168,9 @@ def _set_foreign(cls, fname, value):
                 _SA(cls, fname, value)
                 # only use explicit update_fields in save if we actually have a
                 # primary key assigned already (won't be set when first creating object)
-                update_fields = [fname] if _GA(cls, "_get_pk_val")(_GA(cls, "_meta")) is not None else None
+                update_fields = (
+                    [fname] if _GA(cls, "_get_pk_val")(_GA(cls, "_meta")) is not None else None
+                )
                 _GA(cls, "save")(update_fields=update_fields)
 
             def _del_nonedit(cls, fname):
@@ -169,21 +180,39 @@ def _del_nonedit(cls, fname):
             def _del(cls, fname):
                 "Wrapper for clearing database field - sets it to None"
                 _SA(cls, fname, None)
-                update_fields = [fname] if _GA(cls, "_get_pk_val")(_GA(cls, "_meta")) is not None else None
+                update_fields = (
+                    [fname] if _GA(cls, "_get_pk_val")(_GA(cls, "_meta")) is not None else None
+                )
                 _GA(cls, "save")(update_fields=update_fields)
 
             # wrapper factories
             if not editable:
-                def fget(cls): return _get(cls, fieldname)
-                def fset(cls, val): return _set_nonedit(cls, fieldname, val)
+
+                def fget(cls):
+                    return _get(cls, fieldname)
+
+                def fset(cls, val):
+                    return _set_nonedit(cls, fieldname, val)
+
             elif foreignkey:
-                def fget(cls): return _get_foreign(cls, fieldname)
-                def fset(cls, val): return _set_foreign(cls, fieldname, val)
+
+                def fget(cls):
+                    return _get_foreign(cls, fieldname)
+
+                def fset(cls, val):
+                    return _set_foreign(cls, fieldname, val)
+
             else:
-                def fget(cls): return _get(cls, fieldname)
-                def fset(cls, val): return _set(cls, fieldname, val)
 
-            def fdel(cls): return _del(cls, fieldname) if editable else _del_nonedit(cls, fieldname)
+                def fget(cls):
+                    return _get(cls, fieldname)
+
+                def fset(cls, val):
+                    return _set(cls, fieldname, val)
+
+            def fdel(cls):
+                return _del(cls, fieldname) if editable else _del_nonedit(cls, fieldname)
+
             # set docstrings for auto-doc
             fget.__doc__ = "A wrapper for getting database field `%s`." % fieldname
             fset.__doc__ = "A wrapper for setting (and saving) database field `%s`." % fieldname
@@ -197,18 +226,23 @@ def fdel(cls): return _del(cls, fieldname) if editable else _del_nonedit(cls, fi
             return
         # dynamically create the wrapper properties for all fields not already handled
         # (manytomanyfields are always handlers)
-        for fieldname, field in ((fname, field) for fname, field in listitems(attrs)
-                                 if fname.startswith("db_") and type(field).__name__ != "ManyToManyField"):
+        for fieldname, field in (
+            (fname, field)
+            for fname, field in list(attrs.items())
+            if fname.startswith("db_") and type(field).__name__ != "ManyToManyField"
+        ):
             foreignkey = type(field).__name__ == "ForeignKey"
             wrappername = "dbid" if fieldname == "id" else fieldname.replace("db_", "", 1)
             if wrappername not in attrs:
                 # makes sure not to overload manually created wrappers on the model
-                create_wrapper(cls, fieldname, wrappername, editable=field.editable, foreignkey=foreignkey)
+                create_wrapper(
+                    cls, fieldname, wrappername, editable=field.editable, foreignkey=foreignkey
+                )
 
         return super().__new__(cls, name, bases, attrs)
 
 
-class SharedMemoryModel(with_metaclass(SharedMemoryModelBase, Model)):
+class SharedMemoryModel(Model, metaclass=SharedMemoryModelBase):
     """
     Base class for idmapped objects. Inherit from `this`.
     """
@@ -228,7 +262,7 @@ def _get_cache_key(cls, args, kwargs):
         """
         result = None
         # Quick hack for my composites work for now.
-        if hasattr(cls._meta, 'pks'):
+        if hasattr(cls._meta, "pks"):
             pk = cls._meta.pks[0]
         else:
             pk = cls._meta.pk
@@ -291,7 +325,7 @@ def get_all_cached_instances(cls):
         Return the objects so far cached by idmapper for this class.
 
         """
-        return listvalues(cls.__dbclass__.__instance_cache__)
+        return list(cls.__dbclass__.__instance_cache__.values())
 
     @classmethod
     def _flush_cached_by_key(cls, key, force=True):
@@ -318,7 +352,8 @@ def flush_cached_instance(cls, instance, force=True):
 
         """
         cls._flush_cached_by_key(instance._get_pk_val(), force=force)
-    #flush_cached_instance = classmethod(flush_cached_instance)
+
+    # flush_cached_instance = classmethod(flush_cached_instance)
 
     @classmethod
     def flush_instance_cache(cls, force=False):
@@ -330,9 +365,13 @@ def flush_instance_cache(cls, force=False):
         if force:
             cls.__dbclass__.__instance_cache__ = {}
         else:
-            cls.__dbclass__.__instance_cache__ = dict((key, obj) for key, obj in cls.__dbclass__.__instance_cache__.items()
-                                                      if not obj.at_idmapper_flush())
-    #flush_instance_cache = classmethod(flush_instance_cache)
+            cls.__dbclass__.__instance_cache__ = dict(
+                (key, obj)
+                for key, obj in cls.__dbclass__.__instance_cache__.items()
+                if not obj.at_idmapper_flush()
+            )
+
+    # flush_instance_cache = classmethod(flush_instance_cache)
 
     # per-instance methods
 
@@ -404,7 +443,7 @@ def save(self, *args, **kwargs):
             except DatabaseError:
                 # we handle the 'update_fields did not update any rows' error that
                 # may happen due to timing issues with attributes
-                ufields_removed = kwargs.pop('update_fields', None)
+                ufields_removed = kwargs.pop("update_fields", None)
                 if ufields_removed:
                     super().save(*args, **kwargs)
                 else:
@@ -413,6 +452,7 @@ def save(self, *args, **kwargs):
             # in another thread; make sure to save in reactor thread
             def _save_callback(cls, *args, **kwargs):
                 super().save(*args, **kwargs)
+
             callFromThread(_save_callback, self, *args, **kwargs)
 
         if not self.pk:
@@ -424,8 +464,9 @@ def _save_callback(cls, *args, **kwargs):
         new = False
         if "update_fields" in kwargs and kwargs["update_fields"]:
             # get field objects from their names
-            update_fields = (self._meta.get_field(fieldname)
-                             for fieldname in kwargs.get("update_fields"))
+            update_fields = (
+                self._meta.get_field(fieldname) for fieldname in kwargs.get("update_fields")
+            )
         else:
             # meta.fields are already field objects; get them all
             new = True
@@ -439,11 +480,11 @@ def _save_callback(cls, *args, **kwargs):
             if hasattr(self, hookname) and callable(_GA(self, hookname)):
                 _GA(self, hookname)(new)
 
-#            # if a trackerhandler is set on this object, update it with the
-#            # fieldname and the new value
-#            fieldtracker = "_oob_at_%s_postsave" % fieldname
-#            if hasattr(self, fieldtracker):
-#                _GA(self, fieldtracker)(fieldname)
+        #            # if a trackerhandler is set on this object, update it with the
+        #            # fieldname and the new value
+        #            fieldtracker = "_oob_at_%s_postsave" % fieldname
+        #            if hasattr(self, fieldtracker):
+        #                _GA(self, fieldtracker)(fieldname)
         pass
 
 
@@ -452,16 +493,18 @@ class WeakSharedMemoryModelBase(SharedMemoryModelBase):
     Uses a WeakValue dictionary for caching instead of a regular one.
 
     """
+
     def _prepare(cls):
         super()._prepare()
         cls.__dbclass__.__instance_cache__ = WeakValueDictionary()
 
 
-class WeakSharedMemoryModel(with_metaclass(WeakSharedMemoryModelBase, SharedMemoryModel)):
+class WeakSharedMemoryModel(SharedMemoryModel, metaclass=WeakSharedMemoryModelBase):
     """
     Uses a WeakValue dictionary for caching instead of a regular one
 
     """
+
     class Meta(object):
         abstract = True
 
@@ -475,6 +518,7 @@ def flush_cache(**kwargs):
     Uses a signal so we make sure to catch cascades.
 
     """
+
     def class_hierarchy(clslist):
         """Recursively yield a class hierarchy"""
         for cls in clslist:
@@ -501,7 +545,7 @@ def flush_cached_instance(sender, instance, **kwargs):
 
     """
     # XXX: Is this the best way to make sure we can flush?
-    if not hasattr(instance, 'flush_cached_instance'):
+    if not hasattr(instance, "flush_cached_instance"):
         return
     sender.flush_cached_instance(instance, force=True)
 
@@ -514,7 +558,7 @@ def update_cached_instance(sender, instance, **kwargs):
     Re-cache the given instance in the idmapper cache.
 
     """
-    if not hasattr(instance, 'cache_instance'):
+    if not hasattr(instance, "cache_instance"):
         return
     sender.cache_instance(instance)
 
@@ -573,8 +617,10 @@ def mem2cachesize(desired_rmem):
 
     if ((now - LAST_FLUSH) < AUTO_FLUSH_MIN_INTERVAL) and not force:
         # too soon after last flush.
-        logger.log_warn("Warning: Idmapper flush called more than "
-                        "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL / 60.0))
+        logger.log_warn(
+            "Warning: Idmapper flush called more than "
+            "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL / 60.0)
+        )
         return
 
     if os.name == "nt":
@@ -584,7 +630,9 @@ def mem2cachesize(desired_rmem):
     # check actual memory usage
     Ncache_max = mem2cachesize(max_rmem)
     Ncache, _ = cache_size()
-    actual_rmem = float(os.popen('ps -p %d -o %s | tail -1' % (os.getpid(), "rss")).read()) / 1000.0  # resident memory
+    actual_rmem = (
+        float(os.popen("ps -p %d -o %s | tail -1" % (os.getpid(), "rss")).read()) / 1000.0
+    )  # resident memory
 
     if Ncache >= Ncache_max and actual_rmem > max_rmem * 0.9:
         # flush cache when number of objects in cache is big enough and our
@@ -620,5 +668,6 @@ def get_recurse(submodels):
                 classdict[submodel.__dbclass__.__name__] = num
             else:
                 get_recurse(subclasses)
+
     get_recurse(SharedMemoryModel.__subclasses__())
     return numtotal[0], classdict
diff --git a/evennia/utils/idmapper/tests.py b/evennia/utils/idmapper/tests.py
index 29c3cf7ba2c..1ecd95cde00 100644
--- a/evennia/utils/idmapper/tests.py
+++ b/evennia/utils/idmapper/tests.py
@@ -1,6 +1,3 @@
-
-from builtins import range
-
 from django.test import TestCase
 
 from .models import SharedMemoryModel
@@ -37,39 +34,43 @@ def setUp(self):
         regcategory = RegularCategory.objects.create(name="Category %d" % (n,))
 
         for n in range(0, 10):
-            Article.objects.create(name="Article %d" % (n,), category=category, category2=regcategory)
-            RegularArticle.objects.create(name="Article %d" % (n,), category=category, category2=regcategory)
+            Article.objects.create(
+                name="Article %d" % (n,), category=category, category2=regcategory
+            )
+            RegularArticle.objects.create(
+                name="Article %d" % (n,), category=category, category2=regcategory
+            )
 
     def testSharedMemoryReferences(self):
-        article_list = Article.objects.all().select_related('category')
+        article_list = Article.objects.all().select_related("category")
         last_article = article_list[0]
         for article in article_list[1:]:
             self.assertEqual(article.category is last_article.category, True)
             last_article = article
 
     def testRegularReferences(self):
-        article_list = RegularArticle.objects.all().select_related('category')
+        article_list = RegularArticle.objects.all().select_related("category")
         last_article = article_list[0]
         for article in article_list[1:]:
             self.assertEqual(article.category2 is last_article.category2, False)
             last_article = article
 
     def testMixedReferences(self):
-        article_list = RegularArticle.objects.all().select_related('category')
+        article_list = RegularArticle.objects.all().select_related("category")
         last_article = article_list[0]
         for article in article_list[1:]:
             self.assertEqual(article.category is last_article.category, True)
             last_article = article
 
-        #article_list = Article.objects.all().select_related('category')
-        #last_article = article_list[0]
+        # article_list = Article.objects.all().select_related('category')
+        # last_article = article_list[0]
         # for article in article_list[1:]:
         #    self.assertEquals(article.category2 is last_article.category2, False)
         #    last_article = article
 
     def testObjectDeletion(self):
         # This must execute first so its guaranteed to be in memory.
-        list(Article.objects.all().select_related('category'))
+        list(Article.objects.all().select_related("category"))
 
         article = Article.objects.all()[0:1].get()
         pk = article.pk
diff --git a/evennia/utils/inlinefuncs.py b/evennia/utils/inlinefuncs.py
index 8de765b3cd8..a92fa2ebbd3 100644
--- a/evennia/utils/inlinefuncs.py
+++ b/evennia/utils/inlinefuncs.py
@@ -69,6 +69,7 @@ def funcname (*args, **kwargs):
 
 # example/testing inline functions
 
+
 def pad(*args, **kwargs):
     """
     Inlinefunc. Pads text to given width.
@@ -87,14 +88,14 @@ def pad(*args, **kwargs):
         `$pad(text, width, align, fillchar)`
 
     """
-    text, width, align, fillchar = "", 78, 'c', ' '
+    text, width, align, fillchar = "", 78, "c", " "
     nargs = len(args)
     if nargs > 0:
         text = args[0]
     if nargs > 1:
         width = int(args[1]) if args[1].strip().isdigit() else 78
     if nargs > 2:
-        align = args[2] if args[2] in ('c', 'l', 'r') else 'c'
+        align = args[2] if args[2] in ("c", "l", "r") else "c"
     if nargs > 3:
         fillchar = args[3]
     return utils.pad(text, width=width, align=align, fillchar=fillchar)
@@ -128,6 +129,26 @@ def crop(*args, **kwargs):
     return utils.crop(text, width=width, suffix=suffix)
 
 
+def space(*args, **kwargs):
+    """
+    Inlinefunc. Inserts an arbitrary number of spaces. Defaults to 4 spaces.
+
+    Args:
+        spaces (int, optional): The number of spaces to insert.
+
+    Kwargs:
+        session (Session): Session performing the crop.
+
+    Example:
+        `$space(20)`
+
+    """
+    width = 4
+    if args:
+        width = abs(int(args[0])) if args[0].strip().isdigit() else 4
+    return " " * width
+
+
 def clr(*args, **kwargs):
     """
     Inlinefunc. Colorizes nested text.
@@ -160,7 +181,7 @@ def clr(*args, **kwargs):
 
 
 def null(*args, **kwargs):
-    return args[0] if args else ''
+    return args[0] if args else ""
 
 
 def nomatch(name, *args, **kwargs):
@@ -174,15 +195,19 @@ def nomatch(name, *args, **kwargs):
     return "${name}({args}{kwargs})".format(
         name=name,
         args=",".join(args),
-        kwargs=",".join("{}={}".format(key, val) for key, val in kwargs.items()))
+        kwargs=",".join("{}={}".format(key, val) for key, val in kwargs.items()),
+    )
+
 
 _INLINE_FUNCS = {}
 
 # we specify a default nomatch function to use if no matching func was
 # found. This will be overloaded by any nomatch function defined in
 # the imported modules.
-_DEFAULT_FUNCS = {"nomatch": lambda *args, **kwargs: "<UNKNOWN>",
-                  "stackfull": lambda *args, **kwargs: "\n (not parsed: "}
+_DEFAULT_FUNCS = {
+    "nomatch": lambda *args, **kwargs: "<UNKNOWN>",
+    "stackfull": lambda *args, **kwargs: "\n (not parsed: ",
+}
 
 _INLINE_FUNCS.update(_DEFAULT_FUNCS)
 
@@ -193,9 +218,11 @@ def nomatch(name, *args, **kwargs):
     except ImportError as err:
         if module == "server.conf.inlinefuncs":
             # a temporary warning since the default module changed name
-            raise ImportError("Error: %s\nPossible reason: mygame/server/conf/inlinefunc.py should "
-                              "be renamed to mygame/server/conf/inlinefuncs.py (note "
-                              "the S at the end)." % err)
+            raise ImportError(
+                "Error: %s\nPossible reason: mygame/server/conf/inlinefunc.py should "
+                "be renamed to mygame/server/conf/inlinefuncs.py (note "
+                "the S at the end)." % err
+            )
         else:
             raise
 
@@ -211,7 +238,8 @@ def nomatch(name, *args, **kwargs):
 _RE_STARTTOKEN = re.compile(r"(?<!\\)\$(\w+)\(")  # unescaped $funcname( (start of function call)
 
 # note: this regex can be experimented with at https://regex101.com/r/kGR3vE/2
-_RE_TOKEN = re.compile(r"""
+_RE_TOKEN = re.compile(
+    r"""
       (?<!\\)\'\'\'(?P<singlequote>.*?)(?<!\\)\'\'\'|  # single-triplets escape all inside
       (?<!\\)\"\"\"(?P<doublequote>.*?)(?<!\\)\"\"\"|  # double-triplets escape all inside
       (?P<comma>(?<!\\)\,)|                            # , (argument sep)
@@ -222,7 +250,8 @@ def nomatch(name, *args, **kwargs):
             \\\'|\\\"|\\\)|\\\$\w+\(|\\\()|
       (?P<rest>                                        # everything else to re-insert verbatim
             \$(?!\w+\()|\'|\"|\\|[^),$\'\"\\\(]+)""",
-                       re.UNICODE | re.IGNORECASE | re.VERBOSE | re.DOTALL)
+    re.UNICODE | re.IGNORECASE | re.VERBOSE | re.DOTALL,
+)
 
 # Cache for function lookups.
 _PARSING_CACHE = utils.LimitedSizeOrderedDict(size_limit=1000)
@@ -253,8 +282,11 @@ def __init__(self, *args, **kwargs):
         self._string_last = True
 
     def __eq__(self, other):
-        return (super().__eq__(other) and
-                hasattr(other, "_string_last") and self._string_last == other._string_last)
+        return (
+            super().__eq__(other)
+            and hasattr(other, "_string_last")
+            and self._string_last == other._string_last
+        )
 
     def __ne__(self, other):
         return not self.__eq__(other)
@@ -422,6 +454,7 @@ def _run_stack(item, depth=0):
                 kwargs["inlinefunc_stack_depth"] = depth
                 retval = "" if strip else func(*args, **kwargs)
         return utils.to_str(retval)
+
     retval = "".join(_run_stack(item) for item in stack)
     if stacktrace:
         out = "STACK: \n{} => {}\n".format(stack, retval)
@@ -431,6 +464,7 @@ def _run_stack(item, depth=0):
     # execute the stack
     return retval
 
+
 #
 # Nick templating
 #
diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py
index 9c834431dd7..98060208dae 100644
--- a/evennia/utils/logger.py
+++ b/evennia/utils/logger.py
@@ -14,7 +14,6 @@
 """
 
 
-
 import os
 import time
 from datetime import datetime
@@ -62,12 +61,17 @@ def timeformat(when=None):
         tz_hour = abs(int(tz_offset // 3600))
         tz_mins = abs(int(tz_offset // 60 % 60))
         tz_sign = "-" if tz_offset >= 0 else "+"
-        tz = "%s%02d%s" % (tz_sign, tz_hour,
-                           (":%02d" % tz_mins if tz_mins else ""))
+        tz = "%s%02d%s" % (tz_sign, tz_hour, (":%02d" % tz_mins if tz_mins else ""))
 
-    return '%d-%02d-%02d %02d:%02d:%02d%s' % (
-        when.year - 2000, when.month, when.day,
-        when.hour, when.minute, when.second, tz)
+    return "%d-%02d-%02d %02d:%02d:%02d%s" % (
+        when.year - 2000,
+        when.month,
+        when.day,
+        when.hour,
+        when.minute,
+        when.second,
+        tz,
+    )
 
 
 class WeeklyLogFile(logfile.DailyLogFile):
@@ -75,6 +79,7 @@ class WeeklyLogFile(logfile.DailyLogFile):
     Log file that rotates once per week. Overrides key methods to change format
 
     """
+
     day_rotation = 7
 
     def shouldRotate(self):
@@ -89,10 +94,10 @@ def suffix(self, tupledate):
         Format changed to have 03 for march instead of 3 etc (retaining unix file order)  
         """
         try:
-            return '_'.join(["{:02d}".format(part) for part in tupledate])
+            return "_".join(["{:02d}".format(part) for part in tupledate])
         except Exception:
             # try taking a float unixtime
-            return '_'.join(["{:02d}".format(part) for part in self.toDate(tupledate)])
+            return "_".join(["{:02d}".format(part) for part in self.toDate(tupledate)])
 
     def write(self, data):
         "Write data to log file"
@@ -104,6 +109,7 @@ class PortalLogObserver(log.FileLogObserver):
     """
     Reformat logging
     """
+
     timeFormat = None
     prefix = "  |Portal| "
 
@@ -118,8 +124,7 @@ def emit(self, eventDict):
 
         # timeStr = self.formatTime(eventDict["time"])
         timeStr = timeformat(eventDict["time"])
-        fmtDict = {
-            "text": text.replace("\n", "\n\t")}
+        fmtDict = {"text": text.replace("\n", "\n\t")}
 
         msgStr = log._safeFormat("%(text)s\n", fmtDict)
 
@@ -161,16 +166,16 @@ def log_trace(errmsg=None):
     try:
         if tracestring:
             for line in tracestring.splitlines():
-                log.msg('[::] %s' % line)
+                log.msg("[::] %s" % line)
         if errmsg:
             try:
                 errmsg = str(errmsg)
             except Exception as e:
                 errmsg = str(e)
             for line in errmsg.splitlines():
-                log_msg('[EE] %s' % line)
+                log_msg("[EE] %s" % line)
     except Exception:
-        log_msg('[EE] %s' % errmsg)
+        log_msg("[EE] %s" % errmsg)
 
 
 log_tracemsg = log_trace
@@ -189,10 +194,11 @@ def log_err(errmsg):
     except Exception as e:
         errmsg = str(e)
     for line in errmsg.splitlines():
-        log_msg('[EE] %s' % line)
-
+        log_msg("[EE] %s" % line)
 
     # log.err('ERROR: %s' % (errmsg,))
+
+
 log_errmsg = log_err
 
 
@@ -207,7 +213,7 @@ def log_server(servermsg):
     except Exception as e:
         servermsg = str(e)
     for line in servermsg.splitlines():
-        log_msg('[Server] %s' % line)
+        log_msg("[Server] %s" % line)
 
 
 def log_warn(warnmsg):
@@ -223,10 +229,11 @@ def log_warn(warnmsg):
     except Exception as e:
         warnmsg = str(e)
     for line in warnmsg.splitlines():
-        log_msg('[WW] %s' % line)
-
+        log_msg("[WW] %s" % line)
 
     # log.msg('WARNING: %s' % (warnmsg,))
+
+
 log_warnmsg = log_warn
 
 
@@ -241,7 +248,7 @@ def log_info(infomsg):
     except Exception as e:
         infomsg = str(e)
     for line in infomsg.splitlines():
-        log_msg('[..] %s' % line)
+        log_msg("[..] %s" % line)
 
 
 log_infomsg = log_info
@@ -259,11 +266,12 @@ def log_dep(depmsg):
     except Exception as e:
         depmsg = str(e)
     for line in depmsg.splitlines():
-        log_msg('[DP] %s' % line)
+        log_msg("[DP] %s" % line)
 
 
 log_depmsg = log_dep
 
+
 def log_sec(secmsg):
     """
     Prints a security-related message.
@@ -276,7 +284,7 @@ def log_sec(secmsg):
     except Exception as e:
         secmsg = str(e)
     for line in secmsg.splitlines():
-        log_msg('[SS] %s' % line)
+        log_msg("[SS] %s" % line)
 
 
 log_secmsg = log_sec
@@ -284,6 +292,7 @@ def log_sec(secmsg):
 
 # Arbitrary file logger
 
+
 class EvenniaLogFile(logfile.LogFile):
     """
     A rotating logfile based off Twisted's LogFile. It overrides
@@ -291,11 +300,13 @@ class EvenniaLogFile(logfile.LogFile):
     lines of the previous log to the start of the new log, in order
     to preserve a continuous chat history for channel log files.
     """
+
     # we delay import of settings to keep logger module as free
     # from django as possible.
     global _CHANNEL_LOG_NUM_TAIL_LINES
     if _CHANNEL_LOG_NUM_TAIL_LINES is None:
         from django.conf import settings
+
         _CHANNEL_LOG_NUM_TAIL_LINES = settings.CHANNEL_LOG_NUM_TAIL_LINES
     num_lines_to_append = _CHANNEL_LOG_NUM_TAIL_LINES
 
@@ -334,7 +345,7 @@ def readlines(self, *args, **kwargs):
         Returns:
             lines (list): lines from our _file attribute.
         """
-        return self._file.readlines(*args, **kwargs)
+        return [line.decode("utf-8") for line in self._file.readlines(*args, **kwargs)]
 
 
 _LOG_FILE_HANDLES = {}  # holds open log handles
@@ -358,6 +369,7 @@ def _open_log_file(filename):
     global _LOG_FILE_HANDLES, _LOG_FILE_HANDLE_COUNTS, _LOGDIR, _LOG_ROTATE_SIZE
     if not _LOGDIR:
         from django.conf import settings
+
         _LOGDIR = settings.LOG_DIR
         _LOG_ROTATE_SIZE = settings.CHANNEL_LOG_ROTATE_SIZE
 
@@ -393,6 +405,7 @@ def log_file(msg, filename="game.log"):
             on new lines following datetime info.
 
     """
+
     def callback(filehandle, msg):
         """Writing to file and flushing result"""
         msg = "\n%s [-] %s" % (timeformat(), msg.strip())
@@ -433,6 +446,7 @@ def tail_log_file(filename, offset, nlines, callback=None):
             all if the file is shorter than nlines.
 
     """
+
     def seek_file(filehandle, offset, nlines, callback):
         """step backwards in chunks and stop only when we have enough lines"""
         lines_found = []
@@ -450,7 +464,7 @@ def seek_file(filehandle, offset, nlines, callback):
             lines_found = filehandle.readlines()
             block_count -= 1
         # return the right number of lines
-        lines_found = lines_found[-nlines - offset:-offset if offset else None]
+        lines_found = lines_found[-nlines - offset : -offset if offset else None]
         if callback:
             callback(lines_found)
             return None
@@ -464,7 +478,9 @@ def errback(failure):
     filehandle = _open_log_file(filename)
     if filehandle:
         if callback:
-            return deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(errback)
+            return deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(
+                errback
+            )
         else:
             return seek_file(filehandle, offset, nlines, callback)
     else:
diff --git a/evennia/utils/optionclasses.py b/evennia/utils/optionclasses.py
index ded346c9cbe..49cc4ded2da 100644
--- a/evennia/utils/optionclasses.py
+++ b/evennia/utils/optionclasses.py
@@ -20,9 +20,9 @@ class BaseOption(object):
         validator_key (str): The key of the Validator this uses.
 
     """
+
     def __str__(self):
-        return "<Option {key}: {value}>".format(
-            key=self.key, value=crop(str(self.value), width=10))
+        return "<Option {key}: {value}>".format(key=self.key, value=crop(str(self.value), width=10))
 
     def __repr__(self):
         return str(self)
@@ -99,7 +99,8 @@ def load(self):
 
         try:
             self.value_storage = self.deserialize(
-                loadfunc(self.key, default=self.default_value, **load_kwargs))
+                loadfunc(self.key, default=self.default_value, **load_kwargs)
+            )
         except Exception:
             logger.log_trace()
             return False
@@ -188,7 +189,6 @@ def display(self, **kwargs):
 
 
 class Text(BaseOption):
-
     def deserialize(self, save_data):
         got_data = str(save_data)
         if not got_data:
@@ -197,7 +197,6 @@ def deserialize(self, save_data):
 
 
 class Email(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.email(value, option_key=self.key, **kwargs)
 
@@ -209,14 +208,13 @@ def deserialize(self, save_data):
 
 
 class Boolean(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.boolean(value, option_key=self.key, **kwargs)
 
     def display(self, **kwargs):
         if self.value:
-            return '1 - On/True'
-        return '0 - Off/False'
+            return "1 - On/True"
+        return "0 - Off/False"
 
     def serialize(self):
         return self.value
@@ -228,21 +226,19 @@ def deserialize(self, save_data):
 
 
 class Color(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.color(value, option_key=self.key, **kwargs)
 
     def display(self, **kwargs):
-        return f'{self.value} - |{self.value}this|n'
+        return f"{self.value} - |{self.value}this|n"
 
     def deserialize(self, save_data):
-        if not save_data or len(strip_ansi(f'|{save_data}|n')) > 0:
+        if not save_data or len(strip_ansi(f"|{save_data}|n")) > 0:
             raise ValueError(f"{self.key} expected Color Code, got '{save_data}'")
         return save_data
 
 
 class Timezone(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.timezone(value, option_key=self.key, **kwargs)
 
@@ -260,7 +256,7 @@ def serialize(self):
 
 
 class UnsignedInteger(BaseOption):
-    validator_key = 'unsigned_integer'
+    validator_key = "unsigned_integer"
 
     def validate(self, value, **kwargs):
         return validatorfuncs.unsigned_integer(value, option_key=self.key, **kwargs)
@@ -272,7 +268,6 @@ def deserialize(self, save_data):
 
 
 class SignedInteger(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.signed_integer(value, option_key=self.key, **kwargs)
 
@@ -283,7 +278,6 @@ def deserialize(self, save_data):
 
 
 class PositiveInteger(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.positive_integer(value, option_key=self.key, **kwargs)
 
@@ -294,7 +288,6 @@ def deserialize(self, save_data):
 
 
 class Duration(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.duration(value, option_key=self.key, **kwargs)
 
@@ -308,7 +301,6 @@ def serialize(self):
 
 
 class Datetime(BaseOption):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.datetime(value, option_key=self.key, **kwargs)
 
@@ -318,16 +310,14 @@ def deserialize(self, save_data):
         raise ValueError(f"{self.key} expected UTC Datetime in EPOCH format, got '{save_data}'")
 
     def serialize(self):
-        return int(self.value_storage.strftime('%s'))
+        return int(self.value_storage.strftime("%s"))
 
 
 class Future(Datetime):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.future(value, option_key=self.key, **kwargs)
 
 
 class Lock(Text):
-
     def validate(self, value, **kwargs):
         return validatorfuncs.lock(value, option_key=self.key, **kwargs)
diff --git a/evennia/utils/optionhandler.py b/evennia/utils/optionhandler.py
index 582b30df10c..fa59c9fc8d3 100644
--- a/evennia/utils/optionhandler.py
+++ b/evennia/utils/optionhandler.py
@@ -11,6 +11,7 @@ class InMemorySaveHandler(object):
     and storing data in memory.
 
     """
+
     def __init__(self):
         self.storage = {}
 
@@ -32,8 +33,15 @@ class OptionHandler(object):
 
     """
 
-    def __init__(self, obj, options_dict=None, savefunc=None, loadfunc=None,
-                 save_kwargs=None, load_kwargs=None):
+    def __init__(
+        self,
+        obj,
+        options_dict=None,
+        savefunc=None,
+        loadfunc=None,
+        save_kwargs=None,
+        load_kwargs=None,
+    ):
         """
         Initialize an OptionHandler.
 
diff --git a/evennia/utils/picklefield.py b/evennia/utils/picklefield.py
index 66362077b85..0b4cea45321 100644
--- a/evennia/utils/picklefield.py
+++ b/evennia/utils/picklefield.py
@@ -28,13 +28,13 @@
 Modified for Evennia by Griatch and the Evennia community.
 
 """
-from builtins import object
 from ast import literal_eval
 from datetime import datetime
 
 from copy import deepcopy
 from base64 import b64encode, b64decode
 from zlib import compress, decompress
+
 # import six # this is actually a pypy component, not in default syslib
 from django.core.exceptions import ValidationError
 from django.db import models
@@ -72,14 +72,15 @@ class _ObjectWrapper(object):
     `django.db.Model` subclasses won't work under certain conditions and the
     same apply for trying to retrieve any `callable` object.
     """
-    __slots__ = ('_obj',)
+
+    __slots__ = ("_obj",)
 
     def __init__(self, obj):
         self._obj = obj
 
 
 def wrap_conflictual_object(obj):
-    if hasattr(obj, 'prepare_database_save') or callable(obj):
+    if hasattr(obj, "prepare_database_save") or callable(obj):
         obj = _ObjectWrapper(obj)
     return obj
 
@@ -110,6 +111,7 @@ class PickledWidget(Textarea):
     """
     This is responsible for outputting HTML representing a given field.
     """
+
     def render(self, name, value, attrs=None, renderer=None):
         """Display of the PickledField in django admin"""
 
@@ -120,12 +122,12 @@ def render(self, name, value, attrs=None, renderer=None):
             attrs["name"] = name
         else:
             attrs = {"name": name}
-        attrs['cols'] = 30
+        attrs["cols"] = 30
         # adapt number of rows to number of lines in string
         rows = 1
         if isinstance(value, str) and "\n" in repr_value:
-            rows = max(1, len(value.split('\n')))
-        attrs['rows'] = rows
+            rows = max(1, len(value.split("\n")))
+        attrs["rows"] = rows
         attrs = self.build_attrs(attrs)
 
         try:
@@ -149,16 +151,17 @@ class PickledFormField(CharField):
 
     widget = PickledWidget
     default_error_messages = dict(CharField.default_error_messages)
-    default_error_messages['invalid'] = (
+    default_error_messages["invalid"] = (
         "This is not a Python Literal. You can store things like strings, "
         "integers, or floats, but you must do it by typing them as you would "
         "type them in the Python Interpreter. For instance, strings must be "
         "surrounded by quote marks. We have converted it to a string for your "
-        "convenience. If it is acceptable, please hit save again.")
+        "convenience. If it is acceptable, please hit save again."
+    )
 
     def __init__(self, *args, **kwargs):
         # This needs to fall through to literal_eval.
-        kwargs['required'] = False
+        kwargs["required"] = False
         super().__init__(*args, **kwargs)
 
     def clean(self, value):
@@ -168,7 +171,7 @@ def clean(self, value):
         try:
             if not value.strip():
                 # Field was left blank. Make this None.
-                value = 'None'
+                value = "None"
         except AttributeError:
             pass
 
@@ -183,7 +186,7 @@ def clean(self, value):
             value = repr(value)
             return literal_eval(value)
         except (ValueError, SyntaxError):
-            raise ValidationError(self.error_messages['invalid'])
+            raise ValidationError(self.error_messages["invalid"])
 
 
 class PickledObjectField(models.Field):
@@ -198,8 +201,8 @@ class PickledObjectField(models.Field):
     """
 
     def __init__(self, *args, **kwargs):
-        self.compress = kwargs.pop('compress', False)
-        self.protocol = kwargs.pop('protocol', DEFAULT_PROTOCOL)
+        self.compress = kwargs.pop("compress", False)
+        self.protocol = kwargs.pop("protocol", DEFAULT_PROTOCOL)
         super().__init__(*args, **kwargs)
 
     def get_default(self):
@@ -277,12 +280,13 @@ def value_to_string(self, obj):
         return self.get_db_prep_value(value)
 
     def get_internal_type(self):
-        return 'TextField'
+        return "TextField"
 
     def get_db_prep_lookup(self, lookup_type, value, connection=None, prepared=False):
-        if lookup_type not in ['exact', 'in', 'isnull']:
-            raise TypeError('Lookup type %s is not supported.' % lookup_type)
+        if lookup_type not in ["exact", "in", "isnull"]:
+            raise TypeError("Lookup type %s is not supported." % lookup_type)
         # The Field model already calls get_db_prep_value before doing the
         # actual lookup, so all we need to do is limit the lookup types.
         return super().get_db_prep_lookup(
-            lookup_type, value, connection=connection, prepared=prepared)
+            lookup_type, value, connection=connection, prepared=prepared
+        )
diff --git a/evennia/utils/search.py b/evennia/utils/search.py
index 74634da5b5e..1a788300cf2 100644
--- a/evennia/utils/search.py
+++ b/evennia/utils/search.py
@@ -1,4 +1,3 @@
-
 """
 This is a convenient container gathering all the main
 search methods for the various database tables.
@@ -30,10 +29,18 @@
 from django.contrib.contenttypes.models import ContentType
 
 # limit symbol import from API
-__all__ = ("search_object", "search_account", "search_script",
-           "search_message", "search_channel", "search_help_entry",
-           "search_object_tag", "search_script_tag", "search_account_tag",
-           "search_channel_tag")
+__all__ = (
+    "search_object",
+    "search_account",
+    "search_script",
+    "search_message",
+    "search_channel",
+    "search_help_entry",
+    "search_object_tag",
+    "search_script_tag",
+    "search_account_tag",
+    "search_channel_tag",
+)
 
 
 # import objects this way to avoid circular import problems
@@ -197,20 +204,29 @@
 # Note that these return the object attached to the Attribute,
 # not the attribute object itself (this is usually what you want)
 
+
 def search_object_attribute(key=None, category=None, value=None, strvalue=None):
-    return ObjectDB.objects.get_by_attribute(key=key, category=category, value=value, strvalue=strvalue)
+    return ObjectDB.objects.get_by_attribute(
+        key=key, category=category, value=value, strvalue=strvalue
+    )
 
 
 def search_account_attribute(key=None, category=None, value=None, strvalue=None):
-    return AccountDB.objects.get_by_attribute(key=key, category=category, value=value, strvalue=strvalue)
+    return AccountDB.objects.get_by_attribute(
+        key=key, category=category, value=value, strvalue=strvalue
+    )
 
 
 def search_script_attribute(key=None, category=None, value=None, strvalue=None):
-    return ScriptDB.objects.get_by_attribute(key=key, category=category, value=value, strvalue=strvalue)
+    return ScriptDB.objects.get_by_attribute(
+        key=key, category=category, value=value, strvalue=strvalue
+    )
 
 
 def search_channel_attribute(key=None, category=None, value=None, strvalue=None):
-    return Channel.objects.get_by_attribute(key=key, category=category, value=value, strvalue=strvalue)
+    return Channel.objects.get_by_attribute(
+        key=key, category=category, value=value, strvalue=strvalue
+    )
 
 
 # search for attribute objects
diff --git a/evennia/utils/test_resources.py b/evennia/utils/test_resources.py
index 2d810f9f752..053541391fd 100644
--- a/evennia/utils/test_resources.py
+++ b/evennia/utils/test_resources.py
@@ -71,6 +71,7 @@ class EvenniaTest(TestCase):
     """
     Base test for Evennia, sets up a basic environment.
     """
+
     account_typeclass = DefaultAccount
     object_typeclass = DefaultObject
     character_typeclass = DefaultCharacter
@@ -83,25 +84,49 @@ def setUp(self):
         """
         Sets up testing environment
         """
-        self.backups = (SESSIONS.data_out, SESSIONS.disconnect,
-                        settings.DEFAULT_HOME, settings.PROTOTYPE_MODULES)
+        self.backups = (
+            SESSIONS.data_out,
+            SESSIONS.disconnect,
+            settings.DEFAULT_HOME,
+            settings.PROTOTYPE_MODULES,
+        )
         SESSIONS.data_out = Mock()
         SESSIONS.disconnect = Mock()
 
-        self.account = create.create_account("TestAccount", email="test@test.com", password="testpassword", typeclass=self.account_typeclass)
-        self.account2 = create.create_account("TestAccount2", email="test@test.com", password="testpassword", typeclass=self.account_typeclass)
+        self.account = create.create_account(
+            "TestAccount",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=self.account_typeclass,
+        )
+        self.account2 = create.create_account(
+            "TestAccount2",
+            email="test@test.com",
+            password="testpassword",
+            typeclass=self.account_typeclass,
+        )
         self.room1 = create.create_object(self.room_typeclass, key="Room", nohome=True)
         self.room1.db.desc = "room_desc"
         settings.DEFAULT_HOME = "#%i" % self.room1.id  # we must have a default home
         # Set up fake prototype module for allowing tests to use named prototypes.
         settings.PROTOTYPE_MODULES = "evennia.utils.tests.data.prototypes_example"
         self.room2 = create.create_object(self.room_typeclass, key="Room2")
-        self.exit = create.create_object(self.exit_typeclass, key='out', location=self.room1, destination=self.room2)
-        self.obj1 = create.create_object(self.object_typeclass, key="Obj", location=self.room1, home=self.room1)
-        self.obj2 = create.create_object(self.object_typeclass, key="Obj2", location=self.room1, home=self.room1)
-        self.char1 = create.create_object(self.character_typeclass, key="Char", location=self.room1, home=self.room1)
+        self.exit = create.create_object(
+            self.exit_typeclass, key="out", location=self.room1, destination=self.room2
+        )
+        self.obj1 = create.create_object(
+            self.object_typeclass, key="Obj", location=self.room1, home=self.room1
+        )
+        self.obj2 = create.create_object(
+            self.object_typeclass, key="Obj2", location=self.room1, home=self.room1
+        )
+        self.char1 = create.create_object(
+            self.character_typeclass, key="Char", location=self.room1, home=self.room1
+        )
         self.char1.permissions.add("Developer")
-        self.char2 = create.create_object(self.character_typeclass, key="Char2", location=self.room1, home=self.room1)
+        self.char2 = create.create_object(
+            self.character_typeclass, key="Char2", location=self.room1, home=self.room1
+        )
         self.char1.account = self.account
         self.account.db._last_puppet = self.char1
         self.char2.account = self.account2
@@ -114,7 +139,9 @@ def setUp(self):
         dummysession = ServerSession()
         dummysession.init_session("telnet", ("localhost", "testmode"), SESSIONS)
         dummysession.sessid = 1
-        SESSIONS.portal_connect(dummysession.get_sync_data())  # note that this creates a new Session!
+        SESSIONS.portal_connect(
+            dummysession.get_sync_data()
+        )  # note that this creates a new Session!
         session = SESSIONS.session_from_sessid(1)  # the real session
         SESSIONS.login(session, self.account, testmode=True)
         self.session = session
diff --git a/evennia/utils/tests/data/prototypes_example.py b/evennia/utils/tests/data/prototypes_example.py
index 5c79bad4626..a170829d509 100644
--- a/evennia/utils/tests/data/prototypes_example.py
+++ b/evennia/utils/tests/data/prototypes_example.py
@@ -7,14 +7,6 @@
 prototype dictionaries)
 """
 
-GOBLIN = {
-    "key" : "Goblin", \
-    "typeclass" : "DefaultCharacter", \
-    "desc" : "A goblin."
-}
+GOBLIN = {"key": "Goblin", "typeclass": "DefaultCharacter", "desc": "A goblin."}
 
-BALL = {
-    "key" : "Ball", \
-    "typeclass" : "DefaultObject", \
-    "desc" : "A ball."
-}
+BALL = {"key": "Ball", "typeclass": "DefaultObject", "desc": "A ball."}
diff --git a/evennia/utils/tests/test_batchprocessors.py b/evennia/utils/tests/test_batchprocessors.py
new file mode 100644
index 00000000000..27416c2a5f9
--- /dev/null
+++ b/evennia/utils/tests/test_batchprocessors.py
@@ -0,0 +1,221 @@
+"""Tests for batchprocessors """
+
+import codecs
+from django.test import TestCase
+from evennia.utils import batchprocessors, utils
+import mock
+import textwrap
+
+
+class TestBatchprocessorErrors(TestCase):
+    @mock.patch.object(utils, "pypath_to_realpath", return_value=[])
+    def test_read_batchfile_raises_IOError(self, _):
+        with self.assertRaises(IOError):
+            batchprocessors.read_batchfile("foopath")
+
+    @mock.patch.object(utils, "pypath_to_realpath", return_value=["pathfoo"])
+    @mock.patch.object(codecs, "open", side_effect=ValueError("decodeerr"))
+    @mock.patch.object(batchprocessors, "_ENCODINGS", ["fooencoding"])
+    def test_read_batchfile_raises_UnicodeDecodeError(self, *_):
+        with self.assertRaises(UnicodeDecodeError, msg="decodeerr"):
+            batchprocessors.read_batchfile("foopath")
+
+
+class TestBatchCommandProcessor(TestCase):
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_2_commands(self, mocked_read):
+        mocked_read.return_value = textwrap.dedent(
+            r"""
+        @create rock
+        #
+
+        @set rock/desc =
+        A big rock. You can tell is ancient.
+        #
+
+        """
+        )
+        commands = batchprocessors.BATCHCMD.parse_file("foopath")
+        self.assertEqual(
+            ["@create rock", "@set rock/desc =\nA big rock. You can tell is ancient."], commands
+        )
+
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_INSERT(self, mocked_read):
+        mocked_read.side_effect = [
+            textwrap.dedent(
+                r"""
+            @create sky
+            #
+            #INSERT another.ev
+            #
+            @create sun
+            #
+            """
+            ),
+            textwrap.dedent(
+                r"""
+            @create bird
+            #
+            @create cloud
+            #
+            """
+            ),
+        ]
+        commands = batchprocessors.BATCHCMD.parse_file("foopath")
+        self.assertEqual(commands, ["@create sky", "@create bird", "@create cloud", "@create sun"])
+        self.assertEqual(
+            mocked_read.mock_calls,
+            [mock.call("foopath", file_ending=".ev"), mock.call("another.ev", file_ending=".ev")],
+        )
+
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_INSERT_raises_IOError(self, mocked_read):
+        mocked_read.side_effect = [
+            textwrap.dedent(
+                r"""
+            @create sky
+            #
+            #INSERT x
+            #
+            @create sun
+            #
+            """
+            ),
+            IOError,
+        ]
+        with self.assertRaises(IOError, msg="#INSERT x failed."):
+            batchprocessors.BATCHCMD.parse_file("foopath")
+        self.assertEqual(
+            mocked_read.mock_calls,
+            [mock.call("foopath", file_ending=".ev"), mock.call("x", file_ending=".ev")],
+        )
+
+
+class TestBatchCodeProcessor(TestCase):
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_one_codeblock(self, mocked_read):
+        mocked_read.return_value = textwrap.dedent(
+            r"""
+        print("Hello")
+        """
+        )
+        commands = batchprocessors.BATCHCODE.parse_file("foopath")
+        self.assertEqual(['# batchcode code:\n\nprint("Hello")\n'], commands)
+
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_codeblocks(self, mocked_read):
+        mocked_read.return_value = textwrap.dedent(
+            r"""
+        #CODE
+        print("Hello")
+        #CODE
+        a = 1
+        b = [1,
+        2, 3]
+        """
+        )
+        commands = batchprocessors.BATCHCODE.parse_file("foopath")
+        self.assertEqual(
+            [
+                "# batchcode code:\n\n",
+                '# batchcode code:\n\nprint("Hello")\n',
+                "# batchcode code:\n\na = 1\nb = [1,\n2, 3]\n",
+            ],
+            commands,
+        )
+
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_header_and_two_codeblock(self, mocked_read):
+        mocked_read.return_value = textwrap.dedent(
+            r"""
+        #HEADER
+        a = 100
+        #CODE
+        a += 100
+        #CODE
+        a += 100
+        a == 100
+        """
+        )
+        commands = batchprocessors.BATCHCODE.parse_file("foopath")
+        self.assertEqual(
+            [
+                "# batchcode header:\n\na = 100\n\n\n# batchcode code:\n\n",
+                "# batchcode header:\n\na = 100\n\n\n# batchcode code:\n\na += 100\n",
+                "# batchcode header:\n\na = 100\n\n\n# batchcode code:\n\na += 100\na == 100\n",
+            ],
+            commands,
+        )
+
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_INSERT(self, mocked_read):
+        mocked_read.side_effect = [
+            textwrap.dedent(
+                r"""
+            a = 1
+            #INSERT another.py
+            """
+            ),
+            textwrap.dedent(
+                r"""
+            print("Hello")
+            """
+            ),
+        ]
+        commands = batchprocessors.BATCHCODE.parse_file("foopath")
+        self.assertEqual(
+            commands,
+            [
+                "# batchcode code:\n"
+                "\n"
+                "a = 1\n"
+                "# batchcode insert (another.py):# batchcode code:\n"
+                "\n"
+                'print("Hello")\n'
+                "\n"
+            ],
+        )
+        self.assertEqual(
+            mocked_read.mock_calls,
+            [mock.call("foopath", file_ending=".py"), mock.call("another.py", file_ending=".py")],
+        )
+
+    @mock.patch.object(batchprocessors, "read_batchfile")
+    def test_parses_INSERT_raises_IOError(self, mocked_read):
+        mocked_read.side_effect = [
+            textwrap.dedent(
+                r"""
+            #INSERT x
+            """
+            ),
+            IOError,
+        ]
+        with self.assertRaises(IOError, msg="#INSERT x failed."):
+            batchprocessors.BATCHCODE.parse_file("foopath")
+        self.assertEqual(
+            mocked_read.mock_calls,
+            [mock.call("foopath", file_ending=".py"), mock.call("x", file_ending=".py")],
+        )
+
+    @mock.patch("builtins.exec")
+    def test_execs_codeblock(self, mocked_exec):
+        err = batchprocessors.BATCHCODE.code_exec(
+            '# batchcode code:\n\nprint("Hello")\n', extra_environ={}
+        )
+        self.assertIsNone(err)
+
+    @mock.patch("builtins.exec")
+    def test_execs_codeblock_with_extra_environ(self, mocked_exec):
+        err = batchprocessors.BATCHCODE.code_exec(
+            '# batchcode code:\n\nprint("Hello")\n', extra_environ={"foo": "bar", "baz": True}
+        )
+        self.assertIsNone(err)
+
+    @mock.patch("builtins.exec")
+    def test_execs_codeblock_raises(self, mocked_exec):
+        mocked_exec.side_effect = Exception
+        err = batchprocessors.BATCHCODE.code_exec(
+            '# batchcode code:\n\nprint("Hello")\nprint("Evennia")', extra_environ={}
+        )
+        self.assertIsNotNone(err)
diff --git a/evennia/utils/tests/test_create_functions.py b/evennia/utils/tests/test_create_functions.py
index 2d5b1eeaf0c..aaa0b4927a3 100644
--- a/evennia/utils/tests/test_create_functions.py
+++ b/evennia/utils/tests/test_create_functions.py
@@ -9,71 +9,70 @@
 
 
 class TestCreateScript(EvenniaTest):
-
     def test_create_script(self):
         class TestScriptA(DefaultScript):
             def at_script_creation(self):
-                self.key = 'test_script'
+                self.key = "test_script"
                 self.interval = 10
                 self.persistent = False
 
-        script = create.create_script(TestScriptA, key='test_script')
+        script = create.create_script(TestScriptA, key="test_script")
         assert script is not None
         assert script.interval == 10
-        assert script.key == 'test_script'
+        assert script.key == "test_script"
         script.stop()
 
     def test_create_script_w_repeats_equal_1(self):
         class TestScriptB(DefaultScript):
             def at_script_creation(self):
-                self.key = 'test_script'
+                self.key = "test_script"
                 self.interval = 10
                 self.repeats = 1
                 self.persistent = False
 
         # script is already stopped (interval=1, start_delay=False)
-        script = create.create_script(TestScriptB, key='test_script')
+        script = create.create_script(TestScriptB, key="test_script")
         assert script is None
 
     def test_create_script_w_repeats_equal_1_persisted(self):
         class TestScriptB1(DefaultScript):
             def at_script_creation(self):
-                self.key = 'test_script'
+                self.key = "test_script"
                 self.interval = 10
                 self.repeats = 1
                 self.persistent = True
 
         # script is already stopped (interval=1, start_delay=False)
-        script = create.create_script(TestScriptB1, key='test_script')
+        script = create.create_script(TestScriptB1, key="test_script")
         assert script is None
 
     def test_create_script_w_repeats_equal_2(self):
         class TestScriptC(DefaultScript):
             def at_script_creation(self):
-                self.key = 'test_script'
+                self.key = "test_script"
                 self.interval = 10
                 self.repeats = 2
                 self.persistent = False
 
-        script = create.create_script(TestScriptC, key='test_script')
+        script = create.create_script(TestScriptC, key="test_script")
         assert script is not None
         assert script.interval == 10
         assert script.repeats == 2
-        assert script.key == 'test_script'
+        assert script.key == "test_script"
         script.stop()
 
     def test_create_script_w_repeats_equal_1_and_delayed(self):
         class TestScriptD(DefaultScript):
             def at_script_creation(self):
-                self.key = 'test_script'
+                self.key = "test_script"
                 self.interval = 10
                 self.start_delay = True
                 self.repeats = 1
                 self.persistent = False
 
-        script = create.create_script(TestScriptD, key='test_script')
+        script = create.create_script(TestScriptD, key="test_script")
         assert script is not None
         assert script.interval == 10
         assert script.repeats == 1
-        assert script.key == 'test_script'
+        assert script.key == "test_script"
         script.stop()
diff --git a/evennia/utils/tests/test_eveditor.py b/evennia/utils/tests/test_eveditor.py
index 5fbce57c00e..730fcde8a3e 100644
--- a/evennia/utils/tests/test_eveditor.py
+++ b/evennia/utils/tests/test_eveditor.py
@@ -10,84 +10,309 @@
 
 
 class TestEvEditor(CommandTest):
-
     def test_eveditor_view_cmd(self):
         eveditor.EvEditor(self.char1)
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":h",
-                  msg="<txt>  - any non-command is appended to the end of the buffer.")
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":h",
+            msg="<txt>  - any non-command is appended to the end of the buffer.",
+        )
         # empty buffer
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":",
-                  msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)")
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
         # input a string
-        self.call(eveditor.CmdLineInput(), "First test line", raw_string="First test line",
-                  msg="01First test line")
-        self.call(eveditor.CmdLineInput(), "Second test line", raw_string="Second test line",
-                  msg="02Second test line")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), 'First test line\nSecond test line')
-
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":",  # view buffer
-                  msg="Line Editor []\n01First test line\n"
-                      "02Second test line\n[l:02 w:006 c:0032](:h for help)")
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring="::",  # view buffer, no linenums
-                  msg="Line Editor []\nFirst test line\n"
-                      "Second test line\n[l:02 w:006 c:0032](:h for help)")
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":::",  # add single : alone on row
-                  msg="Single ':' added to buffer.")
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":",
-                  msg="Line Editor []\n01First test line\n"
-                      "02Second test line\n03:\n[l:03 w:007 c:0034](:h for help)")
-
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":dd",  # delete line
-                  msg="Deleted line 3.")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(),
-                         'First test line\nSecond test line')
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":u",  # undo
-                  msg="Undid one step.")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(),
-                         'First test line\nSecond test line\n:')
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":uu",  # redo
-                  msg="Redid one step.")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(),
-                         'First test line\nSecond test line')
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":u",  # undo
-                  msg="Undid one step.")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(),
-                         'First test line\nSecond test line\n:')
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":",
-                  msg="Line Editor []\n01First test line\n"
-                      "02Second test line\n03:\n[l:03 w:007 c:0034](:h for help)")
-
-        self.call(eveditor.CmdEditorGroup(), "Second", cmdstring=":dw",  # delete by word
-                  msg="Removed Second for lines 1-4.")
-        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":u",  # undo
-                  msg="Undid one step.")
-        self.call(eveditor.CmdEditorGroup(), "2 Second", cmdstring=":dw",  # delete by word/line
-                  msg="Removed Second for line 2.")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(),
-                         'First test line\n test line\n:')
-
-
-        self.call(eveditor.CmdEditorGroup(), "2", cmdstring=":p",  # paste
-                  msg="Copy buffer is empty.")
-        self.call(eveditor.CmdEditorGroup(), "2", cmdstring=":y",  # yank
-                  msg="Line 2, [' test line'] yanked.")
-        self.call(eveditor.CmdEditorGroup(), "2", cmdstring=":p",  # paste
-                  msg="Pasted buffer [' test line'] to line 2.")
-        self.assertEqual(self.char1.ndb._eveditor.get_buffer(),
-                         'First test line\n test line\n test line\n:')
-
-        self.call(eveditor.CmdEditorGroup(), "3", cmdstring=":x",  # cut
-                  msg="Line 3, [' test line'] cut.")
-
-        self.call(eveditor.CmdEditorGroup(), "2 New Second line", cmdstring=":i",  # insert
-                  msg="Inserted 1 new line(s) at line 2.")
-        self.call(eveditor.CmdEditorGroup(), "2 New Replaced Second line",  # replace
-                  cmdstring=":r", msg="Replaced 1 line(s) at line 2.")
-        self.call(eveditor.CmdEditorGroup(), "2 Inserted-",  # insert beginning line
-                  cmdstring=":I", msg="Inserted text at beginning of line 2.")
-        self.call(eveditor.CmdEditorGroup(), "2 -End",  # append end line
-                  cmdstring=":A", msg="Appended text to end of line 2.")
+        self.call(
+            eveditor.CmdLineInput(),
+            "First test line",
+            raw_string="First test line",
+            msg="01First test line",
+        )
+        self.call(
+            eveditor.CmdLineInput(),
+            "Second test line",
+            raw_string="Second test line",
+            msg="02Second test line",
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "First test line\nSecond test line")
+
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",  # view buffer
+            msg="Line Editor []\n01First test line\n"
+            "02Second test line\n[l:02 w:006 c:0032](:h for help)",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring="::",  # view buffer, no linenums
+            msg="Line Editor []\nFirst test line\n"
+            "Second test line\n[l:02 w:006 c:0032](:h for help)",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":::",  # add single : alone on row
+            msg="Single ':' added to buffer.",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01First test line\n"
+            "02Second test line\n03:\n[l:03 w:007 c:0034](:h for help)",
+        )
+
+        self.call(
+            eveditor.CmdEditorGroup(), "", cmdstring=":dd", msg="Deleted line 3."  # delete line
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "First test line\nSecond test line")
+        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":u", msg="Undid one step.")  # undo
+        self.assertEqual(
+            self.char1.ndb._eveditor.get_buffer(), "First test line\nSecond test line\n:"
+        )
+        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":uu", msg="Redid one step.")  # redo
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "First test line\nSecond test line")
+        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":u", msg="Undid one step.")  # undo
+        self.assertEqual(
+            self.char1.ndb._eveditor.get_buffer(), "First test line\nSecond test line\n:"
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01First test line\n"
+            "02Second test line\n03:\n[l:03 w:007 c:0034](:h for help)",
+        )
+
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "Second",
+            cmdstring=":dw",  # delete by word
+            msg="Removed Second for lines 1-4.",
+        )
+        self.call(eveditor.CmdEditorGroup(), "", cmdstring=":u", msg="Undid one step.")  # undo
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2 Second",
+            cmdstring=":dw",  # delete by word/line
+            msg="Removed Second for line 2.",
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "First test line\n test line\n:")
+
+        self.call(
+            eveditor.CmdEditorGroup(), "2", cmdstring=":p", msg="Copy buffer is empty."  # paste
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2",
+            cmdstring=":y",  # yank
+            msg="Line 2, [' test line'] yanked.",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2",
+            cmdstring=":p",  # paste
+            msg="Pasted buffer [' test line'] to line 2.",
+        )
+        self.assertEqual(
+            self.char1.ndb._eveditor.get_buffer(), "First test line\n test line\n test line\n:"
+        )
+
+        self.call(
+            eveditor.CmdEditorGroup(), "3", cmdstring=":x", msg="Line 3, [' test line'] cut."  # cut
+        )
+
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2 New Second line",
+            cmdstring=":i",  # insert
+            msg="Inserted 1 new line(s) at line 2.",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2 New Replaced Second line",  # replace
+            cmdstring=":r",
+            msg="Replaced 1 line(s) at line 2.",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2 Inserted-",  # insert beginning line
+            cmdstring=":I",
+            msg="Inserted text at beginning of line 2.",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2 -End",  # append end line
+            cmdstring=":A",
+            msg="Appended text to end of line 2.",
+        )
 
         self.assertEqual(
             self.char1.ndb._eveditor.get_buffer(),
-            'First test line\nInserted-New Replaced Second line-End\n test line\n:')
+            "First test line\nInserted-New Replaced Second line-End\n test line\n:",
+        )
+
+    def test_eveditor_COLON_UU(self):
+        eveditor.EvEditor(self.char1)
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
+        self.call(
+            eveditor.CmdLineInput(),
+            'First test "line".',
+            raw_string='First test "line".',
+            msg='01First test "line" .',
+        )
+        self.call(
+            eveditor.CmdLineInput(),
+            "Second 'line'.",
+            raw_string="Second 'line'.",
+            msg="02Second 'line' .",
+        )
+        self.assertEqual(
+            self.char1.ndb._eveditor.get_buffer(), "First test \"line\".\nSecond 'line'."
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":UU",
+            msg="Reverted all changes to the buffer back to original state.",
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "")
+
+    def test_eveditor_search_and_replace(self):
+        eveditor.EvEditor(self.char1)
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
+        self.call(eveditor.CmdLineInput(), "line 1.", raw_string="line 1.", msg="01line 1.")
+        self.call(eveditor.CmdLineInput(), "line 2.", raw_string="line 2.", msg="02line 2.")
+        self.call(eveditor.CmdLineInput(), "line 3.", raw_string="line 3.", msg="03line 3.")
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "2:3",
+            cmdstring=":",
+            msg="Line Editor []\n02line 2.\n03line 3.\n[l:02 w:004 c:0015](:h for help)",
+        )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "1:2 line LINE",
+            cmdstring=":s",
+            msg="Search-replaced line -> LINE for lines 1-2.",
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "LINE 1.\nLINE 2.\nline 3.")
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "line MINE",
+            cmdstring=":s",
+            msg="Search-replaced line -> MINE for lines 1-3.",
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "LINE 1.\nLINE 2.\nMINE 3.")
+
+    def test_eveditor_COLON_DD(self):
+        eveditor.EvEditor(self.char1)
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
+        self.call(eveditor.CmdLineInput(), "line 1.", raw_string="line 1.", msg="01line 1.")
+        self.call(eveditor.CmdLineInput(), "line 2.", raw_string="line 2.", msg="02line 2.")
+        self.call(eveditor.CmdLineInput(), "line 3.", raw_string="line 3.", msg="03line 3.")
+        self.call(
+            eveditor.CmdEditorGroup(), "", cmdstring=":DD", msg="Cleared 3 lines from buffer."
+        )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "")
+
+    def test_eveditor_COLON_F(self):
+        eveditor.EvEditor(self.char1)
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
+        self.call(eveditor.CmdLineInput(), "line 1", raw_string="line 1", msg="01line 1")
+        self.call(eveditor.CmdEditorGroup(), "1:2", cmdstring=":f", msg="Flood filled lines 1-2.")
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "line 1")
+
+    def test_eveditor_COLON_J(self):
+        eveditor.EvEditor(self.char1)
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
+        self.call(eveditor.CmdLineInput(), "line 1", raw_string="line 1", msg="01line 1")
+        self.call(eveditor.CmdLineInput(), "l 2", raw_string="l 2", msg="02l 2")
+        self.call(eveditor.CmdLineInput(), "l 3", raw_string="l 3", msg="03l 3")
+        self.call(eveditor.CmdLineInput(), "l 4", raw_string="l 4", msg="04l 4")
+        self.call(eveditor.CmdEditorGroup(), "2 r", cmdstring=":j", msg="Right-justified line 2.")
+        self.call(eveditor.CmdEditorGroup(), "3 c", cmdstring=":j", msg="Center-justified line 3.")
+        self.call(eveditor.CmdEditorGroup(), "4 f", cmdstring=":j", msg="Full-justified line 4.")
+        l1, l2, l3, l4 = tuple(self.char1.ndb._eveditor.get_buffer().split("\n"))
+        self.assertEqual(l1, "line 1")
+        self.assertEqual(l2, " " * 75 + "l 2")
+        self.assertEqual(l3, " " * 37 + "l 3" + " " * 38)
+        self.assertEqual(l4, "l" + " " * 76 + "4")
+
+    def test_eveditor_bad_commands(self):
+        eveditor.EvEditor(self.char1)
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":",
+            msg="Line Editor []\n01\n[l:01 w:000 c:0000](:h for help)",
+        )
+        self.call(eveditor.CmdLineInput(), "line 1.", raw_string="line 1.", msg="01line 1.")
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":dw",
+            msg="You must give a search word to delete.",
+        )
+        # self.call(
+        #     eveditor.CmdEditorGroup(),
+        #     raw_string="",
+        #     cmdstring=":i",
+        #     msg="You need to enter a new line and where to insert it.",
+        # )
+        # self.call(
+        #     eveditor.CmdEditorGroup(),
+        #     "",
+        #     cmdstring=":I",
+        #     msg="You need to enter text to insert.",
+        # )
+        # self.call(
+        #     eveditor.CmdEditorGroup(),
+        #     "",
+        #     cmdstring=":r",
+        #     msg="You need to enter a replacement string.",
+        # )
+        self.call(
+            eveditor.CmdEditorGroup(),
+            "",
+            cmdstring=":s",
+            msg="You must give a search word and something to replace it with.",
+        )
+        # self.call(
+        #     eveditor.CmdEditorGroup(),
+        #     "",
+        #     cmdstring=":f",
+        #     msg="Valid justifications are [f]ull (default), [c]enter, [r]right or [l]eft"
+        # )
+        self.assertEqual(self.char1.ndb._eveditor.get_buffer(), "line 1.")
diff --git a/evennia/utils/tests/test_evform.py b/evennia/utils/tests/test_evform.py
index 4c09066f3c6..ed5a9a8b7f4 100644
--- a/evennia/utils/tests/test_evform.py
+++ b/evennia/utils/tests/test_evform.py
@@ -14,47 +14,47 @@ def test_form(self):
         self.assertEqual(form1, form2)
 
         # self.assertEqual(form1, "")
-                         # '.------------------------------------------------.\n'
-                         # '|                                                |\n'
-                         # '|  Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b'
-                         # '[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m   \x1b[0m    '
-                         # 'Account: \x1b[0m\x1b[1m\x1b[33mGriatch        '
-                         # '\x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m '
-                         # '|\n'
-                         # '|        \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m    \x1b[0m                             |\n'
-                         # '|                                                |\n'
-                         # ' >----------------------------------------------< \n'
-                         # '|                                                |\n'
-                         # '| Desc:  \x1b[0mA sturdy \x1b[0m  \x1b[0m'
-                         # '    STR: \x1b[0m12 \x1b[0m\x1b[0m\x1b[0m\x1b[0m'
-                         # '    DEX: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m\x1b[0m     |\n'
-                         # '|        \x1b[0mfellow\x1b[0m     \x1b[0m'
-                         # '    INT: \x1b[0m5  \x1b[0m\x1b[0m\x1b[0m\x1b[0m'
-                         # '    STA: \x1b[0m18 \x1b[0m\x1b[0m\x1b[0m\x1b[0m     |\n'
-                         # '|        \x1b[0m           \x1b[0m'
-                         # '    LUC: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m'
-                         # '    MAG: \x1b[0m3  \x1b[0m\x1b[0m\x1b[0m     |\n'
-                         # '|                                                |\n'
-                         # ' >----------.-----------------------------------< \n'
-                         # '|           |                                    |\n'
-                         # '| \x1b[0mHP\x1b[0m|\x1b[0mMV \x1b[0m|\x1b[0mMP\x1b[0m '
-                         # '| \x1b[0mSkill      \x1b[0m|\x1b[0mValue     \x1b[0m'
-                         # '|\x1b[0mExp        \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
-                         # '| ~~+~~~+~~ | ~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n'
-                         # '| \x1b[0m**\x1b[0m|\x1b[0m***\x1b[0m\x1b[0m|\x1b[0m**\x1b[0m\x1b[0m '
-                         # '| \x1b[0mShooting   \x1b[0m|\x1b[0m12        \x1b[0m'
-                         # '|\x1b[0m550/1200   \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
-                         # '| \x1b[0m  \x1b[0m|\x1b[0m**\x1b[0m \x1b[0m|\x1b[0m*\x1b[0m \x1b[0m '
-                         # '| \x1b[0mHerbalism  \x1b[0m|\x1b[0m14        \x1b[0m'
-                         # '|\x1b[0m990/1400   \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
-                         # '| \x1b[0m  \x1b[0m|\x1b[0m   \x1b[0m|\x1b[0m  \x1b[0m '
-                         # '| \x1b[0mSmithing   \x1b[0m|\x1b[0m9         \x1b[0m'
-                         # '|\x1b[0m205/900    \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
-                         # '|           |                                    |\n'
-                         # ' -----------`-------------------------------------\n'
-                         # ' Footer: \x1b[0mrev 1  \x1b[0m                                  \n'
-                         # ' info                                             \n'
-                         # '                                                  ')
+        # '.------------------------------------------------.\n'
+        # '|                                                |\n'
+        # '|  Name: \x1b[0m\x1b[1m\x1b[32mTom\x1b[1m\x1b[32m \x1b'
+        # '[1m\x1b[32mthe\x1b[1m\x1b[32m \x1b[0m   \x1b[0m    '
+        # 'Account: \x1b[0m\x1b[1m\x1b[33mGriatch        '
+        # '\x1b[0m\x1b[0m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[1m\x1b[32m\x1b[0m\x1b[0m '
+        # '|\n'
+        # '|        \x1b[0m\x1b[1m\x1b[32mBouncer\x1b[0m    \x1b[0m                             |\n'
+        # '|                                                |\n'
+        # ' >----------------------------------------------< \n'
+        # '|                                                |\n'
+        # '| Desc:  \x1b[0mA sturdy \x1b[0m  \x1b[0m'
+        # '    STR: \x1b[0m12 \x1b[0m\x1b[0m\x1b[0m\x1b[0m'
+        # '    DEX: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m\x1b[0m     |\n'
+        # '|        \x1b[0mfellow\x1b[0m     \x1b[0m'
+        # '    INT: \x1b[0m5  \x1b[0m\x1b[0m\x1b[0m\x1b[0m'
+        # '    STA: \x1b[0m18 \x1b[0m\x1b[0m\x1b[0m\x1b[0m     |\n'
+        # '|        \x1b[0m           \x1b[0m'
+        # '    LUC: \x1b[0m10 \x1b[0m\x1b[0m\x1b[0m'
+        # '    MAG: \x1b[0m3  \x1b[0m\x1b[0m\x1b[0m     |\n'
+        # '|                                                |\n'
+        # ' >----------.-----------------------------------< \n'
+        # '|           |                                    |\n'
+        # '| \x1b[0mHP\x1b[0m|\x1b[0mMV \x1b[0m|\x1b[0mMP\x1b[0m '
+        # '| \x1b[0mSkill      \x1b[0m|\x1b[0mValue     \x1b[0m'
+        # '|\x1b[0mExp        \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
+        # '| ~~+~~~+~~ | ~~~~~~~~~~~+~~~~~~~~~~+~~~~~~~~~~~ |\n'
+        # '| \x1b[0m**\x1b[0m|\x1b[0m***\x1b[0m\x1b[0m|\x1b[0m**\x1b[0m\x1b[0m '
+        # '| \x1b[0mShooting   \x1b[0m|\x1b[0m12        \x1b[0m'
+        # '|\x1b[0m550/1200   \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
+        # '| \x1b[0m  \x1b[0m|\x1b[0m**\x1b[0m \x1b[0m|\x1b[0m*\x1b[0m \x1b[0m '
+        # '| \x1b[0mHerbalism  \x1b[0m|\x1b[0m14        \x1b[0m'
+        # '|\x1b[0m990/1400   \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
+        # '| \x1b[0m  \x1b[0m|\x1b[0m   \x1b[0m|\x1b[0m  \x1b[0m '
+        # '| \x1b[0mSmithing   \x1b[0m|\x1b[0m9         \x1b[0m'
+        # '|\x1b[0m205/900    \x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m\x1b[0m |\n'
+        # '|           |                                    |\n'
+        # ' -----------`-------------------------------------\n'
+        # ' Footer: \x1b[0mrev 1  \x1b[0m                                  \n'
+        # ' info                                             \n'
+        # '                                                  ')
 
     def test_ansi_escape(self):
         # note that in a msg() call, the result would be the  correct |-----,
diff --git a/evennia/utils/tests/test_evmenu.py b/evennia/utils/tests/test_evmenu.py
index 910e83312a5..128e857e9f6 100644
--- a/evennia/utils/tests/test_evmenu.py
+++ b/evennia/utils/tests/test_evmenu.py
@@ -72,7 +72,7 @@ def _depth_first(menu, tree, visited, indent):
             nodename = menu.nodename
             options = menu.test_options
             if isinstance(options, dict):
-                options = (options, )
+                options = (options,)
 
             # run validation tests for this node
             compare_text = self.expected_node_texts.get(nodename, None)
@@ -81,24 +81,31 @@ def _depth_first(menu, tree, visited, indent):
                 node_text = menu.test_nodetext
                 self.assertIsNotNone(
                     bool(node_text),
-                    "node: {}: node-text is None, which was not expected.".format(nodename))
+                    "node: {}: node-text is None, which was not expected.".format(nodename),
+                )
                 if isinstance(node_text, tuple):
                     node_text, helptext = node_text
                 node_text = ansi.strip_ansi(node_text.strip())
                 self.assertTrue(
                     node_text.startswith(compare_text),
-                    "\nnode \"{}\':\nOutput:\n{}\n\nExpected (startswith):\n{}".format(
-                        nodename, node_text, compare_text))
+                    "\nnode \"{}':\nOutput:\n{}\n\nExpected (startswith):\n{}".format(
+                        nodename, node_text, compare_text
+                    ),
+                )
             compare_options_count = self.expected_node_options_count.get(nodename, None)
             if compare_options_count is not None:
                 self.assertEqual(
-                    len(options), compare_options_count,
-                    "Not the right number of options returned from node {}.".format(nodename))
+                    len(options),
+                    compare_options_count,
+                    "Not the right number of options returned from node {}.".format(nodename),
+                )
             compare_options = self.expected_node_options.get(nodename, None)
             if compare_options:
                 self.assertEqual(
-                    options, compare_options,
-                    "Options returned from node {} does not match.".format(nodename))
+                    options,
+                    compare_options,
+                    "Options returned from node {} does not match.".format(nodename),
+                )
 
             self._debug_output(indent, "*{}".format(nodename))
             subtree = []
@@ -111,8 +118,12 @@ def _depth_first(menu, tree, visited, indent):
             else:
                 for inum, optdict in enumerate(options):
 
-                    key, desc, execute, goto = optdict.get("key", ""), optdict.get("desc", None),\
-                                               optdict.get("exec", None), optdict.get("goto", None)
+                    key, desc, execute, goto = (
+                        optdict.get("key", ""),
+                        optdict.get("desc", None),
+                        optdict.get("exec", None),
+                        optdict.get("goto", None),
+                    )
 
                     # prepare the key to pass to the menu
                     if isinstance(key, (tuple, list)) and len(key) > 1:
@@ -141,10 +152,10 @@ def _depth_first(menu, tree, visited, indent):
                         visited.append(nodename)
                         subtree.append(nodename)
                         _depth_first(menu, subtree, visited, indent + 2)
-                        #self._debug_output(indent, "    -> arrived at {}".format(nodename))
+                        # self._debug_output(indent, "    -> arrived at {}".format(nodename))
                     else:
                         subtree.append(nodename)
-                        #self._debug_output( indent, "    -> arrived at {} (circular call)".format(nodename))
+                        # self._debug_output( indent, "    -> arrived at {} (circular call)".format(nodename))
                     self._debug_output(indent, "-- {} ({}) -> {}".format(key, desc, goto))
 
             if subtree:
@@ -175,23 +186,37 @@ def setUp(self):
             self.caller.session = self.session
             self.caller2.session = self.session2
 
-            self.menu = evmenu.EvMenu(self.caller, self.menutree, startnode=self.startnode,
-                                      cmdset_mergetype=self.cmdset_mergetype,
-                                      cmdset_priority=self.cmdset_priority,
-                                      auto_quit=self.auto_quit, auto_look=self.auto_look,
-                                      auto_help=self.auto_help,
-                                      cmd_on_exit=self.cmd_on_exit, persistent=False,
-                                      startnode_input=self.startnode_input, session=self.session,
-                                      **self.kwargs)
+            self.menu = evmenu.EvMenu(
+                self.caller,
+                self.menutree,
+                startnode=self.startnode,
+                cmdset_mergetype=self.cmdset_mergetype,
+                cmdset_priority=self.cmdset_priority,
+                auto_quit=self.auto_quit,
+                auto_look=self.auto_look,
+                auto_help=self.auto_help,
+                cmd_on_exit=self.cmd_on_exit,
+                persistent=False,
+                startnode_input=self.startnode_input,
+                session=self.session,
+                **self.kwargs,
+            )
             # persistent version
-            self.pmenu = evmenu.EvMenu(self.caller2, self.menutree, startnode=self.startnode,
-                                       cmdset_mergetype=self.cmdset_mergetype,
-                                       cmdset_priority=self.cmdset_priority,
-                                       auto_quit=self.auto_quit, auto_look=self.auto_look,
-                                       auto_help=self.auto_help,
-                                       cmd_on_exit=self.cmd_on_exit, persistent=True,
-                                       startnode_input=self.startnode_input, session=self.session2,
-                                       **self.kwargs)
+            self.pmenu = evmenu.EvMenu(
+                self.caller2,
+                self.menutree,
+                startnode=self.startnode,
+                cmdset_mergetype=self.cmdset_mergetype,
+                cmdset_priority=self.cmdset_priority,
+                auto_quit=self.auto_quit,
+                auto_look=self.auto_look,
+                auto_help=self.auto_help,
+                cmd_on_exit=self.cmd_on_exit,
+                persistent=True,
+                startnode_input=self.startnode_input,
+                session=self.session2,
+                **self.kwargs,
+            )
 
             self.menu.close_menu = MagicMock()
             self.pmenu.close_menu = MagicMock()
@@ -209,26 +234,30 @@ class TestEvMenuExample(TestEvMenu):
     kwargs = {"testval": "val", "testval2": "val2"}
     debug_output = False
 
-    expected_node_texts = {
-        "test_view_node": "Your name is"}
-
-    expected_tree = \
-        ['test_start_node',
-         ['test_set_node',
-          ['test_start_node'],
-          'test_look_node',
-          ['test_start_node'],
-          'test_view_node',
-          ['test_start_node'],
-          'test_dynamic_node',
-          ['test_dynamic_node',
-           'test_dynamic_node',
-           'test_dynamic_node',
-           'test_dynamic_node',
-           'test_start_node'],
-          'test_end_node',
-          'test_displayinput_node',
-          ['test_start_node']]]
+    expected_node_texts = {"test_view_node": "Your name is"}
+
+    expected_tree = [
+        "test_start_node",
+        [
+            "test_set_node",
+            ["test_start_node"],
+            "test_look_node",
+            ["test_start_node"],
+            "test_view_node",
+            ["test_start_node"],
+            "test_dynamic_node",
+            [
+                "test_dynamic_node",
+                "test_dynamic_node",
+                "test_dynamic_node",
+                "test_dynamic_node",
+                "test_start_node",
+            ],
+            "test_end_node",
+            "test_displayinput_node",
+            ["test_start_node"],
+        ],
+    ]
 
     def test_kwargsave(self):
         self.assertTrue(hasattr(self.menu, "testval"))
diff --git a/evennia/utils/tests/test_tagparsing.py b/evennia/utils/tests/test_tagparsing.py
index 520347a9195..e82b7d551ea 100644
--- a/evennia/utils/tests/test_tagparsing.py
+++ b/evennia/utils/tests/test_tagparsing.py
@@ -29,47 +29,64 @@ def test_instance(self):
         """
         Make sure the ANSIString is always constructed correctly.
         """
-        clean = 'This isA|r testTest'
-        encoded = '\x1b[1m\x1b[32mThis is\x1b[1m\x1b[31mA|r test\x1b[0mTest\x1b[0m'
-        target = ANSIString(r'|gThis is|rA||r test|nTest|n')
+        clean = "This isA|r testTest"
+        encoded = "\x1b[1m\x1b[32mThis is\x1b[1m\x1b[31mA|r test\x1b[0mTest\x1b[0m"
+        target = ANSIString(r"|gThis is|rA||r test|nTest|n")
         char_table = [9, 10, 11, 12, 13, 14, 15, 25, 26, 27, 28, 29, 30, 31, 32, 37, 38, 39, 40]
-        code_table = [0, 1, 2, 3, 4, 5, 6, 7, 8, 16, 17, 18, 19, 20, 21, 22, 23, 24, 33, 34, 35, 36, 41, 42, 43, 44]
+        code_table = [
+            0,
+            1,
+            2,
+            3,
+            4,
+            5,
+            6,
+            7,
+            8,
+            16,
+            17,
+            18,
+            19,
+            20,
+            21,
+            22,
+            23,
+            24,
+            33,
+            34,
+            35,
+            36,
+            41,
+            42,
+            43,
+            44,
+        ]
         self.checker(target, encoded, clean)
         self.table_check(target, char_table, code_table)
         self.checker(ANSIString(target), encoded, clean)
         self.table_check(ANSIString(target), char_table, code_table)
         self.checker(ANSIString(encoded, decoded=True), encoded, clean)
-        self.table_check(ANSIString(encoded, decoded=True), char_table,
-                         code_table)
-        self.checker(ANSIString('Test'), 'Test', 'Test')
-        self.table_check(ANSIString('Test'), [0, 1, 2, 3], [])
-        self.checker(ANSIString(''), '', '')
+        self.table_check(ANSIString(encoded, decoded=True), char_table, code_table)
+        self.checker(ANSIString("Test"), "Test", "Test")
+        self.table_check(ANSIString("Test"), [0, 1, 2, 3], [])
+        self.checker(ANSIString(""), "", "")
 
     def test_slice(self):
         """
         Verifies that slicing an ANSIString results in expected color code
         distribution.
         """
-        target = ANSIString(r'|gTest|rTest|n')
+        target = ANSIString(r"|gTest|rTest|n")
         result = target[:3]
-        self.checker(result, '\x1b[1m\x1b[32mTes', 'Tes')
+        self.checker(result, "\x1b[1m\x1b[32mTes", "Tes")
         result = target[:4]
-        self.checker(result, '\x1b[1m\x1b[32mTest\x1b[1m\x1b[31m', 'Test')
+        self.checker(result, "\x1b[1m\x1b[32mTest\x1b[1m\x1b[31m", "Test")
         result = target[:]
-        self.checker(
-            result,
-            '\x1b[1m\x1b[32mTest\x1b[1m\x1b[31mTest\x1b[0m',
-            'TestTest')
+        self.checker(result, "\x1b[1m\x1b[32mTest\x1b[1m\x1b[31mTest\x1b[0m", "TestTest")
         result = target[:-1]
-        self.checker(
-            result,
-            '\x1b[1m\x1b[32mTest\x1b[1m\x1b[31mTes',
-            'TestTes')
+        self.checker(result, "\x1b[1m\x1b[32mTest\x1b[1m\x1b[31mTes", "TestTes")
         result = target[0:0]
-        self.checker(
-            result,
-            '',
-            '')
+        self.checker(result, "", "")
 
     def test_split(self):
         """
@@ -77,11 +94,10 @@ def test_split(self):
         codes end up where they should.
         """
         target = ANSIString("|gThis is |nA split string|g")
-        first = ('\x1b[1m\x1b[32mThis is \x1b[0m', 'This is ')
-        second = ('\x1b[1m\x1b[32m\x1b[0m split string\x1b[1m\x1b[32m',
-                  ' split string')
-        re_split = re.split('A', target)
-        normal_split = target.split('A')
+        first = ("\x1b[1m\x1b[32mThis is \x1b[0m", "This is ")
+        second = ("\x1b[1m\x1b[32m\x1b[0m split string\x1b[1m\x1b[32m", " split string")
+        re_split = re.split("A", target)
+        normal_split = target.split("A")
         self.assertEqual(re_split, normal_split)
         self.assertEqual(len(normal_split), 2)
         self.checker(normal_split[0], *first)
@@ -97,27 +113,31 @@ def test_join(self):
         l = [ANSIString("|gTest|r") for _ in range(0, 3)]
         # Force the generator to be evaluated.
         result = "".join(l)
-        self.assertEqual(str(result), 'TestTestTest')
+        self.assertEqual(str(result), "TestTestTest")
         result = ANSIString("").join(l)
-        self.checker(result, '\x1b[1m\x1b[32mTest\x1b[1m\x1b[31m\x1b[1m\x1b'
-                             '[32mTest\x1b[1m\x1b[31m\x1b[1m\x1b[32mTest'
-                             '\x1b[1m\x1b[31m', 'TestTestTest')
+        self.checker(
+            result,
+            "\x1b[1m\x1b[32mTest\x1b[1m\x1b[31m\x1b[1m\x1b"
+            "[32mTest\x1b[1m\x1b[31m\x1b[1m\x1b[32mTest"
+            "\x1b[1m\x1b[31m",
+            "TestTestTest",
+        )
 
     def test_len(self):
         """
         Make sure that length reporting on ANSIStrings does not include
         ANSI codes.
         """
-        self.assertEqual(len(ANSIString('|gTest|n')), 4)
+        self.assertEqual(len(ANSIString("|gTest|n")), 4)
 
     def test_capitalize(self):
         """
         Make sure that capitalization works. This is the simplest of the
         _transform functions.
         """
-        target = ANSIString('|gtest|n')
-        result = '\x1b[1m\x1b[32mTest\x1b[0m'
-        self.checker(target.capitalize(), result, 'Test')
+        target = ANSIString("|gtest|n")
+        result = "\x1b[1m\x1b[32mTest\x1b[0m"
+        self.checker(target.capitalize(), result, "Test")
 
     def test_mxp_agnostic(self):
         """
@@ -140,8 +160,8 @@ def test_add(self):
         a = ANSIString("|gTest")
         b = ANSIString("|cString|n")
         c = a + b
-        result = '\x1b[1m\x1b[32mTest\x1b[1m\x1b[36mString\x1b[0m'
-        self.checker(c, result, 'TestString')
+        result = "\x1b[1m\x1b[32mTest\x1b[1m\x1b[36mString\x1b[0m"
+        self.checker(c, result, "TestString")
         char_table = [9, 10, 11, 12, 22, 23, 24, 25, 26, 27]
         code_table = [0, 1, 2, 3, 4, 5, 6, 7, 8, 13, 14, 15, 16, 17, 18, 19, 20, 21, 28, 29, 30, 31]
         self.table_check(c, char_table, code_table)
@@ -166,112 +186,157 @@ def tearDown(self):
         del self.parser
 
     def test_url_scheme_ftp(self):
-        self.assertEqual(self.parser.convert_urls('ftp.example.com'),
-                         '<a href="ftp.example.com" target="_blank">ftp.example.com</a>')
+        self.assertEqual(
+            self.parser.convert_urls("ftp.example.com"),
+            '<a href="ftp.example.com" target="_blank">ftp.example.com</a>',
+        )
 
     def test_url_scheme_www(self):
-        self.assertEqual(self.parser.convert_urls('www.example.com'),
-                         '<a href="www.example.com" target="_blank">www.example.com</a>')
+        self.assertEqual(
+            self.parser.convert_urls("www.example.com"),
+            '<a href="www.example.com" target="_blank">www.example.com</a>',
+        )
 
     def test_url_scheme_ftpproto(self):
-        self.assertEqual(self.parser.convert_urls('ftp://ftp.example.com'),
-                         '<a href="ftp://ftp.example.com" target="_blank">ftp://ftp.example.com</a>')
+        self.assertEqual(
+            self.parser.convert_urls("ftp://ftp.example.com"),
+            '<a href="ftp://ftp.example.com" target="_blank">ftp://ftp.example.com</a>',
+        )
 
     def test_url_scheme_http(self):
-        self.assertEqual(self.parser.convert_urls('http://example.com'),
-                         '<a href="http://example.com" target="_blank">http://example.com</a>')
+        self.assertEqual(
+            self.parser.convert_urls("http://example.com"),
+            '<a href="http://example.com" target="_blank">http://example.com</a>',
+        )
 
     def test_url_scheme_https(self):
-        self.assertEqual(self.parser.convert_urls('https://example.com'),
-                         '<a href="https://example.com" target="_blank">https://example.com</a>')
+        self.assertEqual(
+            self.parser.convert_urls("https://example.com"),
+            '<a href="https://example.com" target="_blank">https://example.com</a>',
+        )
 
     def test_url_chars_slash(self):
-        self.assertEqual(self.parser.convert_urls('www.example.com/homedir'),
-                         '<a href="www.example.com/homedir" target="_blank">www.example.com/homedir</a>')
+        self.assertEqual(
+            self.parser.convert_urls("www.example.com/homedir"),
+            '<a href="www.example.com/homedir" target="_blank">www.example.com/homedir</a>',
+        )
 
     def test_url_chars_colon(self):
-        self.assertEqual(self.parser.convert_urls('https://example.com:8000/login/'),
-                         '<a href="https://example.com:8000/login/" target="_blank">'
-                         'https://example.com:8000/login/</a>')
+        self.assertEqual(
+            self.parser.convert_urls("https://example.com:8000/login/"),
+            '<a href="https://example.com:8000/login/" target="_blank">'
+            "https://example.com:8000/login/</a>",
+        )
 
     def test_url_chars_querystring(self):
-        self.assertEqual(self.parser.convert_urls('https://example.com/submitform?field1=val1+val3&field2=val2'),
-                         '<a href="https://example.com/submitform?field1=val1+val3&field2=val2" target="_blank">'
-                         'https://example.com/submitform?field1=val1+val3&field2=val2</a>')
+        self.assertEqual(
+            self.parser.convert_urls("https://example.com/submitform?field1=val1+val3&field2=val2"),
+            '<a href="https://example.com/submitform?field1=val1+val3&field2=val2" target="_blank">'
+            "https://example.com/submitform?field1=val1+val3&field2=val2</a>",
+        )
 
     def test_url_chars_anchor(self):
-        self.assertEqual(self.parser.convert_urls('http://www.example.com/menu#section_1'),
-                         '<a href="http://www.example.com/menu#section_1" target="_blank">'
-                         'http://www.example.com/menu#section_1</a>')
+        self.assertEqual(
+            self.parser.convert_urls("http://www.example.com/menu#section_1"),
+            '<a href="http://www.example.com/menu#section_1" target="_blank">'
+            "http://www.example.com/menu#section_1</a>",
+        )
 
     def test_url_chars_exclam(self):
-        self.assertEqual(self.parser.convert_urls('https://groups.google.com/forum/'
-                                                  '?fromgroups#!categories/evennia/ainneve'),
-                         '<a href="https://groups.google.com/forum/?fromgroups#!categories/evennia/ainneve"'
-                         ' target="_blank">https://groups.google.com/forum/?fromgroups#!categories/evennia/ainneve</a>')
+        self.assertEqual(
+            self.parser.convert_urls(
+                "https://groups.google.com/forum/" "?fromgroups#!categories/evennia/ainneve"
+            ),
+            '<a href="https://groups.google.com/forum/?fromgroups#!categories/evennia/ainneve"'
+            ' target="_blank">https://groups.google.com/forum/?fromgroups#!categories/evennia/ainneve</a>',
+        )
 
     def test_url_edge_leadingw(self):
-        self.assertEqual(self.parser.convert_urls('wwww.example.com'),
-                         'w<a href="www.example.com" target="_blank">www.example.com</a>')
+        self.assertEqual(
+            self.parser.convert_urls("wwww.example.com"),
+            'w<a href="www.example.com" target="_blank">www.example.com</a>',
+        )
 
     def test_url_edge_following_period_eol(self):
-        self.assertEqual(self.parser.convert_urls('www.example.com.'),
-                         '<a href="www.example.com" target="_blank">www.example.com</a>.')
+        self.assertEqual(
+            self.parser.convert_urls("www.example.com."),
+            '<a href="www.example.com" target="_blank">www.example.com</a>.',
+        )
 
     def test_url_edge_following_period(self):
-        self.assertEqual(self.parser.convert_urls('see www.example.com. '),
-                         'see <a href="www.example.com" target="_blank">www.example.com</a>. ')
+        self.assertEqual(
+            self.parser.convert_urls("see www.example.com. "),
+            'see <a href="www.example.com" target="_blank">www.example.com</a>. ',
+        )
 
     def test_url_edge_brackets(self):
-        self.assertEqual(self.parser.convert_urls('[http://example.com/]'),
-                         '[<a href="http://example.com/" target="_blank">http://example.com/</a>]')
+        self.assertEqual(
+            self.parser.convert_urls("[http://example.com/]"),
+            '[<a href="http://example.com/" target="_blank">http://example.com/</a>]',
+        )
 
     def test_url_edge_multiline(self):
-        self.assertEqual(self.parser.convert_urls('  * http://example.com/info\n  * bullet'),
-                         '  * <a href="http://example.com/info" target="_blank">'
-                         'http://example.com/info</a>\n  * bullet')
+        self.assertEqual(
+            self.parser.convert_urls("  * http://example.com/info\n  * bullet"),
+            '  * <a href="http://example.com/info" target="_blank">'
+            "http://example.com/info</a>\n  * bullet",
+        )
 
     def test_url_edge_following_htmlentity(self):
-        self.assertEqual(self.parser.convert_urls('http://example.com/info&lt;span&gt;'),
-                         '<a href="http://example.com/info" target="_blank">http://example.com/info</a>&lt;span&gt;')
+        self.assertEqual(
+            self.parser.convert_urls("http://example.com/info&lt;span&gt;"),
+            '<a href="http://example.com/info" target="_blank">http://example.com/info</a>&lt;span&gt;',
+        )
 
     def test_url_edge_surrounded_spans(self):
-        self.assertEqual(self.parser.convert_urls('</span>http://example.com/<span class="red">'),
-                         '</span><a href="http://example.com/" target="_blank">'
-                         'http://example.com/</a><span class="red">')
+        self.assertEqual(
+            self.parser.convert_urls('</span>http://example.com/<span class="red">'),
+            '</span><a href="http://example.com/" target="_blank">'
+            'http://example.com/</a><span class="red">',
+        )
 
 
 class TestInlineFuncs(TestCase):
     """Test the nested inlinefunc module"""
 
     def test_nofunc(self):
-        self.assertEqual(inlinefuncs.parse_inlinefunc(
-            "as$382ewrw w we w werw,|44943}"),
-            "as$382ewrw w we w werw,|44943}")
+        self.assertEqual(
+            inlinefuncs.parse_inlinefunc("as$382ewrw w we w werw,|44943}"),
+            "as$382ewrw w we w werw,|44943}",
+        )
 
     def test_incomplete(self):
-        self.assertEqual(inlinefuncs.parse_inlinefunc(
-            "testing $blah{without an ending."),
-            "testing $blah{without an ending.")
+        self.assertEqual(
+            inlinefuncs.parse_inlinefunc("testing $blah{without an ending."),
+            "testing $blah{without an ending.",
+        )
 
     def test_single_func(self):
-        self.assertEqual(inlinefuncs.parse_inlinefunc(
-            "this is a test with $pad(centered, 20) text in it."),
-            "this is a test with       centered       text in it.")
+        self.assertEqual(
+            inlinefuncs.parse_inlinefunc("this is a test with $pad(centered, 20) text in it."),
+            "this is a test with       centered       text in it.",
+        )
 
     def test_nested(self):
-        self.assertEqual(inlinefuncs.parse_inlinefunc(
-            "this $crop(is a test with $pad(padded, 20) text in $pad(pad2, 10) a crop, 80)"),
-            "this is a test with        padded        text in    pad2    a crop")
+        self.assertEqual(
+            inlinefuncs.parse_inlinefunc(
+                "this $crop(is a test with $pad(padded, 20) text in $pad(pad2, 10) a crop, 80)"
+            ),
+            "this is a test with        padded        text in    pad2    a crop",
+        )
 
     def test_escaped(self):
-        self.assertEqual(inlinefuncs.parse_inlinefunc(
-            "this should be $pad('''escaped,''' and '''instead,''' cropped $crop(with a long,5) text., 80)"),
-            "this should be                    escaped, and instead, cropped with  text.                    ")
+        self.assertEqual(
+            inlinefuncs.parse_inlinefunc(
+                "this should be $pad('''escaped,''' and '''instead,''' cropped $crop(with a long,5) text., 80)"
+            ),
+            "this should be                    escaped, and instead, cropped with  text.                    ",
+        )
 
     def test_escaped2(self):
-        self.assertEqual(inlinefuncs.parse_inlinefunc(
-            'this should be $pad("""escaped,""" and """instead,""" cropped $crop(with a long,5) text., 80)'),
-            "this should be                    escaped, and instead, cropped with  text.                    ")
-
-
+        self.assertEqual(
+            inlinefuncs.parse_inlinefunc(
+                'this should be $pad("""escaped,""" and """instead,""" cropped $crop(with a long,5) text., 80)'
+            ),
+            "this should be                    escaped, and instead, cropped with  text.                    ",
+        )
diff --git a/evennia/utils/tests/test_text2html.py b/evennia/utils/tests/test_text2html.py
new file mode 100644
index 00000000000..f6466466e10
--- /dev/null
+++ b/evennia/utils/tests/test_text2html.py
@@ -0,0 +1,202 @@
+"""Tests for text2html """
+
+import unittest
+from django.test import TestCase
+from evennia.utils import ansi, text2html
+import mock
+
+
+class TestText2Html(TestCase):
+    def test_re_color(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.re_color("foo"))
+        self.assertEqual(
+            '<span class="color-001">red</span>foo',
+            parser.re_color(ansi.ANSI_UNHILITE + ansi.ANSI_RED + "red" + ansi.ANSI_NORMAL + "foo"),
+        )
+        self.assertEqual(
+            '<span class="bgcolor-001">red</span>foo',
+            parser.re_color(ansi.ANSI_BACK_RED + "red" + ansi.ANSI_NORMAL + "foo"),
+        )
+        self.assertEqual(
+            '<span class="bgcolor-001"><span class="color-002">red</span></span>foo',
+            parser.re_color(
+                ansi.ANSI_BACK_RED
+                + ansi.ANSI_UNHILITE
+                + ansi.ANSI_GREEN
+                + "red"
+                + ansi.ANSI_NORMAL
+                + "foo"
+            ),
+        )
+
+    @unittest.skip("parser issues")
+    def test_re_bold(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.re_bold("foo"))
+        self.assertEqual(
+            # "a <strong>red</strong>foo",  # TODO: why not?
+            "a <strong>redfoo</strong>",
+            parser.re_bold("a " + ansi.ANSI_HILITE + "red" + ansi.ANSI_UNHILITE + "foo"),
+        )
+
+    @unittest.skip("parser issues")
+    def test_re_underline(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.re_underline("foo"))
+        self.assertEqual(
+            'a <span class="underline">red</span>' + ansi.ANSI_NORMAL + "foo",
+            parser.re_underline(
+                "a "
+                + ansi.ANSI_UNDERLINE
+                + "red"
+                + ansi.ANSI_NORMAL  # TODO: why does it keep it?
+                + "foo"
+            ),
+        )
+
+    @unittest.skip("parser issues")
+    def test_re_blinking(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.re_blinking("foo"))
+        self.assertEqual(
+            'a <span class="blink">red</span>' + ansi.ANSI_NORMAL + "foo",
+            parser.re_blinking(
+                "a "
+                + ansi.ANSI_BLINK
+                + "red"
+                + ansi.ANSI_NORMAL  # TODO: why does it keep it?
+                + "foo"
+            ),
+        )
+
+    @unittest.skip("parser issues")
+    def test_re_inversing(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.re_inversing("foo"))
+        self.assertEqual(
+            'a <span class="inverse">red</span>' + ansi.ANSI_NORMAL + "foo",
+            parser.re_inversing(
+                "a "
+                + ansi.ANSI_INVERSE
+                + "red"
+                + ansi.ANSI_NORMAL  # TODO: why does it keep it?
+                + "foo"
+            ),
+        )
+
+    @unittest.skip("parser issues")
+    def test_remove_bells(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.remove_bells("foo"))
+        self.assertEqual(
+            "a red" + ansi.ANSI_NORMAL + "foo",
+            parser.remove_bells(
+                "a "
+                + ansi.ANSI_BEEP
+                + "red"
+                + ansi.ANSI_NORMAL  # TODO: why does it keep it?
+                + "foo"
+            ),
+        )
+
+    def test_remove_backspaces(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.remove_backspaces("foo"))
+        self.assertEqual("redfoo", parser.remove_backspaces("a\010redfoo"))
+
+    def test_convert_linebreaks(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.convert_linebreaks("foo"))
+        self.assertEqual("a<br> redfoo<br>", parser.convert_linebreaks("a\n redfoo\n"))
+
+    @unittest.skip("parser issues")
+    def test_convert_urls(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.convert_urls("foo"))
+        self.assertEqual(
+            'a <a href="http://redfoo" target="_blank">http://redfoo</a> runs',
+            parser.convert_urls("a http://redfoo runs"),
+        )
+        # TODO: doesn't URL encode correctly
+
+    def test_re_double_space(self):
+        parser = text2html.HTML_PARSER
+        self.assertEqual("foo", parser.re_double_space("foo"))
+        self.assertEqual(
+            "a &nbsp;red &nbsp;&nbsp;&nbsp;foo", parser.re_double_space("a  red    foo")
+        )
+
+    def test_sub_mxp_links(self):
+        parser = text2html.HTML_PARSER
+        mocked_match = mock.Mock()
+        mocked_match.groups.return_value = ["cmd", "text"]
+        self.assertEqual(
+            r"""<a id="mxplink" href="#" """
+            """onclick="Evennia.msg(&quot;text&quot;,[&quot;cmd&quot;],{});"""
+            """return false;">text</a>""",
+            parser.sub_mxp_links(mocked_match),
+        )
+
+    def test_sub_text(self):
+        parser = text2html.HTML_PARSER
+        mocked_match = mock.Mock()
+        mocked_match.groupdict.return_value = {"htmlchars": "foo"}
+        self.assertEqual("foo", parser.sub_text(mocked_match))
+        mocked_match.groupdict.return_value = {"htmlchars": "", "lineend": "foo"}
+        self.assertEqual("<br>", parser.sub_text(mocked_match))
+        mocked_match.groupdict.return_value = {"htmlchars": "", "lineend": "", "firstspace": "foo"}
+        self.assertEqual(" &nbsp;", parser.sub_text(mocked_match))
+        parser.tabstop = 2
+        mocked_match.groupdict.return_value = {
+            "htmlchars": "",
+            "lineend": "",
+            "firstspace": "",
+            "space": "\t",
+        }
+        self.assertEqual(" &nbsp;&nbsp;", parser.sub_text(mocked_match))
+        mocked_match.groupdict.return_value = {
+            "htmlchars": "",
+            "lineend": "",
+            "firstspace": "",
+            "space": " ",
+            "spacestart": " ",
+        }
+        mocked_match.group.return_value = " \t "
+        self.assertEqual("&nbsp;&nbsp;&nbsp;&nbsp;", parser.sub_text(mocked_match))
+        mocked_match.groupdict.return_value = {
+            "htmlchars": "",
+            "lineend": "",
+            "firstspace": "",
+            "space": "",
+            "spacestart": "",
+        }
+        self.assertEqual(None, parser.sub_text(mocked_match))
+
+    def test_parse_html(self):
+        self.assertEqual("foo", text2html.parse_html("foo"))
+        self.maxDiff = None
+        self.assertEqual(
+            """<span class="blink"><span class="bgcolor-006">Hello </span><span class="underline"><span class="err">W</span><span class="err">o</span><span class="err">r</span><span class="err">l</span><span class="err">d</span><span class="err">!<span class="bgcolor-002">!</span></span></span></span>""",
+            text2html.parse_html(
+                ansi.ANSI_BLINK
+                + ansi.ANSI_BACK_CYAN
+                + "Hello "
+                + ansi.ANSI_NORMAL
+                + ansi.ANSI_UNDERLINE
+                + ansi.ANSI_RED
+                + "W"
+                + ansi.ANSI_GREEN
+                + "o"
+                + ansi.ANSI_YELLOW
+                + "r"
+                + ansi.ANSI_BLUE
+                + "l"
+                + ansi.ANSI_MAGENTA
+                + "d"
+                + ansi.ANSI_CYAN
+                + "!"
+                + ansi.ANSI_BACK_GREEN
+                + "!"
+            ),
+        )
diff --git a/evennia/utils/tests/test_utils.py b/evennia/utils/tests/test_utils.py
index d2e42c4169d..c969a988a56 100644
--- a/evennia/utils/tests/test_utils.py
+++ b/evennia/utils/tests/test_utils.py
@@ -5,7 +5,11 @@
 
 """
 
+import os.path
+
+import mock
 from django.test import TestCase
+from datetime import datetime
 
 from evennia.utils.ansi import ANSIString
 from evennia.utils import utils
@@ -61,10 +65,12 @@ class TestListToString(TestCase):
     """
 
     def test_list_to_string(self):
-        self.assertEqual('1, 2, 3', utils.list_to_string([1, 2, 3], endsep=""))
+        self.assertEqual("1, 2, 3", utils.list_to_string([1, 2, 3], endsep=""))
         self.assertEqual('"1", "2", "3"', utils.list_to_string([1, 2, 3], endsep="", addquote=True))
-        self.assertEqual('1, 2 and 3', utils.list_to_string([1, 2, 3]))
-        self.assertEqual('"1", "2" and "3"', utils.list_to_string([1, 2, 3], endsep="and", addquote=True))
+        self.assertEqual("1, 2 and 3", utils.list_to_string([1, 2, 3]))
+        self.assertEqual(
+            '"1", "2" and "3"', utils.list_to_string([1, 2, 3], endsep="and", addquote=True)
+        )
 
 
 class TestMLen(TestCase):
@@ -74,22 +80,22 @@ class TestMLen(TestCase):
     """
 
     def test_non_mxp_string(self):
-        self.assertEqual(utils.m_len('Test_string'), 11)
+        self.assertEqual(utils.m_len("Test_string"), 11)
 
     def test_mxp_string(self):
-        self.assertEqual(utils.m_len('|lclook|ltat|le'), 2)
+        self.assertEqual(utils.m_len("|lclook|ltat|le"), 2)
 
     def test_mxp_ansi_string(self):
-        self.assertEqual(utils.m_len(ANSIString('|lcl|gook|ltat|le|n')), 2)
+        self.assertEqual(utils.m_len(ANSIString("|lcl|gook|ltat|le|n")), 2)
 
     def test_non_mxp_ansi_string(self):
-        self.assertEqual(utils.m_len(ANSIString('|gHello|n')), 5)
+        self.assertEqual(utils.m_len(ANSIString("|gHello|n")), 5)
 
     def test_list(self):
         self.assertEqual(utils.m_len([None, None]), 2)
 
     def test_dict(self):
-        self.assertEqual(utils.m_len({'hello': True, 'Goodbye': False}), 2)
+        self.assertEqual(utils.m_len({"hello": True, "Goodbye": False}), 2)
 
 
 class TestTimeformat(TestCase):
@@ -137,12 +143,9 @@ def test_style_2(self):
         self.assertEqual(utils.time_format(3600, 2), "1 hour, 0 minutes")
         self.assertEqual(utils.time_format(3725, 2), "1 hour, 2 minutes")
         self.assertEqual(utils.time_format(86350, 2), "23 hours, 59 minutes")
-        self.assertEqual(utils.time_format(86800, 2),
-                         "1 day, 0 hours, 6 minutes")
-        self.assertEqual(utils.time_format(130800, 2),
-                         "1 day, 12 hours, 20 minutes")
-        self.assertEqual(utils.time_format(530800, 2),
-                         "6 days, 3 hours, 26 minutes")
+        self.assertEqual(utils.time_format(86800, 2), "1 day, 0 hours, 6 minutes")
+        self.assertEqual(utils.time_format(130800, 2), "1 day, 12 hours, 20 minutes")
+        self.assertEqual(utils.time_format(530800, 2), "6 days, 3 hours, 26 minutes")
 
     def test_style_3(self):
         """Test the style 3 of time_format."""
@@ -151,18 +154,12 @@ def test_style_3(self):
         self.assertEqual(utils.time_format(92, 3), "1 minute 32 seconds")
         self.assertEqual(utils.time_format(300, 3), "5 minutes 0 seconds")
         self.assertEqual(utils.time_format(660, 3), "11 minutes 0 seconds")
-        self.assertEqual(utils.time_format(3600, 3),
-                         "1 hour, 0 minutes")
-        self.assertEqual(utils.time_format(3725, 3),
-                         "1 hour, 2 minutes 5 seconds")
-        self.assertEqual(utils.time_format(86350, 3),
-                         "23 hours, 59 minutes 10 seconds")
-        self.assertEqual(utils.time_format(86800, 3),
-                         "1 day, 0 hours, 6 minutes 40 seconds")
-        self.assertEqual(utils.time_format(130800, 3),
-                         "1 day, 12 hours, 20 minutes 0 seconds")
-        self.assertEqual(utils.time_format(530800, 3),
-                         "6 days, 3 hours, 26 minutes 40 seconds")
+        self.assertEqual(utils.time_format(3600, 3), "1 hour, 0 minutes")
+        self.assertEqual(utils.time_format(3725, 3), "1 hour, 2 minutes 5 seconds")
+        self.assertEqual(utils.time_format(86350, 3), "23 hours, 59 minutes 10 seconds")
+        self.assertEqual(utils.time_format(86800, 3), "1 day, 0 hours, 6 minutes 40 seconds")
+        self.assertEqual(utils.time_format(130800, 3), "1 day, 12 hours, 20 minutes 0 seconds")
+        self.assertEqual(utils.time_format(530800, 3), "6 days, 3 hours, 26 minutes 40 seconds")
 
     def test_style_4(self):
         """Test the style 4 of time_format."""
@@ -186,3 +183,60 @@ def test_unknown_format(self):
         """Test that unknown formats raise exceptions."""
         self.assertRaises(ValueError, utils.time_format, 0, 5)
         self.assertRaises(ValueError, utils.time_format, 0, "u")
+
+
+@mock.patch(
+    "evennia.utils.utils.timezone.now",
+    new=mock.MagicMock(return_value=datetime(2019, 8, 28, 21, 56)),
+)
+class TestDateTimeFormat(TestCase):
+    def test_datetimes(self):
+        dtobj = datetime(2017, 7, 26, 22, 54)
+        self.assertEqual(utils.datetime_format(dtobj), "Jul 26, 2017")
+        dtobj = datetime(2019, 7, 26, 22, 54)
+        self.assertEqual(utils.datetime_format(dtobj), "Jul 26")
+        dtobj = datetime(2019, 8, 28, 19, 54)
+        self.assertEqual(utils.datetime_format(dtobj), "19:54")
+        dtobj = datetime(2019, 8, 28, 21, 32)
+        self.assertEqual(utils.datetime_format(dtobj), "21:32:00")
+
+
+class TestImportFunctions(TestCase):
+    def _t_dir_file(self, filename):
+        testdir = os.path.dirname(os.path.abspath(__file__))
+        return os.path.join(testdir, filename)
+
+    def test_mod_import(self):
+        loaded_mod = utils.mod_import("evennia.utils.ansi")
+        self.assertIsNotNone(loaded_mod)
+
+    def test_mod_import_invalid(self):
+        loaded_mod = utils.mod_import("evennia.utils.invalid_module")
+        self.assertIsNone(loaded_mod)
+
+    def test_mod_import_from_path(self):
+        test_path = self._t_dir_file("test_eveditor.py")
+        loaded_mod = utils.mod_import_from_path(test_path)
+        self.assertIsNotNone(loaded_mod)
+
+    def test_mod_import_from_path_invalid(self):
+        test_path = self._t_dir_file("invalid_filename.py")
+        loaded_mod = utils.mod_import_from_path(test_path)
+        self.assertIsNone(loaded_mod)
+
+
+class LatinifyTest(TestCase):
+    def setUp(self):
+        super().setUp()
+
+        self.example_str = "It naïvely says, “plugh.”"
+        self.expected_output = 'It naively says, "plugh."'
+
+    def test_plain_string(self):
+        result = utils.latinify(self.example_str)
+        self.assertEqual(result, self.expected_output)
+
+    def test_byte_string(self):
+        byte_str = utils.to_bytes(self.example_str)
+        result = utils.latinify(byte_str)
+        self.assertEqual(result, self.expected_output)
diff --git a/evennia/utils/tests/test_validatorfuncs.py b/evennia/utils/tests/test_validatorfuncs.py
new file mode 100644
index 00000000000..54823bc4ee9
--- /dev/null
+++ b/evennia/utils/tests/test_validatorfuncs.py
@@ -0,0 +1,152 @@
+"""Tests for validatorfuncs """
+
+from django.test import TestCase
+from evennia.utils import validatorfuncs
+import mock
+import datetime
+import pytz
+
+
+class TestValidatorFuncs(TestCase):
+    def test_text_ok(self):
+        for val in [None, -123, "abc", 1.234, {1: True, 2: False}, ["a", 1]]:
+            self.assertEqual(str(val), validatorfuncs.text(val))
+
+    @mock.patch("builtins.str")
+    def test_text_raises_ValueError(self, mocked_str):
+        mocked_str.side_effect = Exception
+        with self.assertRaises(ValueError):
+            validatorfuncs.text(None)
+
+    def test_color_ok(self):
+        for color in ["r", "g", "b", "H", "R", "M", "^"]:
+            self.assertEqual(color, validatorfuncs.color(color))
+
+    def test_color_falsy_raises_ValueError(self):
+        for color in [None, (), [], False, True, {}]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.color(color)
+
+    def test_datetime_ok(self):
+        for dt in ["Oct 12 1:00 1492", "Jan 2 12:00 2020", "Dec 31 00:00 2018"]:
+            self.assertTrue(
+                isinstance(validatorfuncs.datetime(dt, from_tz=pytz.UTC), datetime.datetime)
+            )
+
+    def test_datetime_raises_ValueError(self):
+        for dt in ["", "January 1, 2019", "1/1/2019", "Jan 1 2019"]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.datetime(dt)
+
+    def test_duration_ok(self):
+        for d in ["1d", "2w", "3h", "4s", "5m", "6y"]:
+            self.assertTrue(isinstance(validatorfuncs.duration(d), datetime.timedelta))
+
+        self.assertEqual(
+            datetime.timedelta(1 + 6 * 365, 2, 0, 0, 3, 4, 5),
+            validatorfuncs.duration("1d 2s 3m 4h 5w 6y"),
+        )
+        # values may be duplicated
+        self.assertEqual(
+            datetime.timedelta((1 + 7) + (6 + 12) * 365, 2 + 8, 0, 0, 3 + 9, 4 + 10, 5 + 11),
+            validatorfuncs.duration("1d 2s 3m 4h 5w 6y 7d 8s 9m 10h 11w 12y"),
+        )
+
+    def test_duration_raises_ValueError(self):
+        for d in ["", "1", "5days", "1Week"]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.duration(d)
+
+    def test_future_ok(self):
+        year = int(datetime.datetime.utcnow().strftime("%Y"))
+        for f in [f"Jan 2 12:00 {year+1}", f"Dec 31 00:00 {year+1}"]:
+            self.assertTrue(
+                isinstance(validatorfuncs.future(f, from_tz=pytz.UTC), datetime.datetime)
+            )
+
+    def test_future_raises_ValueError(self):
+        year = int(datetime.datetime.utcnow().strftime("%Y"))
+        for f in [f"Jan 2 12:00 {year-1}", f"Dec 31 00:00 {year-1}"]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.future(f, from_tz=pytz.UTC)
+
+    def test_signed_integer_ok(self):
+        for si in ["123", "4567890", "001", "-123", "-45", "0"]:
+            self.assertEqual(int(si), validatorfuncs.signed_integer(si))
+
+    @mock.patch("builtins.int")
+    def test_signed_integer_raises_ValueError(self, mocked_int):
+        for si in ["", "000", "abc"]:
+            mocked_int.side_effect = ValueError
+            with self.assertRaises(ValueError):
+                validatorfuncs.signed_integer(si)
+
+    def test_positive_integer_ok(self):
+        for pi in ["123", "4567890", "001"]:
+            self.assertEqual(int(pi), validatorfuncs.positive_integer(pi))
+
+    @mock.patch("builtins.int")
+    def test_positive_integer_raises_ValueError(self, mocked_int):
+        mocked_int.return_value = -1
+        with self.assertRaises(ValueError):
+            validatorfuncs.positive_integer(str(-1))
+        for pi in ["", "000", "abc", "-1"]:
+            mocked_int.side_effect = ValueError
+            with self.assertRaises(ValueError):
+                validatorfuncs.positive_integer(pi)
+
+    def test_unsigned_integer_ok(self):
+        for ui in ["123", "4567890", "001", "0"]:
+            self.assertEqual(int(ui), validatorfuncs.unsigned_integer(ui))
+
+    @mock.patch("builtins.int")
+    def test_unsigned_integer_raises_ValueError(self, mocked_int):
+        mocked_int.return_value = -1
+        with self.assertRaises(ValueError):
+            validatorfuncs.unsigned_integer(str(-1))
+        for ui in ["", "000", "abc", "-1", "0"]:
+            mocked_int.side_effect = ValueError
+            with self.assertRaises(ValueError):
+                validatorfuncs.unsigned_integer(ui)
+
+    def test_boolean(self):
+        for b in ["true", "1", "on", "ENABLED"]:
+            self.assertTrue(validatorfuncs.boolean(b))
+        for b in ["FalSe", "0", "oFF", "disabled"]:
+            self.assertFalse(validatorfuncs.boolean(b))
+
+    def test_boolean_raises_ValueError(self):
+        for b in ["", None, 1, 0, True, False, [None], {True: True}]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.boolean(b)
+
+    def test_timezone_ok(self):
+        for tz in ["America/Chicago", "GMT", "UTC"]:
+            self.assertEqual(tz, validatorfuncs.timezone(tz).zone)
+
+    def test_timezone_raises_ValueError(self):
+        for tz in ["America", None, "", "Mars", "DT"]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.timezone(tz)
+
+    def test_email_ok(self):
+        for e in ["a@a.aa", "zeus@olympus.net"]:
+            self.assertEqual(e, validatorfuncs.email(e))
+
+    def test_email_raises_ValueError(self):
+        for e in ["", None, ["abc@abc.com"], 123]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.email(e)
+
+    def test_lock_ok(self):
+        for l in ["do:true;look:no", "a:t"]:
+            self.assertEqual(l, validatorfuncs.lock(l))
+
+    def test_lock_raises_ValueError(self):
+        for l in [";;;", "", ":", ":::", ";:;:", "x:", ":y"]:
+            with self.assertRaises(ValueError):
+                validatorfuncs.lock(l)
+        with self.assertRaises(ValueError):
+            validatorfuncs.lock("view:", access_options=())
+        with self.assertRaises(ValueError):
+            validatorfuncs.lock("view:", access_options=("look"))
diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py
index 88f2101d3c9..33d1a48ff37 100644
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@@ -1,4 +1,3 @@
-
 """
 ANSI -> html converter
 
@@ -9,10 +8,8 @@
 (extensively modified by Griatch 2010)
 """
 
-from builtins import object
-
 import re
-import cgi
+from html import escape as html_escape
 from .ansi import *
 
 
@@ -34,58 +31,64 @@ class TextToHTMLparser(object):
     normal = ANSI_NORMAL  # "
     underline = ANSI_UNDERLINE
     blink = ANSI_BLINK
-    inverse = ANSI_INVERSE   # this will produce an outline; no obvious css equivalent?
+    inverse = ANSI_INVERSE  # this will produce an outline; no obvious css equivalent?
     colorcodes = [
-        ('color-000', unhilite + ANSI_BLACK),  # pure black
-        ('color-001', unhilite + ANSI_RED),
-        ('color-002', unhilite + ANSI_GREEN),
-        ('color-003', unhilite + ANSI_YELLOW),
-        ('color-004', unhilite + ANSI_BLUE),
-        ('color-005', unhilite + ANSI_MAGENTA),
-        ('color-006', unhilite + ANSI_CYAN),
-        ('color-007', unhilite + ANSI_WHITE),  # light grey
-        ('color-008', hilite + ANSI_BLACK),  # dark grey
-        ('color-009', hilite + ANSI_RED),
-        ('color-010', hilite + ANSI_GREEN),
-        ('color-011', hilite + ANSI_YELLOW),
-        ('color-012', hilite + ANSI_BLUE),
-        ('color-013', hilite + ANSI_MAGENTA),
-        ('color-014', hilite + ANSI_CYAN),
-        ('color-015', hilite + ANSI_WHITE)  # pure white
+        ("color-000", unhilite + ANSI_BLACK),  # pure black
+        ("color-001", unhilite + ANSI_RED),
+        ("color-002", unhilite + ANSI_GREEN),
+        ("color-003", unhilite + ANSI_YELLOW),
+        ("color-004", unhilite + ANSI_BLUE),
+        ("color-005", unhilite + ANSI_MAGENTA),
+        ("color-006", unhilite + ANSI_CYAN),
+        ("color-007", unhilite + ANSI_WHITE),  # light grey
+        ("color-008", hilite + ANSI_BLACK),  # dark grey
+        ("color-009", hilite + ANSI_RED),
+        ("color-010", hilite + ANSI_GREEN),
+        ("color-011", hilite + ANSI_YELLOW),
+        ("color-012", hilite + ANSI_BLUE),
+        ("color-013", hilite + ANSI_MAGENTA),
+        ("color-014", hilite + ANSI_CYAN),
+        ("color-015", hilite + ANSI_WHITE),  # pure white
     ] + [("color-%03i" % (i + 16), XTERM256_FG % ("%i" % (i + 16))) for i in range(240)]
 
     colorback = [
-        ('bgcolor-000', ANSI_BACK_BLACK),  # pure black
-        ('bgcolor-001', ANSI_BACK_RED),
-        ('bgcolor-002', ANSI_BACK_GREEN),
-        ('bgcolor-003', ANSI_BACK_YELLOW),
-        ('bgcolor-004', ANSI_BACK_BLUE),
-        ('bgcolor-005', ANSI_BACK_MAGENTA),
-        ('bgcolor-006', ANSI_BACK_CYAN),
-        ('bgcolor-007', ANSI_BACK_WHITE),  # light grey
-        ('bgcolor-008', hilite + ANSI_BACK_BLACK),  # dark grey
-        ('bgcolor-009', hilite + ANSI_BACK_RED),
-        ('bgcolor-010', hilite + ANSI_BACK_GREEN),
-        ('bgcolor-011', hilite + ANSI_BACK_YELLOW),
-        ('bgcolor-012', hilite + ANSI_BACK_BLUE),
-        ('bgcolor-013', hilite + ANSI_BACK_MAGENTA),
-        ('bgcolor-014', hilite + ANSI_BACK_CYAN),
-        ('bgcolor-015', hilite + ANSI_BACK_WHITE),  # pure white
+        ("bgcolor-000", ANSI_BACK_BLACK),  # pure black
+        ("bgcolor-001", ANSI_BACK_RED),
+        ("bgcolor-002", ANSI_BACK_GREEN),
+        ("bgcolor-003", ANSI_BACK_YELLOW),
+        ("bgcolor-004", ANSI_BACK_BLUE),
+        ("bgcolor-005", ANSI_BACK_MAGENTA),
+        ("bgcolor-006", ANSI_BACK_CYAN),
+        ("bgcolor-007", ANSI_BACK_WHITE),  # light grey
+        ("bgcolor-008", hilite + ANSI_BACK_BLACK),  # dark grey
+        ("bgcolor-009", hilite + ANSI_BACK_RED),
+        ("bgcolor-010", hilite + ANSI_BACK_GREEN),
+        ("bgcolor-011", hilite + ANSI_BACK_YELLOW),
+        ("bgcolor-012", hilite + ANSI_BACK_BLUE),
+        ("bgcolor-013", hilite + ANSI_BACK_MAGENTA),
+        ("bgcolor-014", hilite + ANSI_BACK_CYAN),
+        ("bgcolor-015", hilite + ANSI_BACK_WHITE),  # pure white
     ] + [("bgcolor-%03i" % (i + 16), XTERM256_BG % ("%i" % (i + 16))) for i in range(240)]
 
     # make sure to escape [
-    #colorcodes = [(c, code.replace("[", r"\[")) for c, code in colorcodes]
-    #colorback = [(c, code.replace("[", r"\[")) for c, code in colorback]
+    # colorcodes = [(c, code.replace("[", r"\[")) for c, code in colorcodes]
+    # colorback = [(c, code.replace("[", r"\[")) for c, code in colorback]
     fg_colormap = dict((code, clr) for clr, code in colorcodes)
     bg_colormap = dict((code, clr) for clr, code in colorback)
 
     # create stop markers
-    fgstop = "(?:\033\[1m|\033\[22m)*\033\[3[0-8].*?m|\033\[0m|$"
-    bgstop = "(?:\033\[1m|\033\[22m)*\033\[4[0-8].*?m|\033\[0m|$"
+    fgstop = "(?:\033\[1m|\033\[22m){0,1}\033\[3[0-8].*?m|\033\[0m|$"
+    bgstop = "(?:\033\[1m|\033\[22m){0,1}\033\[4[0-8].*?m|\033\[0m|$"
+    bgfgstop = bgstop[:-2] + r"(\s*)" + fgstop
+
+    fgstart = "((?:\033\[1m|\033\[22m){0,1}\033\[3[0-8].*?m)"
+    bgstart = "((?:\033\[1m|\033\[22m){0,1}\033\[4[0-8].*?m)"
+    bgfgstart = bgstart + r"(\s*)" + "((?:\033\[1m|\033\[22m){0,1}\033\[[3-4][0-8].*?m){0,1}"
 
     # extract color markers, tagging the start marker and the text marked
-    re_fgs = re.compile("((?:\033\[1m|\033\[22m)*\033\[3[0-8].*?m)(.*?)(?=" + fgstop + ")")
-    re_bgs = re.compile("((?:\033\[1m|\033\[22m)*\033\[4[0-8].*?m)(.*?)(?=" + bgstop + ")")
+    re_fgs = re.compile(fgstart + "(.*?)(?=" + fgstop + ")")
+    re_bgs = re.compile(bgstart + "(.*?)(?=" + bgstop + ")")
+    re_bgfg = re.compile(bgfgstart + "(.*?)(?=" + bgfgstop + ")")
 
     re_normal = re.compile(normal.replace("[", r"\["))
     re_hilite = re.compile("(?:%s)(.*)(?=%s|%s)" % (hilite.replace("[", r"\["), fgstop, bgstop))
@@ -93,17 +96,44 @@ class TextToHTMLparser(object):
     re_uline = re.compile("(?:%s)(.*?)(?=%s|%s)" % (underline.replace("[", r"\["), fgstop, bgstop))
     re_blink = re.compile("(?:%s)(.*?)(?=%s|%s)" % (blink.replace("[", r"\["), fgstop, bgstop))
     re_inverse = re.compile("(?:%s)(.*?)(?=%s|%s)" % (inverse.replace("[", r"\["), fgstop, bgstop))
-    re_string = re.compile(r'(?P<htmlchars>[<&>])|(?P<space> [ \t]+)|(?P<spacestart>^ )|(?P<lineend>\r\n|\r|\n)', re.S | re.M | re.I)
-    re_url = re.compile(r'((?:ftp|www|https?)\W+(?:(?!\.(?:\s|$)|&\w+;)[^"\',;$*^\\(){}<>\[\]\s])+)(\.(?:\s|$)|&\w+;|)')
-    re_mxplink = re.compile(r'\|lc(.*?)\|lt(.*?)\|le', re.DOTALL)
+    re_string = re.compile(
+        r"(?P<htmlchars>[<&>])|(?P<firstspace>(?<=\S)  )|(?P<space> [ \t]+)|"
+        r"(?P<spacestart>^ )|(?P<lineend>\r\n|\r|\n)",
+        re.S | re.M | re.I,
+    )
+    re_dblspace = re.compile(r" {2,}", re.M)
+    re_url = re.compile(
+        r'((?:ftp|www|https?)\W+(?:(?!\.(?:\s|$)|&\w+;)[^"\',;$*^\\(){}<>\[\]\s])+)(\.(?:\s|$)|&\w+;|)'
+    )
+    re_mxplink = re.compile(r"\|lc(.*?)\|lt(.*?)\|le", re.DOTALL)
+
+    def _sub_bgfg(self, colormatch):
+        # print("colormatch.groups()", colormatch.groups())
+        bgcode, prespace, fgcode, text, postspace = colormatch.groups()
+        if not fgcode:
+            ret = r"""<span class="%s">%s%s%s</span>""" % (
+                self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")),
+                prespace and "&nbsp;" * len(prespace) or "",
+                postspace and "&nbsp;" * len(postspace) or "",
+                text,
+            )
+        else:
+            ret = r"""<span class="%s"><span class="%s">%s%s%s</span></span>""" % (
+                self.bg_colormap.get(bgcode, self.fg_colormap.get(bgcode, "err")),
+                self.fg_colormap.get(fgcode, self.bg_colormap.get(fgcode, "err")),
+                prespace and "&nbsp;" * len(prespace) or "",
+                postspace and "&nbsp;" * len(postspace) or "",
+                text,
+            )
+        return ret
 
     def _sub_fg(self, colormatch):
         code, text = colormatch.groups()
-        return r'''<span class="%s">%s</span>''' % (self.fg_colormap.get(code, "err"), text)
+        return r"""<span class="%s">%s</span>""" % (self.fg_colormap.get(code, "err"), text)
 
     def _sub_bg(self, colormatch):
         code, text = colormatch.groups()
-        return r'''<span class="%s">%s</span>''' % (self.bg_colormap.get(code, "err"), text)
+        return r"""<span class="%s">%s</span>""" % (self.bg_colormap.get(code, "err"), text)
 
     def re_color(self, text):
         """
@@ -117,6 +147,7 @@ def re_color(self, text):
             text (str): Re-colored text.
 
         """
+        text = self.re_bgfg.sub(self._sub_bgfg, text)
         text = self.re_fgs.sub(self._sub_fg, text)
         text = self.re_bgs.sub(self._sub_bg, text)
         text = self.re_normal.sub("", text)
@@ -134,8 +165,8 @@ def re_bold(self, text):
             text (str): Processed text.
 
         """
-        text = self.re_hilite.sub(r'<strong>\1</strong>', text)
-        return self.re_unhilite.sub(r'\1', text)  # strip unhilite - there is no equivalent in css.
+        text = self.re_hilite.sub(r"<strong>\1</strong>", text)
+        return self.re_unhilite.sub(r"\1", text)  # strip unhilite - there is no equivalent in css.
 
     def re_underline(self, text):
         """
@@ -185,7 +216,7 @@ def remove_bells(self, text):
             text (str): Processed text.
 
         """
-        return text.replace('\07', '')
+        return text.replace("\07", "")
 
     def remove_backspaces(self, text):
         """
@@ -198,10 +229,10 @@ def remove_backspaces(self, text):
             text (str): Processed text.
 
         """
-        backspace_or_eol = r'(.\010)|(\033\[K)'
+        backspace_or_eol = r"(.\010)|(\033\[K)"
         n = 1
         while n > 0:
-            text, n = re.subn(backspace_or_eol, '', text, 1)
+            text, n = re.subn(backspace_or_eol, "", text, 1)
         return text
 
     def convert_linebreaks(self, text):
@@ -215,8 +246,7 @@ def convert_linebreaks(self, text):
             text (str): Processed text.
 
         """
-        return text
-        return text.replace(r'\n', r'<br>')
+        return text.replace("\n", r"<br>")
 
     def convert_urls(self, text):
         """
@@ -233,22 +263,31 @@ def convert_urls(self, text):
         # change pages (and losing our webclient session).
         return self.re_url.sub(r'<a href="\1" target="_blank">\1</a>\2', text)
 
+    def re_double_space(self, text):
+        """
+        HTML will swallow any normal space after the first, so if any slipped
+        through we must make sure to replace them with " &nbsp;"
+        """
+        return self.re_dblspace.sub(self.sub_dblspace, text)
+
     def sub_mxp_links(self, match):
         """
         Helper method to be passed to re.sub,
         replaces MXP links with HTML code.
 
         Args:
-            text (str): Text to process.
+            match (re.Matchobject): Match for substitution.
 
         Returns:
             text (str): Processed text.
 
         """
-        cmd, text = [grp.replace('\"', "\\&quot;") for grp in match.groups()]
-        val = r'''<a id="mxplink" href="#" ''' \
-            '''onclick="Evennia.msg(&quot;text&quot;,[&quot;{cmd}&quot;],{{}});''' \
-            '''return false;">{text}</a>'''.format(cmd=cmd, text=text)
+        cmd, text = [grp.replace('"', "\\&quot;") for grp in match.groups()]
+        val = (
+            r"""<a id="mxplink" href="#" """
+            """onclick="Evennia.msg(&quot;text&quot;,[&quot;{cmd}&quot;],{{}});"""
+            """return false;">{text}</a>""".format(cmd=cmd, text=text)
+        )
         return val
 
     def sub_text(self, match):
@@ -264,18 +303,24 @@ def sub_text(self, match):
 
         """
         cdict = match.groupdict()
-        if cdict['htmlchars']:
-            return cgi.escape(cdict['htmlchars'])
-        if cdict['lineend']:
-            return '<br>'
-        elif cdict['space'] == '\t':
-            return ' ' * self.tabstop
-        elif cdict['space'] or cdict["spacestart"]:
-            text = match.group().replace('\t', '&nbsp;' * self.tabstop)
-            text = text.replace(' ', '&nbsp;')
+        if cdict["htmlchars"]:
+            return html_escape(cdict["htmlchars"])
+        elif cdict["lineend"]:
+            return "<br>"
+        elif cdict["firstspace"]:
+            return " &nbsp;"
+        elif cdict["space"] == "\t":
+            return " " if self.tabstop == 1 else " " + "&nbsp;" * self.tabstop
+        elif cdict["space"] or cdict["spacestart"]:
+            text = match.group().replace("\t", "&nbsp;" * self.tabstop)
+            text = text.replace(" ", "&nbsp;")
             return text
         return None
 
+    def sub_dblspace(self, match):
+        "clean up double-spaces"
+        return " " + "&nbsp;" * (len(match.group()) - 1)
+
     def parse(self, text, strip_ansi=False):
         """
         Main access function, converts a text containing ANSI codes
@@ -302,8 +347,9 @@ def parse(self, text, strip_ansi=False):
         result = self.convert_linebreaks(result)
         result = self.remove_backspaces(result)
         result = self.convert_urls(result)
+        result = self.re_double_space(result)
         # clean out eventual ansi that was missed
-        #result = parse_ansi(result, strip_ansi=True)
+        # result = parse_ansi(result, strip_ansi=True)
 
         return result
 
@@ -315,6 +361,7 @@ def parse(self, text, strip_ansi=False):
 # Access function
 #
 
+
 def parse_html(string, strip_ansi=False, parser=HTML_PARSER):
     """
     Parses a string, replace ANSI markup with html
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index 86f385c7c41..49c8af1e7b1 100644
--- a/evennia/utils/utils.py
+++ b/evennia/utils/utils.py
@@ -6,22 +6,22 @@
 be of use when designing your own game.
 
 """
-from future.utils import viewkeys, raise_
-
 import os
+import gc
 import sys
-import imp
 import types
 import math
 import re
 import textwrap
 import random
 import inspect
+import traceback
+import importlib
+import importlib.util
+import importlib.machinery
 from twisted.internet.task import deferLater
 from twisted.internet.defer import returnValue  # noqa - used as import target
 from os.path import join as osjoin
-from importlib import import_module
-from importlib.util import find_spec
 from inspect import ismodule, trace, getmembers, getmodule, getmro
 from collections import defaultdict, OrderedDict
 from twisted.internet import threads, reactor
@@ -34,14 +34,6 @@
 _MULTIMATCH_TEMPLATE = settings.SEARCH_MULTIMATCH_TEMPLATE
 _EVENNIA_DIR = settings.EVENNIA_DIR
 _GAME_DIR = settings.GAME_DIR
-
-
-# ModuleNotFoundError only in py3.6, handle both
-try:
-    from builtins import ModuleNotFoundError
-except ImportError:
-    ModuleNotFoundError = ImportError
-
 ENCODINGS = settings.ENCODINGS
 _GA = object.__getattribute__
 _SA = object.__setattr__
@@ -64,7 +56,7 @@ def is_iter(obj):
         what we want to do with a string.
 
     """
-    if isinstance(obj, (str, bytes )):
+    if isinstance(obj, (str, bytes)):
         return False
 
     try:
@@ -128,11 +120,11 @@ def pad(text, width=None, align="c", fillchar=" "):
 
     """
     width = width if width else settings.CLIENT_DEFAULT_WIDTH
-    align = align if align in ('c', 'l', 'r') else 'c'
+    align = align if align in ("c", "l", "r") else "c"
     fillchar = fillchar[0] if fillchar else " "
-    if align == 'l':
+    if align == "l":
         return text.ljust(width, fillchar)
-    elif align == 'r':
+    elif align == "r":
         return text.rjust(width, fillchar)
     else:
         return text.center(width, fillchar)
@@ -162,7 +154,7 @@ def crop(text, width=None, suffix="[...]"):
         return text
     else:
         lsuffix = len(suffix)
-        text = text[:width] if lsuffix >= width else "%s%s" % (text[:width - lsuffix], suffix)
+        text = text[:width] if lsuffix >= width else "%s%s" % (text[: width - lsuffix], suffix)
         return to_str(text)
 
 
@@ -191,11 +183,12 @@ def dedent(text, baseline_index=None):
     if baseline_index is None:
         return textwrap.dedent(text)
     else:
-        lines = text.split('\n')
+        lines = text.split("\n")
         baseline = lines[baseline_index]
-        spaceremove = len(baseline) - len(baseline.lstrip(' '))
-        return "\n".join(line[min(spaceremove, len(line) - len(line.lstrip(' '))):]
-                         for line in lines)
+        spaceremove = len(baseline) - len(baseline.lstrip(" "))
+        return "\n".join(
+            line[min(spaceremove, len(line) - len(line.lstrip(" "))) :] for line in lines
+        )
 
 
 def justify(text, width=None, align="f", indent=0):
@@ -228,19 +221,20 @@ def _process_line(line):
         line_rest = width - (wlen + ngaps)
         gap = " "  # minimum gap between words
         if line_rest > 0:
-            if align == 'l':
+            if align == "l":
                 if line[-1] == "\n\n":
-                    line[-1] = " " * (line_rest-1) + "\n" + " " * width + "\n" + " " * width
+                    line[-1] = " " * (line_rest - 1) + "\n" + " " * width + "\n" + " " * width
                 else:
                     line[-1] += " " * line_rest
-            elif align == 'r':
+            elif align == "r":
                 line[0] = " " * line_rest + line[0]
-            elif align == 'c':
+            elif align == "c":
                 pad = " " * (line_rest // 2)
                 line[0] = pad + line[0]
                 if line[-1] == "\n\n":
-                    line[-1] += pad + " " * (line_rest % 2 - 1) + \
-                            "\n" + " " * width + "\n" + " " * width
+                    line[-1] += (
+                        pad + " " * (line_rest % 2 - 1) + "\n" + " " * width + "\n" + " " * width
+                    )
                 else:
                     line[-1] = line[-1] + pad + " " * (line_rest % 2)
             else:  # align 'f'
@@ -290,7 +284,7 @@ def _process_line(line):
     return "\n".join([indentstring + line for line in lines])
 
 
-def columnize(string, columns=2, spacing=4, align='l', width=None):
+def columnize(string, columns=2, spacing=4, align="l", width=None):
     """
     Break a string into a number of columns, using as little
     vertical space as possible.
@@ -332,7 +326,7 @@ def columnize(string, columns=2, spacing=4, align='l', width=None):
     cols = []
     istart = 0
     for irows in nrows:
-        cols.append(onecol[istart:istart+irows])
+        cols.append(onecol[istart : istart + irows])
         istart = istart + irows
     for col in cols:
         if len(col) < height:
@@ -382,8 +376,8 @@ def list_to_string(inlist, endsep="and", addquote=False):
         return ""
     if addquote:
         if len(inlist) == 1:
-            return "\"%s\"" % inlist[0]
-        return ", ".join("\"%s\"" % v for v in inlist[:-1]) + "%s %s" % (endsep, "\"%s\"" % inlist[-1])
+            return '"%s"' % inlist[0]
+        return ", ".join('"%s"' % v for v in inlist[:-1]) + "%s %s" % (endsep, '"%s"' % inlist[-1])
     else:
         if len(inlist) == 1:
             return str(inlist[0])
@@ -456,9 +450,9 @@ def time_format(seconds, style=0):
         Standard colon-style output.
         """
         if days > 0:
-            retval = '%id %02i:%02i' % (days, hours, minutes,)
+            retval = "%id %02i:%02i" % (days, hours, minutes)
         else:
-            retval = '%02i:%02i' % (hours, minutes,)
+            retval = "%02i:%02i" % (hours, minutes)
         return retval
 
     elif style == 1:
@@ -466,62 +460,62 @@ def time_format(seconds, style=0):
         Simple, abbreviated form that only shows the highest time amount.
         """
         if days > 0:
-            return '%id' % (days,)
+            return "%id" % (days,)
         elif hours > 0:
-            return '%ih' % (hours,)
+            return "%ih" % (hours,)
         elif minutes > 0:
-            return '%im' % (minutes,)
+            return "%im" % (minutes,)
         else:
-            return '%is' % (seconds,)
+            return "%is" % (seconds,)
     elif style == 2:
         """
         Full-detailed, long-winded format. We ignore seconds.
         """
-        days_str = hours_str = ''
-        minutes_str = '0 minutes'
+        days_str = hours_str = ""
+        minutes_str = "0 minutes"
 
         if days > 0:
             if days == 1:
-                days_str = '%i day, ' % days
+                days_str = "%i day, " % days
             else:
-                days_str = '%i days, ' % days
+                days_str = "%i days, " % days
         if days or hours > 0:
             if hours == 1:
-                hours_str = '%i hour, ' % hours
+                hours_str = "%i hour, " % hours
             else:
-                hours_str = '%i hours, ' % hours
+                hours_str = "%i hours, " % hours
         if hours or minutes > 0:
             if minutes == 1:
-                minutes_str = '%i minute ' % minutes
+                minutes_str = "%i minute " % minutes
             else:
-                minutes_str = '%i minutes ' % minutes
-        retval = '%s%s%s' % (days_str, hours_str, minutes_str)
+                minutes_str = "%i minutes " % minutes
+        retval = "%s%s%s" % (days_str, hours_str, minutes_str)
     elif style == 3:
         """
         Full-detailed, long-winded format. Includes seconds.
         """
-        days_str = hours_str = minutes_str = seconds_str = ''
+        days_str = hours_str = minutes_str = seconds_str = ""
         if days > 0:
             if days == 1:
-                days_str = '%i day, ' % days
+                days_str = "%i day, " % days
             else:
-                days_str = '%i days, ' % days
+                days_str = "%i days, " % days
         if days or hours > 0:
             if hours == 1:
-                hours_str = '%i hour, ' % hours
+                hours_str = "%i hour, " % hours
             else:
-                hours_str = '%i hours, ' % hours
+                hours_str = "%i hours, " % hours
         if hours or minutes > 0:
             if minutes == 1:
-                minutes_str = '%i minute ' % minutes
+                minutes_str = "%i minute " % minutes
             else:
-                minutes_str = '%i minutes ' % minutes
+                minutes_str = "%i minutes " % minutes
         if minutes or seconds > 0:
             if seconds == 1:
-                seconds_str = '%i second ' % seconds
+                seconds_str = "%i second " % seconds
             else:
-                seconds_str = '%i seconds ' % seconds
-        retval = '%s%s%s%s' % (days_str, hours_str, minutes_str, seconds_str)
+                seconds_str = "%i seconds " % seconds
+        retval = "%s%s%s%s" % (days_str, hours_str, minutes_str, seconds_str)
     elif style == 4:
         """
         Only return the highest unit.
@@ -576,10 +570,10 @@ def datetime_format(dtobj):
 
     if dtobj.year < now.year:
         # another year (Apr 5, 2019)
-        timestring = dtobj.strftime("%b %-d, %Y")
+        timestring = dtobj.strftime(f"%b {dtobj.day}, %Y")
     elif dtobj.date() < now.date():
         # another date, same year  (Apr 5)
-        timestring = dtobj.strftime("%b %-d")
+        timestring = dtobj.strftime(f"%b {dtobj.day}")
     elif dtobj.hour < now.hour - 1:
         # same day, more than 1 hour ago (10:45)
         timestring = dtobj.strftime("%H:%M")
@@ -619,6 +613,7 @@ def get_evennia_version(mode="long"):
 
     """
     import evennia
+
     vers = evennia.__version__
     if mode == "short":
         return vers.split()[0].strip()
@@ -629,7 +624,7 @@ def get_evennia_version(mode="long"):
         return vers
 
 
-def pypath_to_realpath(python_path, file_ending='.py', pypath_prefixes=None):
+def pypath_to_realpath(python_path, file_ending=".py", pypath_prefixes=None):
     """
     Converts a dotted Python path to an absolute path under the
     Evennia library directory or under the current game directory.
@@ -653,26 +648,38 @@ def pypath_to_realpath(python_path, file_ending='.py', pypath_prefixes=None):
         prefixes.
 
     """
-    path = python_path.strip().split('.')
+    path = python_path.strip().split(".")
     plong = osjoin(*path) + file_ending
-    pshort = osjoin(*path[1:]) + file_ending if len(path) > 1 else plong  # in case we had evennia. or mygame.
-    prefixlong = [osjoin(*ppath.strip().split('.'))
-                  for ppath in make_iter(pypath_prefixes)] \
-        if pypath_prefixes else []
-    prefixshort = [osjoin(*ppath.strip().split('.')[1:])
-                   for ppath in make_iter(pypath_prefixes) if len(ppath.strip().split('.')) > 1]\
-        if pypath_prefixes else []
-    paths = [plong] + \
-            [osjoin(_EVENNIA_DIR, prefix, plong) for prefix in prefixlong] + \
-            [osjoin(_GAME_DIR, prefix, plong) for prefix in prefixlong] + \
-            [osjoin(_EVENNIA_DIR, prefix, plong) for prefix in prefixshort] + \
-            [osjoin(_GAME_DIR, prefix, plong) for prefix in prefixshort] + \
-            [osjoin(_EVENNIA_DIR, plong), osjoin(_GAME_DIR, plong)] + \
-            [osjoin(_EVENNIA_DIR, prefix, pshort) for prefix in prefixshort] + \
-            [osjoin(_GAME_DIR, prefix, pshort) for prefix in prefixshort] + \
-            [osjoin(_EVENNIA_DIR, prefix, pshort) for prefix in prefixlong] + \
-            [osjoin(_GAME_DIR, prefix, pshort) for prefix in prefixlong] + \
-            [osjoin(_EVENNIA_DIR, pshort), osjoin(_GAME_DIR, pshort)]
+    pshort = (
+        osjoin(*path[1:]) + file_ending if len(path) > 1 else plong
+    )  # in case we had evennia. or mygame.
+    prefixlong = (
+        [osjoin(*ppath.strip().split(".")) for ppath in make_iter(pypath_prefixes)]
+        if pypath_prefixes
+        else []
+    )
+    prefixshort = (
+        [
+            osjoin(*ppath.strip().split(".")[1:])
+            for ppath in make_iter(pypath_prefixes)
+            if len(ppath.strip().split(".")) > 1
+        ]
+        if pypath_prefixes
+        else []
+    )
+    paths = (
+        [plong]
+        + [osjoin(_EVENNIA_DIR, prefix, plong) for prefix in prefixlong]
+        + [osjoin(_GAME_DIR, prefix, plong) for prefix in prefixlong]
+        + [osjoin(_EVENNIA_DIR, prefix, plong) for prefix in prefixshort]
+        + [osjoin(_GAME_DIR, prefix, plong) for prefix in prefixshort]
+        + [osjoin(_EVENNIA_DIR, plong), osjoin(_GAME_DIR, plong)]
+        + [osjoin(_EVENNIA_DIR, prefix, pshort) for prefix in prefixshort]
+        + [osjoin(_GAME_DIR, prefix, pshort) for prefix in prefixshort]
+        + [osjoin(_EVENNIA_DIR, prefix, pshort) for prefix in prefixlong]
+        + [osjoin(_GAME_DIR, prefix, pshort) for prefix in prefixlong]
+        + [osjoin(_EVENNIA_DIR, pshort), osjoin(_GAME_DIR, pshort)]
+    )
     # filter out non-existing paths
     return list(set(p for p in paths if os.path.isfile(p)))
 
@@ -692,13 +699,14 @@ def dbref(inp, reqhash=True):
 
     """
     if reqhash:
-        num = (int(inp.lstrip('#')) if (isinstance(inp, str) and
-                                        inp.startswith("#") and
-                                        inp.lstrip('#').isdigit())
-               else None)
+        num = (
+            int(inp.lstrip("#"))
+            if (isinstance(inp, str) and inp.startswith("#") and inp.lstrip("#").isdigit())
+            else None
+        )
         return num if isinstance(num, int) and num > 0 else None
     elif isinstance(inp, str):
-        inp = inp.lstrip('#')
+        inp = inp.lstrip("#")
         return int(inp) if inp.isdigit() and int(inp) > 0 else None
     else:
         return inp if isinstance(inp, int) else None
@@ -747,11 +755,20 @@ def dbref_to_obj(inp, objclass, raise_errors=True):
 
 
 # some direct translations for the latinify
-_UNICODE_MAP = {"EM DASH": "-", "FIGURE DASH": "-", "EN DASH": "-", "HORIZONTAL BAR": "-",
-                "HORIZONTAL ELLIPSIS": "...", "RIGHT SINGLE QUOTATION MARK": "'"}
+_UNICODE_MAP = {
+    "EM DASH": "-",
+    "FIGURE DASH": "-",
+    "EN DASH": "-",
+    "HORIZONTAL BAR": "-",
+    "HORIZONTAL ELLIPSIS": "...",
+    "LEFT SINGLE QUOTATION MARK": "'",
+    "RIGHT SINGLE QUOTATION MARK": "'",
+    "LEFT DOUBLE QUOTATION MARK": '"',
+    "RIGHT DOUBLE QUOTATION MARK": '"',
+}
 
 
-def latinify(string, default='?', pure_ascii=False):
+def latinify(string, default="?", pure_ascii=False):
     """
     Convert a unicode string to "safe" ascii/latin-1 characters.
     This is used as a last resort when normal encoding does not work.
@@ -774,10 +791,13 @@ def latinify(string, default='?', pure_ascii=False):
 
     from unicodedata import name
 
+    if isinstance(string, bytes):
+        string = string.decode("utf8")
+
     converted = []
     for unich in iter(string):
         try:
-            ch = unich.decode('ascii')
+            ch = unich.encode("utf8").decode("ascii")
         except UnicodeDecodeError:
             # deduce a latin letter equivalent from the Unicode data
             # point name; e.g., since `name(u'á') == 'LATIN SMALL
@@ -794,12 +814,12 @@ def latinify(string, default='?', pure_ascii=False):
                 ch = _UNICODE_MAP[what]
             else:
                 what = what.split()
-                if what[0] == 'LATIN' and what[2] == 'LETTER' and len(what[3]) == 1:
-                    ch = what[3].lower() if what[1] == 'SMALL' else what[3].upper()
+                if what[0] == "LATIN" and what[2] == "LETTER" and len(what[3]) == 1:
+                    ch = what[3].lower() if what[1] == "SMALL" else what[3].upper()
                 else:
                     ch = default
         converted.append(chr(ord(ch)))
-    return ''.join(converted)
+    return "".join(converted)
 
 
 def to_bytes(text, session=None):
@@ -832,7 +852,7 @@ def to_bytes(text, session=None):
         except Exception:
             text = repr(text)
 
-    default_encoding = session.protocol_flags.get("ENCODING", 'utf-8') if session else 'utf-8'
+    default_encoding = session.protocol_flags.get("ENCODING", "utf-8") if session else "utf-8"
     try:
         return text.encode(default_encoding)
     except (LookupError, UnicodeEncodeError):
@@ -871,7 +891,7 @@ def to_str(text, session=None):
         except Exception:
             return repr(text)
 
-    default_encoding = session.protocol_flags.get("ENCODING", 'utf-8') if session else 'utf-8'
+    default_encoding = session.protocol_flags.get("ENCODING", "utf-8") if session else "utf-8"
     try:
         return text.decode(default_encoding)
     except (LookupError, UnicodeDecodeError):
@@ -902,9 +922,28 @@ def validate_email_address(emailaddress):
 
     emailaddress = r"%s" % emailaddress
 
-    domains = ("aero", "asia", "biz", "cat", "com", "coop",
-               "edu", "gov", "info", "int", "jobs", "mil", "mobi", "museum",
-               "name", "net", "org", "pro", "tel", "travel")
+    domains = (
+        "aero",
+        "asia",
+        "biz",
+        "cat",
+        "com",
+        "coop",
+        "edu",
+        "gov",
+        "info",
+        "int",
+        "jobs",
+        "mil",
+        "mobi",
+        "museum",
+        "name",
+        "net",
+        "org",
+        "pro",
+        "tel",
+        "travel",
+    )
 
     # Email address must be more than 7 characters in total.
     if len(emailaddress) < 7:
@@ -912,8 +951,8 @@ def validate_email_address(emailaddress):
 
     # Split up email address into parts.
     try:
-        localpart, domainname = emailaddress.rsplit('@', 1)
-        host, toplevel = domainname.rsplit('.', 1)
+        localpart, domainname = emailaddress.rsplit("@", 1)
+        host, toplevel = domainname.rsplit(".", 1)
     except ValueError:
         return False  # Address does not have enough parts.
 
@@ -921,9 +960,9 @@ def validate_email_address(emailaddress):
     if len(toplevel) != 2 and toplevel not in domains:
         return False  # Not a domain name.
 
-    for i in '-_.%+.':
+    for i in "-_.%+.":
         localpart = localpart.replace(i, "")
-    for i in '-_.':
+    for i in "-_.":
         host = host.replace(i, "")
 
     if localpart.isalnum() and host.isalnum():
@@ -981,6 +1020,7 @@ def server_services():
 
     """
     from evennia.server.sessionhandler import SESSIONS
+
     if hasattr(SESSIONS, "server") and hasattr(SESSIONS.server, "services"):
         server = SESSIONS.server.services.namedServices
     else:
@@ -1051,45 +1091,6 @@ def delay(timedelay, callback, *args, **kwargs):
     return _TASK_HANDLER.add(timedelay, callback, *args, **kwargs)
 
 
-_TYPECLASSMODELS = None
-_OBJECTMODELS = None
-
-
-def clean_object_caches(obj):
-    """
-    Clean all object caches on the given object.
-
-    Args:
-        obj (Object instace): An object whose caches to clean.
-
-    Notes:
-        This is only the contents cache these days.
-
-    """
-    global _TYPECLASSMODELS, _OBJECTMODELS
-    if not _TYPECLASSMODELS:
-        from evennia.typeclasses import models as _TYPECLASSMODELS
-
-    if not obj:
-        return
-    # contents cache
-    try:
-        _SA(obj, "_contents_cache", None)
-    except AttributeError:
-        # if the cache cannot be reached, move on anyway
-        pass
-
-    # on-object property cache
-    [_DA(obj, cname) for cname in viewkeys(obj.__dict__)
-     if cname.startswith("_cached_db_")]
-    try:
-        hashid = _GA(obj, "hashid")
-        _TYPECLASSMODELS._ATTRIBUTE_CACHE[hashid] = {}
-    except AttributeError:
-        # skip caching
-        pass
-
-
 _PPOOL = None
 _PCMD = None
 _PROC_ERR = "A process has ended with a probable error condition: process ended by signal 9."
@@ -1167,28 +1168,34 @@ def check_evennia_dependencies():
 
     # check main dependencies
     from evennia.server.evennia_launcher import check_main_evennia_dependencies
+
     not_error = check_main_evennia_dependencies()
 
     errstring = ""
     # South is no longer used ...
-    if 'south' in settings.INSTALLED_APPS:
-        errstring += "\n ERROR: 'south' found in settings.INSTALLED_APPS. " \
-                     "\n   South is no longer used. If this was added manually, remove it."
+    if "south" in settings.INSTALLED_APPS:
+        errstring += (
+            "\n ERROR: 'south' found in settings.INSTALLED_APPS. "
+            "\n   South is no longer used. If this was added manually, remove it."
+        )
         not_error = False
     # IRC support
     if settings.IRC_ENABLED:
         try:
             import twisted.words
+
             twisted.words  # set to avoid debug info about not-used import
         except ImportError:
-            errstring += "\n ERROR: IRC is enabled, but twisted.words is not installed. Please install it." \
-                         "\n   Linux Debian/Ubuntu users should install package 'python-twisted-words', others" \
-                         "\n   can get it from http://twistedmatrix.com/trac/wiki/TwistedWords."
+            errstring += (
+                "\n ERROR: IRC is enabled, but twisted.words is not installed. Please install it."
+                "\n   Linux Debian/Ubuntu users should install package 'python-twisted-words', others"
+                "\n   can get it from http://twistedmatrix.com/trac/wiki/TwistedWords."
+            )
             not_error = False
     errstring = errstring.strip()
     if errstring:
         mlen = max(len(line) for line in errstring.split("\n"))
-        logger.log_err("%s\n%s\n%s" % ("-" * mlen, errstring, '-' * mlen))
+        logger.log_err("%s\n%s\n%s" % ("-" * mlen, errstring, "-" * mlen))
     return not_error
 
 
@@ -1205,14 +1212,41 @@ def has_parent(basepath, obj):
 
     """
     try:
-        return any(cls for cls in obj.__class__.mro()
-                   if basepath == "%s.%s" % (cls.__module__, cls.__name__))
+        return any(
+            cls
+            for cls in obj.__class__.mro()
+            if basepath == "%s.%s" % (cls.__module__, cls.__name__)
+        )
     except (TypeError, AttributeError):
         # this can occur if we tried to store a class object, not an
         # instance. Not sure if one should defend against this.
         return False
 
 
+def mod_import_from_path(path):
+    """
+    Load a Python module at the specified path.
+
+    Args:
+        path (str): An absolute path to a Python module to load.
+
+    Returns:
+        (module or None): An imported module if the path was a valid
+        Python module. Returns `None` if the import failed.
+
+    """
+    if not os.path.isabs(path):
+        path = os.path.abspath(path)
+    dirpath, filename = path.rsplit(os.path.sep, 1)
+    modname = filename.rstrip(".py")
+
+    try:
+        return importlib.machinery.SourceFileLoader(modname, path).load_module()
+    except OSError:
+        logger.log_trace(f"Could not find module '{modname}' ({modname}.py) at path '{dirpath}'")
+        return None
+
+
 def mod_import(module):
     """
     A generic Python module loader.
@@ -1220,52 +1254,28 @@ def mod_import(module):
     Args:
         module (str, module): This can be either a Python path
             (dot-notation like `evennia.objects.models`), an absolute path
-            (e.g. `/home/eve/evennia/evennia/objects.models.py`) or an
+            (e.g. `/home/eve/evennia/evennia/objects/models.py`) or an
             already imported module object (e.g. `models`)
     Returns:
-        module (module or None): An imported module. If the input argument was
+        (module or None): An imported module. If the input argument was
         already a module, this is returned as-is, otherwise the path is
         parsed and imported. Returns `None` and logs error if import failed.
 
     """
-
     if not module:
         return None
 
     if isinstance(module, types.ModuleType):
         # if this is already a module, we are done
-        mod = module
-    else:
-        # first try to import as a python path
-        try:
-            mod = __import__(module, fromlist=["None"])
-        except ImportError as ex:
-            # check just where the ImportError happened (it could have been
-            # an erroneous import inside the module as well). This is the
-            # trivial way to do it ...
-            if not str(ex).startswith("No module named "):
-                raise
-
-            # error in this module. Try absolute path import instead
+        return module
 
-            if not os.path.isabs(module):
-                module = os.path.abspath(module)
-            path, filename = module.rsplit(os.path.sep, 1)
-            modname = re.sub(r"\.py$", "", filename)
+    if module.endswith(".py") and os.path.exists(module):
+        return mod_import_from_path(module)
 
-            try:
-                result = imp.find_module(modname, [path])
-            except ImportError:
-                logger.log_trace("Could not find module '%s' (%s.py) at path '%s'" % (modname, modname, path))
-                return None
-            try:
-                mod = imp.load_module(modname, *result)
-            except ImportError:
-                logger.log_trace("Could not find or import module %s at path '%s'" % (modname, path))
-                mod = None
-            # we have to close the file handle manually
-            result[0].close()
-    return mod
+    try:
+        return importlib.import_module(module)
+    except ImportError:
+        return None
 
 
 def all_from_module(module):
@@ -1353,8 +1363,9 @@ def variable_from_module(module, variable=None, default=None):
                 result.append(mod.__dict__.get(var, default))
     else:
         # get all
-        result = [val for key, val in mod.__dict__.items()
-                  if not (key.startswith("_") or ismodule(val))]
+        result = [
+            val for key, val in mod.__dict__.items() if not (key.startswith("_") or ismodule(val))
+        ]
 
     if len(result) == 1:
         return result[0]
@@ -1425,7 +1436,7 @@ def fuzzy_import_from_module(path, variable, default=None, defaultpaths=None):
     paths = [path] + make_iter(defaultpaths)
     for modpath in paths:
         try:
-            mod = import_module(modpath)
+            mod = importlib.import_module(modpath)
         except ImportError as ex:
             if not str(ex).startswith("No module named %s" % modpath):
                 # this means the module was found but it
@@ -1453,8 +1464,13 @@ class (Class): An uninstatiated class recovered from path.
 
     """
     cls = None
+    err = ""
     if defaultpaths:
-        paths = [path] + ["%s.%s" % (dpath, path) for dpath in make_iter(defaultpaths)] if defaultpaths else []
+        paths = (
+            [path] + ["%s.%s" % (dpath, path) for dpath in make_iter(defaultpaths)]
+            if defaultpaths
+            else []
+        )
     else:
         paths = [path]
 
@@ -1465,14 +1481,15 @@ class (Class): An uninstatiated class recovered from path.
             raise ImportError("the path '%s' is not on the form modulepath.Classname." % path)
 
         try:
-            if not find_spec(testpath, package='evennia'):
+            if not importlib.util.find_spec(testpath, package="evennia"):
                 continue
         except ModuleNotFoundError:
             continue
 
         try:
-            mod = import_module(testpath, package='evennia')
+            mod = importlib.import_module(testpath, package="evennia")
         except ModuleNotFoundError:
+            err = traceback.format_exc(30)
             break
 
         try:
@@ -1481,10 +1498,12 @@ class (Class): An uninstatiated class recovered from path.
         except AttributeError:
             if len(trace()) > 2:
                 # AttributeError within the module, don't hide it
-                exc = sys.exc_info()
-                raise_(exc[1], None, exc[2])
+                err = traceback.format_exc(30)
+                break
     if not cls:
-        err = "Could not load typeclass '%s'" % path
+        err = "\nCould not load typeclass '{}'{}".format(
+            path, " with the following traceback:\n" + err if err else ""
+        )
         if defaultpaths:
             err += "\nPaths searched:\n    %s" % "\n    ".join(paths)
         else:
@@ -1502,6 +1521,7 @@ def init_new_account(account):
     Deprecated.
     """
     from evennia.utils import logger
+
     logger.log_dep("evennia.utils.utils.init_new_account is DEPRECATED and should not be used.")
 
 
@@ -1526,8 +1546,9 @@ def string_similarity(string1, string2):
     vec1 = [string1.count(v) for v in vocabulary]
     vec2 = [string2.count(v) for v in vocabulary]
     try:
-        return float(sum(vec1[i] * vec2[i] for i in range(len(vocabulary)))) / \
-            (math.sqrt(sum(v1**2 for v1 in vec1)) * math.sqrt(sum(v2**2 for v2 in vec2)))
+        return float(sum(vec1[i] * vec2[i] for i in range(len(vocabulary)))) / (
+            math.sqrt(sum(v1 ** 2 for v1 in vec1)) * math.sqrt(sum(v2 ** 2 for v2 in vec2))
+        )
     except ZeroDivisionError:
         # can happen if empty-string cmdnames appear for some reason.
         # This is a no-match.
@@ -1552,10 +1573,15 @@ def string_suggestions(string, vocabulary, cutoff=0.6, maxnum=3):
             Could be empty if there are no matches.
 
     """
-    return [tup[1] for tup in sorted([(string_similarity(string, sugg), sugg)
-                                      for sugg in vocabulary],
-                                     key=lambda tup: tup[0], reverse=True)
-            if tup[0] >= cutoff][:maxnum]
+    return [
+        tup[1]
+        for tup in sorted(
+            [(string_similarity(string, sugg), sugg) for sugg in vocabulary],
+            key=lambda tup: tup[0],
+            reverse=True,
+        )
+        if tup[0] >= cutoff
+    ][:maxnum]
 
 
 def string_partial_matching(alternatives, inp, ret_index=True):
@@ -1589,9 +1615,11 @@ def string_partial_matching(alternatives, inp, ret_index=True):
         for inp_word in inp_words:
             # loop over parts, making sure only to visit each part once
             # (this will invalidate input in the wrong word order)
-            submatch = [last_index + alt_num for alt_num, alt_word
-                        in enumerate(alt_words[last_index:])
-                        if alt_word.startswith(inp_word)]
+            submatch = [
+                last_index + alt_num
+                for alt_num, alt_word in enumerate(alt_words[last_index:])
+                if alt_word.startswith(inp_word)
+            ]
             if submatch:
                 last_index = min(submatch) + 1
                 score += 1
@@ -1650,8 +1678,12 @@ def format_table(table, extra_space=1):
     max_widths = [max([len(str(val)) for val in col]) for col in table]
     ftable = []
     for irow in range(len(table[0])):
-        ftable.append([str(col[irow]).ljust(max_widths[icol]) + " " * extra_space
-                       for icol, col in enumerate(table)])
+        ftable.append(
+            [
+                str(col[irow]).ljust(max_widths[icol]) + " " * extra_space
+                for icol, col in enumerate(table)
+            ]
+        )
     return ftable
 
 
@@ -1674,24 +1706,20 @@ def get_evennia_pids():
         is_subprocess = self_pid not in (server_pid, portal_pid)
         ```
     """
-    server_pidfile = os.path.join(settings.GAME_DIR, 'server.pid')
-    portal_pidfile = os.path.join(settings.GAME_DIR, 'portal.pid')
+    server_pidfile = os.path.join(settings.GAME_DIR, "server.pid")
+    portal_pidfile = os.path.join(settings.GAME_DIR, "portal.pid")
     server_pid, portal_pid = None, None
     if os.path.exists(server_pidfile):
-        with open(server_pidfile, 'r') as f:
+        with open(server_pidfile, "r") as f:
             server_pid = f.read()
     if os.path.exists(portal_pidfile):
-        with open(portal_pidfile, 'r') as f:
+        with open(portal_pidfile, "r") as f:
             portal_pid = f.read()
     if server_pid and portal_pid:
         return int(server_pid), int(portal_pid)
     return None, None
 
 
-from gc import get_referents
-from sys import getsizeof
-
-
 def deepsize(obj, max_depth=4):
     """
     Get not only size of the given object, but also the size of
@@ -1714,17 +1742,19 @@ def deepsize(obj, max_depth=4):
         and their handlers.
 
     """
+
     def _recurse(o, dct, depth):
         if 0 <= max_depth < depth:
             return
-        for ref in get_referents(o):
+        for ref in gc.get_referents(o):
             idr = id(ref)
             if idr not in dct:
-                dct[idr] = (ref, getsizeof(ref, default=0))
+                dct[idr] = (ref, sys.getsizeof(ref, default=0))
                 _recurse(ref, dct, depth + 1)
+
     sizedict = {}
     _recurse(obj, sizedict, 0)
-    size = getsizeof(obj) + sum([p[1] for p in sizedict.values()])
+    size = sys.getsizeof(obj) + sum([p[1] for p in sizedict.values()])
     return size
 
 
@@ -1771,7 +1801,9 @@ def __get__(self, obj, type=None):
 
 
 _STRIP_ANSI = None
-_RE_CONTROL_CHAR = re.compile('[%s]' % re.escape(''.join([chr(c) for c in range(0, 32)])))  # + range(127,160)])))
+_RE_CONTROL_CHAR = re.compile(
+    "[%s]" % re.escape("".join([chr(c) for c in range(0, 32)]))
+)  # + range(127,160)])))
 
 
 def strip_control_sequences(string):
@@ -1788,7 +1820,7 @@ def strip_control_sequences(string):
     global _STRIP_ANSI
     if not _STRIP_ANSI:
         from evennia.utils.ansi import strip_raw_ansi as _STRIP_ANSI
-    return _RE_CONTROL_CHAR.sub('', _STRIP_ANSI(string))
+    return _RE_CONTROL_CHAR.sub("", _STRIP_ANSI(string))
 
 
 def calledby(callerdepth=1):
@@ -1806,6 +1838,7 @@ def calledby(callerdepth=1):
 
     """
     import inspect
+
     stack = inspect.stack()
     # we must step one extra level back in stack since we don't want
     # to include the call of this function itself.
@@ -1830,10 +1863,12 @@ def m_len(target):
     """
     # Would create circular import if in module root.
     from evennia.utils.ansi import ANSI_PARSER
+
     if inherits_from(target, str) and "|lt" in target:
         return len(ANSI_PARSER.strip_mxp(target))
     return len(target)
 
+
 # -------------------------------------------------------------------
 # Search handler function
 # -------------------------------------------------------------------
@@ -1888,9 +1923,12 @@ def at_search_result(matches, caller, query="", quiet=False, **kwargs):
             aliases = result.aliases.all() if hasattr(result.aliases, "all") else result.aliases
             error += _MULTIMATCH_TEMPLATE.format(
                 number=num + 1,
-                name=result.get_display_name(caller) if hasattr(result, "get_display_name") else query,
+                name=result.get_display_name(caller)
+                if hasattr(result, "get_display_name")
+                else query,
                 aliases=" [%s]" % ";".join(aliases) if aliases else "",
-                info=result.get_extra_info(caller))
+                info=result.get_extra_info(caller),
+            )
         matches = None
     else:
         # exactly one match
@@ -1929,9 +1967,13 @@ def __init__(self, *args, **kwargs):
     def __eq__(self, other):
         ret = super().__eq__(other)
         if ret:
-            return (ret and
-                    hasattr(other, 'size_limit') and self.size_limit == other.size_limit and
-                    hasattr(other, 'fifo') and self.fifo == other.fifo)
+            return (
+                ret
+                and hasattr(other, "size_limit")
+                and self.size_limit == other.size_limit
+                and hasattr(other, "fifo")
+                and self.fifo == other.fifo
+            )
         return False
 
     def __ne__(self, other):
@@ -1990,11 +2032,18 @@ def get_all_typeclasses(parent=None):
 
     """
     from evennia.typeclasses.models import TypedObject
-    typeclasses = {"{}.{}".format(model.__module__, model.__name__): model
-                   for model in apps.get_models() if TypedObject in getmro(model)}
+
+    typeclasses = {
+        "{}.{}".format(model.__module__, model.__name__): model
+        for model in apps.get_models()
+        if TypedObject in getmro(model)
+    }
     if parent:
-        typeclasses = {name: typeclass for name, typeclass in typeclasses.items()
-                       if inherits_from(typeclass, parent)}
+        typeclasses = {
+            name: typeclass
+            for name, typeclass in typeclasses.items()
+            if inherits_from(typeclass, parent)
+        }
     return typeclasses
 
 
@@ -2023,6 +2072,7 @@ def myfunc(caller):
 
     """
     from evennia.utils.evmenu import get_input
+
     def _process_input(caller, prompt, result, generator):
         deferLater(reactor, 0, _iterate, generator, caller, response=result)
         return False
@@ -2040,8 +2090,10 @@ def _iterate(generator, caller=None, response=None):
                 delay(value, _iterate, generator, caller=caller)
             elif isinstance(value, str):
                 if not caller:
-                    raise ValueError("To retrieve input from a @pausable method, that method "
-                                     "must be called with a 'caller' argument)")
+                    raise ValueError(
+                        "To retrieve input from a @pausable method, that method "
+                        "must be called with a 'caller' argument)"
+                    )
                 get_input(caller, value, _process_input, generator=generator)
             else:
                 raise ValueError("yield(val) in a @pausable method must have an int/float as arg.")
@@ -2049,9 +2101,9 @@ def _iterate(generator, caller=None, response=None):
     def decorator(*args, **kwargs):
         argnames = inspect.getfullargspec(func).args
         caller = None
-        if 'caller' in argnames:
+        if "caller" in argnames:
             # we assume this is an object
-            caller = args[argnames.index('caller')]
+            caller = args[argnames.index("caller")]
 
         ret = func(*args, **kwargs)
         if isinstance(ret, types.GeneratorType):
diff --git a/evennia/utils/validatorfuncs.py b/evennia/utils/validatorfuncs.py
index 0e1307206ba..623680b1761 100644
--- a/evennia/utils/validatorfuncs.py
+++ b/evennia/utils/validatorfuncs.py
@@ -19,26 +19,26 @@
 _TZ_DICT = {str(tz): _pytz.timezone(tz) for tz in _pytz.common_timezones}
 
 
-def text(entry, option_key='Text', **kwargs):
+def text(entry, option_key="Text", **kwargs):
     try:
         return str(entry)
     except Exception as err:
         raise ValueError(f"Input could not be converted to text ({err})")
 
 
-def color(entry, option_key='Color', **kwargs):
+def color(entry, option_key="Color", **kwargs):
     """
     The color should be just a color character, so 'r' if red color is desired.
     """
     if not entry:
         raise ValueError(f"Nothing entered for a {option_key}!")
-    test_str = strip_ansi(f'|{entry}|n')
+    test_str = strip_ansi(f"|{entry}|n")
     if test_str:
         raise ValueError(f"'{entry}' is not a valid {option_key}.")
     return entry
 
 
-def datetime(entry, option_key='Datetime', account=None, from_tz=None, **kwargs):
+def datetime(entry, option_key="Datetime", account=None, from_tz=None, **kwargs):
     """
     Process a datetime string in standard forms while accounting for the inputter's timezone.
 
@@ -60,23 +60,27 @@ def datetime(entry, option_key='Datetime', account=None, from_tz=None, **kwargs)
         from_tz = _pytz.UTC
     utc = _pytz.UTC
     now = _dt.datetime.utcnow().replace(tzinfo=utc)
-    cur_year = now.strftime('%Y')
-    split_time = entry.split(' ')
+    cur_year = now.strftime("%Y")
+    split_time = entry.split(" ")
     if len(split_time) == 3:
         entry = f"{split_time[0]} {split_time[1]} {split_time[2]} {cur_year}"
     elif len(split_time) == 4:
         entry = f"{split_time[0]} {split_time[1]} {split_time[2]} {split_time[3]}"
     else:
-        raise ValueError(f"{option_key} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%H')}")
+        raise ValueError(
+            f"{option_key} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%M')}"
+        )
     try:
-        local = _dt.datetime.strptime(input, '%b %d %H:%M %Y')
+        local = _dt.datetime.strptime(entry, "%b %d %H:%M %Y")
     except ValueError:
-        raise ValueError(f"{option_key} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%H')}")
+        raise ValueError(
+            f"{option_key} must be entered in a 24-hour format such as: {now.strftime('%b %d %H:%M')}"
+        )
     local_tz = from_tz.localize(local)
     return local_tz.astimezone(utc)
 
 
-def duration(entry, option_key='Duration', **kwargs):
+def duration(entry, option_key="Duration", **kwargs):
     """
     Take a string and derive a datetime timedelta from it.
 
@@ -89,7 +93,7 @@ def duration(entry, option_key='Duration', **kwargs):
         timedelta
 
     """
-    time_string = entry.split(" ")
+    time_string = entry.lower().split(" ")
     seconds = 0
     minutes = 0
     hours = 0
@@ -97,18 +101,18 @@ def duration(entry, option_key='Duration', **kwargs):
     weeks = 0
 
     for interval in time_string:
-        if _re.match(r'^[\d]+s$', interval.lower()):
-            seconds =+ int(interval.lower().rstrip("s"))
-        elif _re.match(r'^[\d]+m$', interval):
-            minutes =+ int(interval.lower().rstrip("m"))
-        elif _re.match(r'^[\d]+h$', interval):
-            hours =+ int(interval.lower().rstrip("h"))
-        elif _re.match(r'^[\d]+d$', interval):
-            days =+ int(interval.lower().rstrip("d"))
-        elif _re.match(r'^[\d]+w$', interval):
-            weeks =+ int(interval.lower().rstrip("w"))
-        elif _re.match(r'^[\d]+y$', interval):
-            days =+ int(interval.lower().rstrip("y")) * 365
+        if _re.match(r"^[\d]+s$", interval):
+            seconds += int(interval.rstrip("s"))
+        elif _re.match(r"^[\d]+m$", interval):
+            minutes += int(interval.rstrip("m"))
+        elif _re.match(r"^[\d]+h$", interval):
+            hours += int(interval.rstrip("h"))
+        elif _re.match(r"^[\d]+d$", interval):
+            days += int(interval.rstrip("d"))
+        elif _re.match(r"^[\d]+w$", interval):
+            weeks += int(interval.rstrip("w"))
+        elif _re.match(r"^[\d]+y$", interval):
+            days += int(interval.rstrip("y")) * 365
         else:
             raise ValueError(f"Could not convert section '{interval}' to a {option_key}.")
 
@@ -116,8 +120,8 @@ def duration(entry, option_key='Duration', **kwargs):
 
 
 def future(entry, option_key="Future Datetime", from_tz=None, **kwargs):
-    time = datetime(entry, option_key)
-    if time < _dt.datetime.utcnow():
+    time = datetime(entry, option_key, from_tz=from_tz)
+    if time < _dt.datetime.utcnow().replace(tzinfo=_dt.timezone.utc):
         raise ValueError(f"That {option_key} is in the past! Must give a Future datetime!")
     return time
 
@@ -156,13 +160,13 @@ def boolean(entry, option_key="True/False", **kwargs):
     Returns:
         Boolean
     """
-    entry = entry.upper()
     error = f"Must enter 0 (false) or 1 (true) for {option_key}. Also accepts True, False, On, Off, Yes, No, Enabled, and Disabled"
-    if not entry:
+    if not isinstance(entry, str):
         raise ValueError(error)
-    if entry in ('1', 'TRUE', 'ON', 'ENABLED', 'ENABLE', 'YES'):
+    entry = entry.upper()
+    if entry in ("1", "TRUE", "ON", "ENABLED", "ENABLE", "YES"):
         return True
-    if entry in ('0', 'FALSE', 'OFF', 'DISABLED', 'DISABLE', 'NO'):
+    if entry in ("0", "FALSE", "OFF", "DISABLED", "DISABLE", "NO"):
         return False
     raise ValueError(error)
 
@@ -182,7 +186,9 @@ def timezone(entry, option_key="Timezone", **kwargs):
         raise ValueError(f"No {option_key} entered!")
     found = _partial(list(_TZ_DICT.keys()), entry, ret_index=False)
     if len(found) > 1:
-        raise ValueError(f"That matched: {', '.join(str(t) for t in found)}. Please be more specific!")
+        raise ValueError(
+            f"That matched: {', '.join(str(t) for t in found)}. Please be more specific!"
+        )
     if found:
         return _TZ_DICT[found[0]]
     raise ValueError(f"Could not find timezone '{entry}' for {option_key}!")
@@ -192,18 +198,18 @@ def email(entry, option_key="Email Address", **kwargs):
     if not entry:
         raise ValueError("Email address field empty!")
     try:
-        _val_email(entry)  # offloading the hard work to Django!
+        _val_email(str(entry))  # offloading the hard work to Django!
     except _error:
         raise ValueError(f"That isn't a valid {option_key}!")
     return entry
 
 
-def lock(entry, option_key='locks', access_options=None, **kwargs):
+def lock(entry, option_key="locks", access_options=None, **kwargs):
     entry = entry.strip()
     if not entry:
         raise ValueError(f"No {option_key} entered to set!")
-    for locksetting in entry.split(';'):
-        access_type, lockfunc = locksetting.split(':', 1)
+    for locksetting in entry.split(";"):
+        access_type, lockfunc = locksetting.split(":", 1)
         if not access_type:
             raise ValueError("Must enter an access type!")
         if access_options:
diff --git a/evennia/web/urls.py b/evennia/web/urls.py
index 87d0e2cd156..6d9e28f6df1 100644
--- a/evennia/web/urls.py
+++ b/evennia/web/urls.py
@@ -14,11 +14,9 @@
 urlpatterns = [
     # Front page (note that we shouldn't specify namespace here since we will
     # not be able to load django-auth/admin stuff (will probably work in Django>1.9)
-    url(r'^', include('evennia.web.website.urls')),  # , namespace='website', app_name='website')),
-
+    url(r"^", include("evennia.web.website.urls")),  # , namespace='website', app_name='website')),
     # webclient
-    url(r'^webclient/', include('evennia.web.webclient.urls', namespace='webclient')),
-
+    url(r"^webclient/", include("evennia.web.webclient.urls", namespace="webclient")),
     # favicon
-    url(r'^favicon\.ico$', RedirectView.as_view(url='/media/images/favicon.ico', permanent=False))
+    url(r"^favicon\.ico$", RedirectView.as_view(url="/media/images/favicon.ico", permanent=False)),
 ]
diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py
index 475cabfb105..b1296c06fe4 100644
--- a/evennia/web/utils/general_context.py
+++ b/evennia/web/utils/general_context.py
@@ -29,17 +29,18 @@ def set_game_name_and_slogan():
         GAME_SLOGAN = settings.GAME_SLOGAN.strip()
     except AttributeError:
         GAME_SLOGAN = SERVER_VERSION
+
+
 set_game_name_and_slogan()
 
 # Setup lists of the most relevant apps so
 # the adminsite becomes more readable.
 
-ACCOUNT_RELATED = ['Accounts']
-GAME_ENTITIES = ['Objects', 'Scripts', 'Comms', 'Help']
-GAME_SETUP = ['Permissions', 'Config']
-CONNECTIONS = ['Irc']
-WEBSITE = ['Flatpages', 'News', 'Sites']
-
+ACCOUNT_RELATED = ["Accounts"]
+GAME_ENTITIES = ["Objects", "Scripts", "Comms", "Help"]
+GAME_SETUP = ["Permissions", "Config"]
+CONNECTIONS = ["Irc"]
+WEBSITE = ["Flatpages", "News", "Sites"]
 
 
 def set_webclient_settings():
@@ -56,9 +57,13 @@ def set_webclient_settings():
     # if we are working through a proxy or uses docker port-remapping, the webclient port encoded
     # in the webclient should be different than the one the server expects. Use the environment
     # variable WEBSOCKET_CLIENT_PROXY_PORT if this is the case.
-    WEBSOCKET_PORT = int(os.environ.get("WEBSOCKET_CLIENT_PROXY_PORT", settings.WEBSOCKET_CLIENT_PORT))
+    WEBSOCKET_PORT = int(
+        os.environ.get("WEBSOCKET_CLIENT_PROXY_PORT", settings.WEBSOCKET_CLIENT_PORT)
+    )
     # this is determined dynamically by the client and is less of an issue
     WEBSOCKET_URL = settings.WEBSOCKET_CLIENT_URL
+
+
 set_webclient_settings()
 
 # The main context processor function
@@ -72,22 +77,22 @@ def general_context(request):
         account = request.user
 
     puppet = None
-    if account and request.session.get('puppet'):
-        pk = int(request.session.get('puppet'))
+    if account and request.session.get("puppet"):
+        pk = int(request.session.get("puppet"))
         puppet = next((x for x in account.characters if x.pk == pk), None)
 
     return {
-        'account': account,
-        'puppet': puppet,
-        'game_name': GAME_NAME,
-        'game_slogan': GAME_SLOGAN,
-        'evennia_userapps': ACCOUNT_RELATED,
-        'evennia_entityapps': GAME_ENTITIES,
-        'evennia_setupapps': GAME_SETUP,
-        'evennia_connectapps': CONNECTIONS,
-        'evennia_websiteapps': WEBSITE,
+        "account": account,
+        "puppet": puppet,
+        "game_name": GAME_NAME,
+        "game_slogan": GAME_SLOGAN,
+        "evennia_userapps": ACCOUNT_RELATED,
+        "evennia_entityapps": GAME_ENTITIES,
+        "evennia_setupapps": GAME_SETUP,
+        "evennia_connectapps": CONNECTIONS,
+        "evennia_websiteapps": WEBSITE,
         "webclient_enabled": WEBCLIENT_ENABLED,
         "websocket_enabled": WEBSOCKET_CLIENT_ENABLED,
         "websocket_port": WEBSOCKET_PORT,
-        "websocket_url": WEBSOCKET_URL
+        "websocket_url": WEBSOCKET_URL,
     }
diff --git a/evennia/web/utils/middleware.py b/evennia/web/utils/middleware.py
index b22cd9fa1b2..d9e58256fed 100644
--- a/evennia/web/utils/middleware.py
+++ b/evennia/web/utils/middleware.py
@@ -8,6 +8,7 @@ class SharedLoginMiddleware(object):
     Handle the shared login between website and webclient.
 
     """
+
     def __init__(self, get_response):
         # One-time configuration and initialization.
         self.get_response = get_response
diff --git a/evennia/web/utils/tests.py b/evennia/web/utils/tests.py
index 093b858f4dd..7a3194da17b 100644
--- a/evennia/web/utils/tests.py
+++ b/evennia/web/utils/tests.py
@@ -3,44 +3,48 @@
 from mock import MagicMock, patch
 from . import general_context
 
+
 class TestGeneralContext(TestCase):
     maxDiff = None
 
-    @patch('evennia.web.utils.general_context.GAME_NAME', "test_name")
-    @patch('evennia.web.utils.general_context.GAME_SLOGAN', "test_game_slogan")
-    @patch('evennia.web.utils.general_context.WEBSOCKET_CLIENT_ENABLED', "websocket_client_enabled_testvalue")
-    @patch('evennia.web.utils.general_context.WEBCLIENT_ENABLED', "webclient_enabled_testvalue")
-    @patch('evennia.web.utils.general_context.WEBSOCKET_PORT', "websocket_client_port_testvalue")
-    @patch('evennia.web.utils.general_context.WEBSOCKET_URL', "websocket_client_url_testvalue")
+    @patch("evennia.web.utils.general_context.GAME_NAME", "test_name")
+    @patch("evennia.web.utils.general_context.GAME_SLOGAN", "test_game_slogan")
+    @patch(
+        "evennia.web.utils.general_context.WEBSOCKET_CLIENT_ENABLED",
+        "websocket_client_enabled_testvalue",
+    )
+    @patch("evennia.web.utils.general_context.WEBCLIENT_ENABLED", "webclient_enabled_testvalue")
+    @patch("evennia.web.utils.general_context.WEBSOCKET_PORT", "websocket_client_port_testvalue")
+    @patch("evennia.web.utils.general_context.WEBSOCKET_URL", "websocket_client_url_testvalue")
     def test_general_context(self):
-        request = RequestFactory().get('/')
+        request = RequestFactory().get("/")
         request.user = AnonymousUser()
-        request.session = {
-            'account': None,
-            'puppet': None,
-        }
-        
+        request.session = {"account": None, "puppet": None}
+
         response = general_context.general_context(request)
-        
-        self.assertEqual(response, {
-            'account': None,
-            'puppet': None,
-            'game_name': "test_name",
-            'game_slogan': "test_game_slogan",
-            'evennia_userapps': ['Accounts'],
-            'evennia_entityapps': ['Objects', 'Scripts', 'Comms', 'Help'],
-            'evennia_setupapps': ['Permissions', 'Config'],
-            'evennia_connectapps': ['Irc'],
-            'evennia_websiteapps': ['Flatpages', 'News', 'Sites'],
-            "webclient_enabled": "webclient_enabled_testvalue",
-            "websocket_enabled": "websocket_client_enabled_testvalue",
-            "websocket_port": "websocket_client_port_testvalue",
-            "websocket_url": "websocket_client_url_testvalue"
-        })
+
+        self.assertEqual(
+            response,
+            {
+                "account": None,
+                "puppet": None,
+                "game_name": "test_name",
+                "game_slogan": "test_game_slogan",
+                "evennia_userapps": ["Accounts"],
+                "evennia_entityapps": ["Objects", "Scripts", "Comms", "Help"],
+                "evennia_setupapps": ["Permissions", "Config"],
+                "evennia_connectapps": ["Irc"],
+                "evennia_websiteapps": ["Flatpages", "News", "Sites"],
+                "webclient_enabled": "webclient_enabled_testvalue",
+                "websocket_enabled": "websocket_client_enabled_testvalue",
+                "websocket_port": "websocket_client_port_testvalue",
+                "websocket_url": "websocket_client_url_testvalue",
+            },
+        )
 
     # spec being an empty list will initially raise AttributeError in set_game_name_and_slogan to test defaults
-    @patch('evennia.web.utils.general_context.settings', spec=[])
-    @patch('evennia.web.utils.general_context.get_evennia_version')
+    @patch("evennia.web.utils.general_context.settings", spec=[])
+    @patch("evennia.web.utils.general_context.get_evennia_version")
     def test_set_game_name_and_slogan(self, mock_get_version, mock_settings):
         mock_get_version.return_value = "version 1"
         # test default/fallback values
@@ -54,7 +58,7 @@ def test_set_game_name_and_slogan(self, mock_get_version, mock_settings):
         self.assertEqual(general_context.GAME_NAME, "test_name")
         self.assertEqual(general_context.GAME_SLOGAN, "test_game_slogan")
 
-    @patch('evennia.web.utils.general_context.settings')
+    @patch("evennia.web.utils.general_context.settings")
     def test_set_webclient_settings(self, mock_settings):
         mock_settings.WEBCLIENT_ENABLED = "webclient"
         mock_settings.WEBSOCKET_CLIENT_URL = "websocket_url"
diff --git a/evennia/web/webclient/static/webclient/css/goldenlayout.css b/evennia/web/webclient/static/webclient/css/goldenlayout.css
index 8096f8a89b8..4c0e77d254f 100644
--- a/evennia/web/webclient/static/webclient/css/goldenlayout.css
+++ b/evennia/web/webclient/static/webclient/css/goldenlayout.css
@@ -116,11 +116,16 @@ label {
     height: 100%;
 }
 
+.inputfieldwrapper {
+    width: 100%;
+    height: 100%;
+}
+
 .inputsend {
     position: absolute;
     right: 0;
     z-index: 1;
-    height: inherit;
+    height: 100%;
     width: 30px;
     color: white;
     background-color: black;
@@ -128,9 +133,7 @@ label {
 }
 
 .inputfield {
-    position: absolute;
-    top: 0;
-    height: inherit;
+    height: 100%;
     width: calc(100% - 30px);
     background-color: black;
     color: white;
diff --git a/evennia/web/webclient/static/webclient/css/webclient.css b/evennia/web/webclient/static/webclient/css/webclient.css
index 00281d82d48..312f321595f 100644
--- a/evennia/web/webclient/static/webclient/css/webclient.css
+++ b/evennia/web/webclient/static/webclient/css/webclient.css
@@ -17,7 +17,7 @@ body {
     color: #ccc;
     font-size: .9em;
     font-family: 'DejaVu Sans Mono', Consolas, Inconsolata, 'Lucida Console', monospace;
-    line-height: 1.6em;
+    line-height: 1.4em;
     overflow: hidden;
 }
 @media screen and (max-width: 480px) {
@@ -47,7 +47,10 @@ div {margin:0px;}
 .inp { color: #555 }
 
 /* Messages returned from the server (most messages) */
-.out { color: #aaa }
+.out {
+  color: #aaa;
+  background-color: #000;
+}
 
 /* Error messages (red) */
 .err { color: #f00; }
@@ -327,6 +330,13 @@ div {margin:0px;}
     float: left;
 }
 
+
+/* MXP links */
+#mxplink {
+  text-decoration: underline;
+}
+
+
 /* XTERM256 colors */
 
 .color-000 { color: #000000; }
diff --git a/evennia/web/webclient/static/webclient/js/plugins/default_in.js b/evennia/web/webclient/static/webclient/js/plugins/default_in.js
index 56e6dc6c8aa..044e4e7ec8b 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/default_in.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/default_in.js
@@ -28,14 +28,24 @@ let defaultin_plugin = (function () {
             case 13: // Enter key
                 var outtext = inputfield.val() || ""; // Grab the text from which-ever inputfield is focused
                 if ( !event.shiftKey ) {  // Enter Key without shift --> send Mesg
-                    var lines = outtext.trim().replace(/[\r]+/,"\n").replace(/[\n]+/, "\n").split("\n");
+                    var lines = outtext.replace(/[\r]+/,"\n").replace(/[\n]+/, "\n").split("\n");
                     for (var i = 0; i < lines.length; i++) {
-                        plugin_handler.onSend( lines[i].trim() );
+                        plugin_handler.onSend( lines[i] );
                     }
                     inputfield.val(""); // Clear this inputfield
                     event.preventDefault();
-                }
-                inputfield.blur();
+
+                    // enter key by itself should toggle focus
+                    if( inputfield.length < 1 ) {
+                        inputfield = $(".inputfield:last");
+                        inputfield.focus();
+                        if( inputfield.length < 1 ) { // non-goldenlayout backwards compatibility
+                            $("#inputfield").focus();
+                        }
+                    } else {
+                        inputfield.blur();
+                    }
+                } // else allow building a multi-line input command
                 break;
 
             // Anything else, focus() a textarea if needed, and allow the default event
diff --git a/evennia/web/webclient/static/webclient/js/plugins/default_out.js b/evennia/web/webclient/static/webclient/js/plugins/default_out.js
index 01be2f9c625..ff6eb2f34b6 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/default_out.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/default_out.js
@@ -21,10 +21,19 @@ let defaultout_plugin = (function () {
     //
     // By default just show the prompt.
     var onPrompt = function (args, kwargs) {
-        // show prompt
-        $('#prompt')
-            .addClass("out")
-            .html(args[0]);
+        // show prompt on every input pane
+        var prompts = $('.prompt');
+
+        for( var x=0; x < prompts.length; x++ ) {
+            var prmpt = $( prompts[x] );
+            var sibling = prmpt.siblings().first();
+
+            prmpt.addClass("out")
+                .html(args[0])
+                .css({'height':'1.5em'});
+
+            sibling.css({'height':'calc(100% - 1.5em)'});
+        }
 
         return true;
     }
diff --git a/evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js b/evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js
index 917d075ed36..d1409ab3f7e 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/goldenlayout.js
@@ -476,6 +476,7 @@ let goldenlayout = (function () {
 
         myLayout = new GoldenLayout( window.goldenlayout_config, mainsub );
 
+        $("#prompt").remove();       // remove the HTML-defined prompt div
         $("#inputcontrol").remove(); // remove the cluttered, HTML-defined input divs
 
         // register our component and replace the default messagewindow with the Main component
@@ -486,11 +487,16 @@ let goldenlayout = (function () {
 
         // register our new input component
         myLayout.registerComponent( "input", function (container, componentState) {
-            var inputfield = $("<textarea type='text' class='inputfield form-control'></textarea>");
+            var promptfield = $("<div class='prompt'></div>");
+            var formcontrol = $("<textarea type='text' class='inputfield form-control'></textarea>");
             var button = $("<button type='button' class='inputsend'>&gt;</button>");
+ 
+            var inputfield = $("<div class='inputfieldwrapper'>")
+                                .append( button )
+                                .append( formcontrol );
 
             $("<div class='inputwrap'>")
-                .append( button )
+                .append( promptfield )
                 .append( inputfield )
                 .appendTo( container.getElement() );
 
diff --git a/evennia/web/webclient/static/webclient/js/plugins/goldenlayout_default_config.js b/evennia/web/webclient/static/webclient/js/plugins/goldenlayout_default_config.js
index 04cc5246b3e..1ef7a959f31 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/goldenlayout_default_config.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/goldenlayout_default_config.js
@@ -37,17 +37,17 @@ var goldenlayout_config = { // Global Variable used in goldenlayout.js init()
 //          id: "inputComponent", // mark 'ignore this component during output message processing'
 //          height: 6,
 //          isClosable: false,
+//      }, {
+//            type: "component",
+//            componentName: "input",
+//            id: "inputComponent", // mark for ignore
+//            height: 12,  // percentage
+//            tooltip: "Input - The last input in the layout is always the default.",
         }, {
             type: "component",
             componentName: "input",
             id: "inputComponent", // mark for ignore
-            height: 12,  // percentage
-            tooltip: "Input - The last input in the layout is always the default.",
-        }, {
-            type: "component",
-            componentName: "input",
-            id: "inputComponent", // mark for ignore
-            height: 12,  // percentage
+            height: 20,  // percentage
             isClosable: false, // remove the 'x' control to close this
             tooltip: "Input - The last input in the layout is always the default.",
         }]
diff --git a/evennia/web/webclient/static/webclient/js/plugins/history.js b/evennia/web/webclient/static/webclient/js/plugins/history.js
index b6130a235d0..2aa6f0991f4 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/history.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/history.js
@@ -63,6 +63,9 @@ let history = (function () {
             // Doing a history navigation; replace the text in the input and
             // move the cursor to the end of the new value
             var inputfield = $(".inputfield:focus");
+            if( inputfield.length < 1 ) { // focus the default (last), if nothing focused
+                inputfield = $(".inputfield:last");
+            }
             if( inputfield.length < 1 ) { // pre-goldenlayout backwards compatibility
                 inputfield = $("#inputfield");
             }
diff --git a/evennia/web/webclient/static/webclient/js/plugins/multimedia.js b/evennia/web/webclient/static/webclient/js/plugins/multimedia.js
new file mode 100644
index 00000000000..59cdc3a4c83
--- /dev/null
+++ b/evennia/web/webclient/static/webclient/js/plugins/multimedia.js
@@ -0,0 +1,53 @@
+/*
+ *
+ * Evennia Webclient multimedia outputs plugin
+ *
+ *     in evennia python code:
+ *
+ *         target.msg( image="URL" )
+ *         target.msg( audio="URL" )
+ *         target.msg( video="URL" )
+ *
+ */
+let multimedia_plugin = (function () {
+    //
+    var image = function (args, kwargs) {
+        var mwin = $("#messagewindow");
+        mwin.append("<img src='"+ args[0] +"'/>");
+        mwin.scrollTop(mwin[0].scrollHeight);
+    }
+
+    var audio = function (args, kwargs) {
+        // create an HTML5 audio control (only .mp3 is fully compatible with all major browsers)
+        var mwin = $("#messagewindow");
+        mwin.append("<audio controls='' autoplay='' style='height:17px;width:175px'>" +
+                    "<source src='"+ args[0] +"'/>" +
+                    "</audio>");
+        mwin.scrollTop(mwin[0].scrollHeight);
+    }
+
+    var video = function (args, kwargs) {
+        // create an HTML5 video element (only h264 .mp4 is compatible with all major browsers)
+        var mwin = $("#messagewindow");
+        mwin.append("<video controls='' autoplay=''>" +
+                    "<source src='"+ args[0] +"'/>" +
+                    "</video>");
+        mwin.scrollTop(mwin[0].scrollHeight);
+    }
+
+    //
+    // Mandatory plugin init function
+    var init = function () {
+        Evennia = window.Evennia;
+        Evennia.emitter.on('image', image); // capture "image" commands
+        Evennia.emitter.on('audio', audio); // capture "audio" commands
+        Evennia.emitter.on('video', video); // capture "video" commands
+        console.log('Multimedia plugin initialized');
+    }
+
+    return {
+        init: init,
+    }
+})();
+plugin_handler.add('multimedia_plugin', multimedia_plugin);
+
diff --git a/evennia/web/webclient/static/webclient/js/plugins/options.js b/evennia/web/webclient/static/webclient/js/plugins/options.js
index d3b6d131584..1a92e94e6d6 100644
--- a/evennia/web/webclient/static/webclient/js/plugins/options.js
+++ b/evennia/web/webclient/static/webclient/js/plugins/options.js
@@ -137,7 +137,7 @@ let options_plugin = (function () {
         // is helppopup set? and if so, does this Text have type 'help'?
         if ('helppopup' in options && options['helppopup'] ) {
             if (kwargs && ('type' in kwargs) && (kwargs['type'] == 'help') ) {
-                $('#helpdialogcontent').append('<div>'+ args + '</div>');
+                $('#helpdialogcontent').prepend('<div>'+ args + '</div>');
                 plugins['popups'].togglePopup("#helpdialog");
                 return true;
             }
diff --git a/evennia/web/webclient/templates/webclient/base.html b/evennia/web/webclient/templates/webclient/base.html
index fa16a152ee8..399389f15eb 100644
--- a/evennia/web/webclient/templates/webclient/base.html
+++ b/evennia/web/webclient/templates/webclient/base.html
@@ -93,6 +93,7 @@
 -->
         <script src={% static "webclient/js/plugins/default_in.js" %} language="javascript" type="text/javascript"></script>
         <script src={% static "webclient/js/plugins/default_out.js" %} language="javascript" type="text/javascript"></script>
+        <script src={% static "webclient/js/plugins/multimedia.js" %} language="javascript" type="text/javascript"></script>
     {% endblock %}
 
     <script src="https://cdn.rawgit.com/ejci/favico.js/master/favico-0.3.10.min.js" language="javascript" type="text/javascript" charset="utf-8"></script>
diff --git a/evennia/web/webclient/urls.py b/evennia/web/webclient/urls.py
index 3c278ee181f..cfb57ad2623 100644
--- a/evennia/web/webclient/urls.py
+++ b/evennia/web/webclient/urls.py
@@ -6,5 +6,4 @@
 from evennia.web.webclient import views as webclient_views
 
 app_name = "webclient"
-urlpatterns = [
-    url(r'^$', webclient_views.webclient, name="index")]
+urlpatterns = [url(r"^$", webclient_views.webclient, name="index")]
diff --git a/evennia/web/webclient/views.py b/evennia/web/webclient/views.py
index 3674e4b7790..9aba748ce53 100644
--- a/evennia/web/webclient/views.py
+++ b/evennia/web/webclient/views.py
@@ -1,4 +1,3 @@
-
 """
 This contains a simple view for rendering the webclient
 page and serve it eventual static content.
@@ -26,6 +25,6 @@ def webclient(request):
         raise Http404
 
     # make sure to store the browser session's hash so the webclient can get to it!
-    pagevars = {'browser_sessid': request.session.session_key}
+    pagevars = {"browser_sessid": request.session.session_key}
 
-    return render(request, 'webclient.html', pagevars)
+    return render(request, "webclient.html", pagevars)
diff --git a/evennia/web/website/forms.py b/evennia/web/website/forms.py
index dc6f69dd71c..8a1585459f9 100644
--- a/evennia/web/website/forms.py
+++ b/evennia/web/website/forms.py
@@ -5,6 +5,7 @@
 from django.utils.html import escape
 from evennia.utils import class_from_module
 
+
 class EvenniaForm(forms.Form):
     """
     This is a stock Django form, but modified so that all values provided
@@ -17,6 +18,7 @@ class EvenniaForm(forms.Form):
     https://www.owasp.org/index.php/Input_Validation_Cheat_Sheet#Goals_of_Input_Validation
 
     """
+
     def clean(self):
         """
         Django hook. Performed on form submission.
@@ -29,9 +31,10 @@ def clean(self):
         cleaned = super(EvenniaForm, self).clean()
 
         # Escape all values provided by user
-        cleaned = {k:escape(v) for k,v in cleaned.items()}
+        cleaned = {k: escape(v) for k, v in cleaned.items()}
         return cleaned
 
+
 class AccountForm(UserCreationForm):
     """
     This is a generic Django form tailored to the Account model.
@@ -40,12 +43,14 @@ class AccountForm(UserCreationForm):
     core User model fields (username, email, password).
 
     """
+
     class Meta:
         """
         This is a Django construct that provides additional configuration to
         the form.
 
         """
+
         # The model/typeclass this form creates
         model = class_from_module(settings.BASE_ACCOUNT_TYPECLASS)
 
@@ -53,11 +58,14 @@ class Meta:
         fields = ("username", "email")
 
         # Any overrides of field classes
-        field_classes = {'username': UsernameField}
+        field_classes = {"username": UsernameField}
 
     # Username is collected as part of the core UserCreationForm, so we just need
     # to add a field to (optionally) capture email.
-    email = forms.EmailField(help_text="A valid email address. Optional; used for password resets.", required=False)
+    email = forms.EmailField(
+        help_text="A valid email address. Optional; used for password resets.", required=False
+    )
+
 
 class ObjectForm(EvenniaForm, ModelForm):
     """
@@ -70,12 +78,14 @@ class ObjectForm(EvenniaForm, ModelForm):
     a simple example of how to do this.
 
     """
+
     class Meta:
         """
         This is a Django construct that provides additional configuration to
         the form.
 
         """
+
         # The model/typeclass this form creates
         model = class_from_module(settings.BASE_OBJECT_TYPECLASS)
 
@@ -83,9 +93,8 @@ class Meta:
         fields = ("db_key",)
 
         # This lets us rename ugly db-specific keys to something more human
-        labels = {
-            'db_key': 'Name',
-        }
+        labels = {"db_key": "Name"}
+
 
 class CharacterForm(ObjectForm):
     """
@@ -122,12 +131,14 @@ class CharacterForm(ObjectForm):
     https://docs.djangoproject.com/en/1.11/ref/forms/widgets/
 
     """
+
     class Meta:
         """
         This is a Django construct that provides additional configuration to
         the form.
 
         """
+
         # Get the correct object model
         model = class_from_module(settings.BASE_CHARACTER_TYPECLASS)
 
@@ -135,15 +146,16 @@ class Meta:
         fields = ("db_key",)
 
         # Rename 'key' to something more intelligible
-        labels = {
-            'db_key': 'Name',
-        }
+        labels = {"db_key": "Name"}
 
     # Fields pertaining to configurable attributes on the Character object.
     desc = forms.CharField(
-        label='Description', max_length=2048, required=False,
-        widget=forms.Textarea(attrs={'rows': 3}),
-        help_text="A brief description of your character.")
+        label="Description",
+        max_length=2048,
+        required=False,
+        widget=forms.Textarea(attrs={"rows": 3}),
+        help_text="A brief description of your character.",
+    )
 
 
 class CharacterUpdateForm(CharacterForm):
@@ -156,4 +168,5 @@ class CharacterUpdateForm(CharacterForm):
     wish to allow.
 
     """
+
     pass
diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html
index 888a63bf3f4..a947445167c 100644
--- a/evennia/web/website/templates/website/_menu.html
+++ b/evennia/web/website/templates/website/_menu.html
@@ -21,7 +21,7 @@
 
     <div class="collapse navbar-collapse" id="menu-content">
         <ul class="navbar-nav">
-            {% block nabvar_left %}
+            {% block navbar_left %}
             <li>
               <a class="nav-link" href="{% url 'index' %}">Home</a>
             </li>
diff --git a/evennia/web/website/templates/website/base.html b/evennia/web/website/templates/website/base.html
index d465a17171d..0f9a122de50 100644
--- a/evennia/web/website/templates/website/base.html
+++ b/evennia/web/website/templates/website/base.html
@@ -30,7 +30,7 @@
   </head>
   <body>
     {% block body %}
-    
+
     <div id="top"><a href="#main-content" class="sr-only sr-only-focusable">Skip to main content.</a></div>
     {% include "website/_menu.html" %}
     <div class="container main-content mt-4" id="main-copy">
@@ -43,10 +43,10 @@
         {% endif %}
         <div class="{% if sidebar %}col-8{% else %}col{% endif %}">
           {% include 'website/messages.html' %}
-          
+
           {% block content %}
           {% endblock %}
-          
+
           {% include 'website/pagination.html' %}
         </div>
       </div>
@@ -59,7 +59,7 @@
         </div>
     {% endblock %}
     </footer>
-    
+
     {% endblock %}
 
     <!-- jQuery first, then Tether, then Bootstrap JS. -->
diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html
index e01aee23802..4d52266ee91 100644
--- a/evennia/web/website/templates/website/evennia_admin.html
+++ b/evennia/web/website/templates/website/evennia_admin.html
@@ -9,40 +9,70 @@
       <div class="card-body">
         <h1 class="card-title">Admin</h1>
         <p class="card-text">
-          Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game.
+          The Evennia admin page allows for modifying database entities using a
+          graphical interface.
         </p>
-
         <hr />
 
+        <h3>Game entities</h3>
+
+
         <p class="card-text">
-          <h2><a href="{% url "admin:accounts_accountdb_changelist" %}">Accounts</a></h2>
-          Accounts can have several characters under them. A user's login and password information can be changed here.
+          <h4><a href="{% url "admin:accounts_accountdb_changelist" %}">Accounts</a></h4>
+          Accounts can have several characters under them. A user's login and
+          password information can be changed here.
         </p>
 
         <p class="card-text">
-          <h2><a href="{% url "admin:objects_objectdb_changelist" %}">Objects</a></h2>
-          Objects include everything from characters to rooms to exits.
+          <h4><a href="{% url "admin:objects_objectdb_changelist" %}">Objects</a></h4>
+          Objects include everything with an in-game location, from characters
+          to rooms, exits, swords and monsters.
         </p>
 
         <p class="card-text">
-          <h2><a href="{% url "admin:scripts_scriptdb_changelist" %}">Scripts</a></h2>
-          Scripts are meta objects used to store game information, handle special functionality or perform timed actions.
+          <h4><a href="{% url "admin:scripts_scriptdb_changelist" %}">Scripts</a></h4>
+          Scripts are meta objects used to store game information and state,
+          handle special functionality or perform timed actions. They have no
+          in-game location.
         </p>
 
         <p class="card-text">
-          <h2><a href="{% url "admin:comms_channeldb_changelist" %}">Channels</a></h2>
-          Channels are used for player communications.
+          <h4><a href="{% url "admin:comms_channeldb_changelist" %}">Channels</a></h4>
+          Channels are used to redirect and organize player communications.
         </p>
 
         <p class="card-text">
-          <h2><a href="{% url "admin:help_helpentry_changelist" %}">Help Topics</a></h2>
-          Help entries are custom entries added to the player help system.
+          <h4><a href="{% url "admin:help_helpentry_changelist" %}">Help Topics</a></h4>
+          Extend the automatic command-help with custom help topics.
         </p>
+
+        <hr />
+
+        <h3>Extra website pages</h3>
+
+        <p class="card-text">
+        <h4><a href="{% url "admin:sites_site_changelist" %}">Sites (domains)</a></h4>
+        Configure domain name for your pages. For local-only testing, create a
+        domain named <I>localhost:4001</I>. Then manually add
+        <strong>SITE_ID=&lt;id&gt;</strong> to your settings, where &lt;id&gt;
+        is the database-id of the domain you created (the &lt;id&gt; can be
+        found from the url of the domain in the admin, so
+        <I>/admin/sites/site/3/change</I> means that &lt;id&gt; is 3).
+        </p>
+
+        <p class="card-text">
+        <h4><a href="{% url "admin:flatpages_flatpage_changelist" %}">Pages</a></h4>
+          Create, edit and publish new web pages without needing to know how to
+          code. Select the domain specified by <strong>SITE_ID</strong> above.
+        </p>
+
         <hr />
 
         <p class="card-text">
-          If you are an advanced user who needs access to the raw Django Admin, it is available <a href="{% url "django_admin" %}">here</a>.
-          You can make this the default my changing <code>EVENNIA_ADMIN</code> to <code>False</code> in <code>settings.py</code> and reload.
+          If you are an advanced user who needs access to the raw Django Admin,
+          it is available <a href="{% url "django_admin" %}">here</a>.  You can
+          make this the default by changing <code>EVENNIA_ADMIN</code> to
+          <code>False</code> in <code>settings.py</code> and reload.
         </p>
       </div>
     </div>
diff --git a/evennia/web/website/templates/website/registration/logged_out.html b/evennia/web/website/templates/website/registration/logged_out.html
index 2eadfd61ecc..fc96f21ca6c 100644
--- a/evennia/web/website/templates/website/registration/logged_out.html
+++ b/evennia/web/website/templates/website/registration/logged_out.html
@@ -1,25 +1,36 @@
 {% extends "website/base.html" %}
 
+
 {% block header_ext %}
 <META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
 {% endblock %}
 
 {% block titleblock %}Logged Out{% endblock %}
 
-{% block content %}
-<div class="row">
-  <div class="col">
-    <div class="card">
-      <div class="card-body">
-        <h1 class="card-title">Logged Out</h1>
-        <p>You have been logged out.</p>
-        <p>Redirecting in 2 seconds...</p>
+{% block body %}
+
+{% load addclass %}
+<div class="container main-content mt-4" id="main-copy">
+  <div class="row">
+    <div class="col-lg-5 offset-lg-3 col-sm-12">
+      <div class="card mt-3">
+        <div class="card-body">
+          <h1 class="card-title text-center">Logged Out</h1>
+            <div class="row">
+              <div class="col-lg-12 col-sm-12 text-center">You have been logged out.</div>
+            </div>
+            <div class="row">
+              <div class="col-lg-12 col-sm-12 text-center">Redirecting in 2 seconds ...</div>
+            </div>
+        </div>
       </div>
     </div>
   </div>
 </div>
 
-<script type="text/JavaScript">
-  setTimeout("location.href = '/';",2000);
- </script>
+  <script type="text/JavaScript">
+    setTimeout("location.href = '/';",2000);
+  </script>
+
 {% endblock %}
+
diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html
index dab2a82be20..df506c641c9 100644
--- a/evennia/web/website/templates/website/registration/login.html
+++ b/evennia/web/website/templates/website/registration/login.html
@@ -1,8 +1,6 @@
 {% extends "website/base.html" %}
 
-{% block titleblock %}
-Login
-{% endblock %}
+{% block titleblock %}Login{% endblock %}
 
 {% block body %}
 
@@ -22,34 +20,34 @@ <h1 class="card-title">Login</h1>
             <div class="alert alert-danger" role="alert">Your username and password are incorrect. Please try again.</div>
             {% endif %}
           {% endif %}
-  
+
           {% if not user.is_authenticated %}
           <form method="post" action=".">
             {% csrf_token %}
-  
+
             <div class="form-group">
               <label for="id_username">Username:</label>
               {{ form.username | addclass:"form-control" }}
             </div>
-  
+
             <div class="form-group">
               <label for="id_password">Password:</label>
               {{ form.password | addclass:"form-control" }}
             </div>
-            
+
             <hr />
             <div class="row">
               <div class="col-lg-6 col-sm-12 text-center small"><a href="{% url 'password_reset' %}">Forgot Password?</a></div>
               <div class="col-lg-6 col-sm-12 text-center small"><a href="{% url 'register' %}">Create Account</a></div>
             </div>
-  
+
             <hr />
             <div class="form-group">
               <input class="form-control btn btn-outline-secondary" type="submit" value="Login" />
               <input type="hidden" name="next" value="{{ next }}" />
             </div>
           </form>
-          
+
           {% endif %}
         </div>
       </div>
diff --git a/evennia/web/website/templatetags/addclass.py b/evennia/web/website/templatetags/addclass.py
index 8e8f69e2c21..8b4ebc8c4e0 100644
--- a/evennia/web/website/templatetags/addclass.py
+++ b/evennia/web/website/templatetags/addclass.py
@@ -3,13 +3,13 @@
 register = template.Library()
 
 
-@register.filter(name='addclass')
+@register.filter(name="addclass")
 def addclass(field, given_class):
-    existing_classes = field.field.widget.attrs.get('class', None)
+    existing_classes = field.field.widget.attrs.get("class", None)
     if existing_classes:
         if existing_classes.find(given_class) == -1:
             # if the given class doesn't exist in the existing classes
-            classes = existing_classes + ' ' + given_class
+            classes = existing_classes + " " + given_class
         else:
             classes = existing_classes
     else:
diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py
index 48dcfd017ef..0c6ae8bf48a 100644
--- a/evennia/web/website/tests.py
+++ b/evennia/web/website/tests.py
@@ -5,6 +5,7 @@
 from evennia.utils import class_from_module
 from evennia.utils.test_resources import EvenniaTest
 
+
 class EvenniaWebTest(EvenniaTest):
 
     # Use the same classes the views are expecting
@@ -17,7 +18,7 @@ class EvenniaWebTest(EvenniaTest):
     channel_typeclass = settings.BASE_CHANNEL_TYPECLASS
 
     # Default named url
-    url_name = 'index'
+    url_name = "index"
 
     # Response to expect for unauthenticated requests
     unauthenticated_response = 200
@@ -34,14 +35,14 @@ def setUp(self):
 
         for account in (self.account, self.account2):
             # Demote accounts to Player permissions
-            account.permissions.add('Player')
-            account.permissions.remove('Developer')
+            account.permissions.add("Player")
+            account.permissions.remove("Developer")
 
             # Grant permissions to chars
             for char in account.db._playable_characters:
-                char.locks.add('edit:id(%s) or perm(Admin)' % account.pk)
-                char.locks.add('delete:id(%s) or perm(Admin)' % account.pk)
-                char.locks.add('view:all()')
+                char.locks.add("edit:id(%s) or perm(Admin)" % account.pk)
+                char.locks.add("delete:id(%s) or perm(Admin)" % account.pk)
+                char.locks.add("view:all()")
 
     def test_valid_chars(self):
         "Make sure account has playable characters"
@@ -57,11 +58,11 @@ def test_get(self):
         self.assertEqual(response.status_code, self.unauthenticated_response)
 
     def login(self):
-        return self.client.login(username='TestAccount', password='testpassword')
+        return self.client.login(username="TestAccount", password="testpassword")
 
     def test_get_authenticated(self):
         logged_in = self.login()
-        self.assertTrue(logged_in, 'Account failed to log in!')
+        self.assertTrue(logged_in, "Account failed to log in!")
 
         # Try accessing page while logged in
         response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True)
@@ -71,28 +72,35 @@ def test_get_authenticated(self):
 
 # ------------------------------------------------------------------------------
 
+
 class AdminTest(EvenniaWebTest):
-    url_name = 'django_admin'
+    url_name = "django_admin"
     unauthenticated_response = 302
 
+
 class IndexTest(EvenniaWebTest):
-    url_name = 'index'
+    url_name = "index"
+
 
 class RegisterTest(EvenniaWebTest):
-    url_name = 'register'
+    url_name = "register"
+
 
 class LoginTest(EvenniaWebTest):
-    url_name = 'login'
+    url_name = "login"
+
 
 class LogoutTest(EvenniaWebTest):
-    url_name = 'logout'
+    url_name = "logout"
+
 
 class PasswordResetTest(EvenniaWebTest):
-    url_name = 'password_change'
+    url_name = "password_change"
     unauthenticated_response = 302
 
+
 class WebclientTest(EvenniaWebTest):
-    url_name = 'webclient:index'
+    url_name = "webclient:index"
 
     @override_settings(WEBCLIENT_ENABLED=True)
     def test_get(self):
@@ -106,11 +114,13 @@ def test_get_disabled(self):
         self.unauthenticated_response = 404
         super(WebclientTest, self).test_get()
 
+
 class ChannelListTest(EvenniaWebTest):
-    url_name = 'channels'
+    url_name = "channels"
+
 
 class ChannelDetailTest(EvenniaWebTest):
-    url_name = 'channel-detail'
+    url_name = "channel-detail"
 
     def setUp(self):
         super(ChannelDetailTest, self).setUp()
@@ -118,15 +128,14 @@ def setUp(self):
         klass = class_from_module(self.channel_typeclass)
 
         # Create a channel
-        klass.create('demo')
+        klass.create("demo")
 
     def get_kwargs(self):
-        return {
-            'slug': slugify('demo')
-        }
+        return {"slug": slugify("demo")}
+
 
 class CharacterCreateView(EvenniaWebTest):
-    url_name = 'character-create'
+    url_name = "character-create"
     unauthenticated_response = 302
 
     @override_settings(MULTISESSION_MODE=0)
@@ -138,16 +147,17 @@ def test_valid_access_multisession_0(self):
         self.login()
 
         # Post data for a new character
-        data = {
-            'db_key': 'gannon',
-            'desc': 'Some dude.'
-        }
+        data = {"db_key": "gannon", "desc": "Some dude."}
 
         response = self.client.post(reverse(self.url_name), data=data, follow=True)
         self.assertEqual(response.status_code, 200)
 
         # Make sure the character was actually created
-        self.assertTrue(len(self.account.db._playable_characters) == 1, 'Account only has the following characters attributed to it: %s' % self.account.db._playable_characters)
+        self.assertTrue(
+            len(self.account.db._playable_characters) == 1,
+            "Account only has the following characters attributed to it: %s"
+            % self.account.db._playable_characters,
+        )
 
     @override_settings(MULTISESSION_MODE=2)
     @override_settings(MAX_NR_CHARACTERS=10)
@@ -157,26 +167,25 @@ def test_valid_access_multisession_2(self):
         self.login()
 
         # Post data for a new character
-        data = {
-            'db_key': 'gannon',
-            'desc': 'Some dude.'
-        }
+        data = {"db_key": "gannon", "desc": "Some dude."}
 
         response = self.client.post(reverse(self.url_name), data=data, follow=True)
         self.assertEqual(response.status_code, 200)
 
         # Make sure the character was actually created
-        self.assertTrue(len(self.account.db._playable_characters) > 1, 'Account only has the following characters attributed to it: %s' % self.account.db._playable_characters)
+        self.assertTrue(
+            len(self.account.db._playable_characters) > 1,
+            "Account only has the following characters attributed to it: %s"
+            % self.account.db._playable_characters,
+        )
+
 
 class CharacterPuppetView(EvenniaWebTest):
-    url_name = 'character-puppet'
+    url_name = "character-puppet"
     unauthenticated_response = 302
 
     def get_kwargs(self):
-        return {
-            'pk': self.char1.pk,
-            'slug': slugify(self.char1.name)
-        }
+        return {"pk": self.char1.pk, "slug": slugify(self.char1.name)}
 
     def test_invalid_access(self):
         "Account1 should not be able to puppet Account2:Char2"
@@ -184,30 +193,31 @@ def test_invalid_access(self):
         self.login()
 
         # Try to access puppet page for char2
-        kwargs = {
-            'pk': self.char2.pk,
-            'slug': slugify(self.char2.name)
-        }
+        kwargs = {"pk": self.char2.pk, "slug": slugify(self.char2.name)}
         response = self.client.get(reverse(self.url_name, kwargs=kwargs), follow=True)
-        self.assertTrue(response.status_code >= 400, "Invalid access should return a 4xx code-- either obj not found or permission denied! (Returned %s)" % response.status_code)
+        self.assertTrue(
+            response.status_code >= 400,
+            "Invalid access should return a 4xx code-- either obj not found or permission denied! (Returned %s)"
+            % response.status_code,
+        )
+
 
 class CharacterListView(EvenniaWebTest):
-    url_name = 'characters'
+    url_name = "characters"
     unauthenticated_response = 302
 
+
 class CharacterManageView(EvenniaWebTest):
-    url_name = 'character-manage'
+    url_name = "character-manage"
     unauthenticated_response = 302
 
+
 class CharacterUpdateView(EvenniaWebTest):
-    url_name = 'character-update'
+    url_name = "character-update"
     unauthenticated_response = 302
 
     def get_kwargs(self):
-        return {
-            'pk': self.char1.pk,
-            'slug': slugify(self.char1.name)
-        }
+        return {"pk": self.char1.pk, "slug": slugify(self.char1.name)}
 
     def test_valid_access(self):
         "Account1 should be able to update Account1:Char1"
@@ -219,12 +229,14 @@ def test_valid_access(self):
         self.assertEqual(response.status_code, 200)
 
         # Try to update char1 desc
-        data = {'db_key': self.char1.db_key, 'desc': "Just a regular type of dude."}
-        response = self.client.post(reverse(self.url_name, kwargs=self.get_kwargs()), data=data, follow=True)
+        data = {"db_key": self.char1.db_key, "desc": "Just a regular type of dude."}
+        response = self.client.post(
+            reverse(self.url_name, kwargs=self.get_kwargs()), data=data, follow=True
+        )
         self.assertEqual(response.status_code, 200)
 
         # Make sure the change was made successfully
-        self.assertEqual(self.char1.db.desc, data['desc'])
+        self.assertEqual(self.char1.db.desc, data["desc"])
 
     def test_invalid_access(self):
         "Account1 should not be able to update Account2:Char2"
@@ -232,22 +244,17 @@ def test_invalid_access(self):
         self.login()
 
         # Try to access update page for char2
-        kwargs = {
-            'pk': self.char2.pk,
-            'slug': slugify(self.char2.name)
-        }
+        kwargs = {"pk": self.char2.pk, "slug": slugify(self.char2.name)}
         response = self.client.get(reverse(self.url_name, kwargs=kwargs), follow=True)
         self.assertEqual(response.status_code, 403)
 
+
 class CharacterDeleteView(EvenniaWebTest):
-    url_name = 'character-delete'
+    url_name = "character-delete"
     unauthenticated_response = 302
 
     def get_kwargs(self):
-        return {
-            'pk': self.char1.pk,
-            'slug': slugify(self.char1.name)
-        }
+        return {"pk": self.char1.pk, "slug": slugify(self.char1.name)}
 
     def test_valid_access(self):
         "Account1 should be able to delete Account1:Char1"
@@ -259,13 +266,17 @@ def test_valid_access(self):
         self.assertEqual(response.status_code, 200)
 
         # Proceed with deleting it
-        data = {'value': 'yes'}
-        response = self.client.post(reverse(self.url_name, kwargs=self.get_kwargs()), data=data, follow=True)
+        data = {"value": "yes"}
+        response = self.client.post(
+            reverse(self.url_name, kwargs=self.get_kwargs()), data=data, follow=True
+        )
         self.assertEqual(response.status_code, 200)
 
         # Make sure it deleted
-        self.assertFalse(self.char1 in self.account.db._playable_characters,
-                         'Char1 is still in Account playable characters list.')
+        self.assertFalse(
+            self.char1 in self.account.db._playable_characters,
+            "Char1 is still in Account playable characters list.",
+        )
 
     def test_invalid_access(self):
         "Account1 should not be able to delete Account2:Char2"
@@ -273,9 +284,6 @@ def test_invalid_access(self):
         self.login()
 
         # Try to access delete page for char2
-        kwargs = {
-            'pk': self.char2.pk,
-            'slug': slugify(self.char2.name)
-        }
+        kwargs = {"pk": self.char2.pk, "slug": slugify(self.char2.name)}
         response = self.client.get(reverse(self.url_name, kwargs=kwargs), follow=True)
         self.assertEqual(response.status_code, 403)
diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py
index a20720227d3..c5238eaadf1 100644
--- a/evennia/web/website/urls.py
+++ b/evennia/web/website/urls.py
@@ -9,53 +9,89 @@
 from evennia.web.website import views as website_views
 
 urlpatterns = [
-    url(r'^$', website_views.EvenniaIndexView.as_view(), name="index"),
-    url(r'^tbi/', website_views.to_be_implemented, name='to_be_implemented'),
-
+    url(r"^$", website_views.EvenniaIndexView.as_view(), name="index"),
+    url(r"^tbi/", website_views.to_be_implemented, name="to_be_implemented"),
     # User Authentication (makes login/logout url names available)
-    url(r'^auth/register', website_views.AccountCreateView.as_view(), name="register"),
-    url(r'^auth/', include('django.contrib.auth.urls')),
-    
+    url(r"^auth/register", website_views.AccountCreateView.as_view(), name="register"),
+    url(r"^auth/", include("django.contrib.auth.urls")),
     # Help Topics
-    url(r'^help/$', website_views.HelpListView.as_view(), name="help"),
-    url(r'^help/(?P<category>[\w\d\-]+)/(?P<topic>[\w\d\-]+)/$', website_views.HelpDetailView.as_view(), name="help-entry-detail"),
-    
+    url(r"^help/$", website_views.HelpListView.as_view(), name="help"),
+    url(
+        r"^help/(?P<category>[\w\d\-]+)/(?P<topic>[\w\d\-]+)/$",
+        website_views.HelpDetailView.as_view(),
+        name="help-entry-detail",
+    ),
     # Channels
-    url(r'^channels/$', website_views.ChannelListView.as_view(), name="channels"),
-    url(r'^channels/(?P<slug>[\w\d\-]+)/$', website_views.ChannelDetailView.as_view(), name="channel-detail"),
-    
+    url(r"^channels/$", website_views.ChannelListView.as_view(), name="channels"),
+    url(
+        r"^channels/(?P<slug>[\w\d\-]+)/$",
+        website_views.ChannelDetailView.as_view(),
+        name="channel-detail",
+    ),
     # Character management
-    url(r'^characters/$', website_views.CharacterListView.as_view(), name="characters"),
-    url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="character-create"),
-    url(r'^characters/manage/$', website_views.CharacterManageView.as_view(), name="character-manage"),
-    url(r'^characters/detail/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$', website_views.CharacterDetailView.as_view(), name="character-detail"),
-    url(r'^characters/puppet/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$', website_views.CharacterPuppetView.as_view(), name="character-puppet"),
-    url(r'^characters/update/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$', website_views.CharacterUpdateView.as_view(), name="character-update"),
-    url(r'^characters/delete/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$', website_views.CharacterDeleteView.as_view(), name="character-delete"),
-    
+    url(r"^characters/$", website_views.CharacterListView.as_view(), name="characters"),
+    url(
+        r"^characters/create/$",
+        website_views.CharacterCreateView.as_view(),
+        name="character-create",
+    ),
+    url(
+        r"^characters/manage/$",
+        website_views.CharacterManageView.as_view(),
+        name="character-manage",
+    ),
+    url(
+        r"^characters/detail/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
+        website_views.CharacterDetailView.as_view(),
+        name="character-detail",
+    ),
+    url(
+        r"^characters/puppet/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
+        website_views.CharacterPuppetView.as_view(),
+        name="character-puppet",
+    ),
+    url(
+        r"^characters/update/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
+        website_views.CharacterUpdateView.as_view(),
+        name="character-update",
+    ),
+    url(
+        r"^characters/delete/(?P<slug>[\w\d\-]+)/(?P<pk>[0-9]+)/$",
+        website_views.CharacterDeleteView.as_view(),
+        name="character-delete",
+    ),
     # Django original admin page. Make this URL is always available, whether
     # we've chosen to use Evennia's custom admin or not.
-    url(r'django_admin/', website_views.admin_wrapper, name="django_admin"),
-
+    url(r"django_admin/", website_views.admin_wrapper, name="django_admin"),
     # Admin docs
-    url(r'^admin/doc/', include('django.contrib.admindocs.urls'))
+    url(r"^admin/doc/", include("django.contrib.admindocs.urls")),
 ]
 
 if settings.EVENNIA_ADMIN:
     urlpatterns += [
         # Our override for the admin.
-        url('^admin/$', website_views.evennia_admin, name="evennia_admin"),
-
+        url("^admin/$", website_views.evennia_admin, name="evennia_admin"),
         # Makes sure that other admin pages get loaded.
-        url(r'^admin/', admin.site.urls)]
+        url(r"^admin/", admin.site.urls),
+    ]
 else:
     # Just include the normal Django admin.
-    urlpatterns += [url(r'^admin/', admin.site.urls)]
+    urlpatterns += [url(r"^admin/", admin.site.urls)]
 
 # This sets up the server if the user want to run the Django
 # test server (this should normally not be needed).
 if settings.SERVE_MEDIA:
-    urlpatterns.extend([
-        url(r'^media/(?P<path>.*)$', django_views.static.serve, {'document_root': settings.MEDIA_ROOT}),
-        url(r'^static/(?P<path>.*)$', django_views.static.serve, {'document_root': settings.STATIC_ROOT})
-    ])
+    urlpatterns.extend(
+        [
+            url(
+                r"^media/(?P<path>.*)$",
+                django_views.static.serve,
+                {"document_root": settings.MEDIA_ROOT},
+            ),
+            url(
+                r"^static/(?P<path>.*)$",
+                django_views.static.serve,
+                {"document_root": settings.STATIC_ROOT},
+            ),
+        ]
+    )
diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py
index 9a0bbc85bb0..3092a6db9f4 100644
--- a/evennia/web/website/views.py
+++ b/evennia/web/website/views.py
@@ -67,7 +67,7 @@ def _gamestats():
         "num_exits": nexits or "no",
         "num_objects": nobjs or "none",
         "num_characters": nchars or "no",
-        "num_others": nothers or "no"
+        "num_others": nothers or "no",
     }
     return pagevars
 
@@ -78,11 +78,9 @@ def to_be_implemented(request):
     implemented yet.
     """
 
-    pagevars = {
-        "page_title": "To Be Implemented...",
-    }
+    pagevars = {"page_title": "To Be Implemented..."}
 
-    return render(request, 'tbi.html', pagevars)
+    return render(request, "tbi.html", pagevars)
 
 
 @staff_member_required
@@ -90,9 +88,7 @@ def evennia_admin(request):
     """
     Helpful Evennia-specific admin page.
     """
-    return render(
-        request, 'evennia_admin.html', {
-            'accountdb': AccountDB})
+    return render(request, "evennia_admin.html", {"accountdb": AccountDB})
 
 
 def admin_wrapper(request):
@@ -106,6 +102,7 @@ def admin_wrapper(request):
 # Class-based views
 #
 
+
 class EvenniaIndexView(TemplateView):
     """
     This is a basic example of a Django class-based view, which are functionally
@@ -126,8 +123,9 @@ class EvenniaIndexView(TemplateView):
     This particular example displays the index page.
 
     """
+
     # Tell the view what HTML template to use for the page
-    template_name = 'website/index.html'
+    template_name = "website/index.html"
 
     # This method tells the view what data should be displayed on the template.
     def get_context_data(self, **kwargs):
@@ -176,6 +174,7 @@ class TypeclassMixin(object):
     Django models interchangeably.
 
     """
+
     @property
     def typeclass(self):
         return self.model
@@ -193,10 +192,11 @@ class EvenniaCreateView(CreateView, TypeclassMixin):
     otherwise.
 
     """
+
     @property
     def page_title(self):
         # Makes sure the page has a sensible title.
-        return 'Create %s' % self.typeclass._meta.verbose_name.title()
+        return "Create %s" % self.typeclass._meta.verbose_name.title()
 
 
 class EvenniaDetailView(DetailView, TypeclassMixin):
@@ -207,10 +207,11 @@ class EvenniaDetailView(DetailView, TypeclassMixin):
     otherwise.
 
     """
+
     @property
     def page_title(self):
         # Makes sure the page has a sensible title.
-        return '%s Detail' % self.typeclass._meta.verbose_name.title()
+        return "%s Detail" % self.typeclass._meta.verbose_name.title()
 
 
 class EvenniaUpdateView(UpdateView, TypeclassMixin):
@@ -221,10 +222,11 @@ class EvenniaUpdateView(UpdateView, TypeclassMixin):
     otherwise.
 
     """
+
     @property
     def page_title(self):
         # Makes sure the page has a sensible title.
-        return 'Update %s' % self.typeclass._meta.verbose_name.title()
+        return "Update %s" % self.typeclass._meta.verbose_name.title()
 
 
 class EvenniaDeleteView(DeleteView, TypeclassMixin):
@@ -235,16 +237,18 @@ class EvenniaDeleteView(DeleteView, TypeclassMixin):
     otherwise.
 
     """
+
     @property
     def page_title(self):
         # Makes sure the page has a sensible title.
-        return 'Delete %s' % self.typeclass._meta.verbose_name.title()
+        return "Delete %s" % self.typeclass._meta.verbose_name.title()
 
 
 #
 # Object views
 #
 
+
 class ObjectDetailView(EvenniaDetailView):
     """
     This is an important view.
@@ -255,6 +259,7 @@ class ObjectDetailView(EvenniaDetailView):
     permissions to actually *do* things to it.
 
     """
+
     # -- Django constructs --
     #
     # Choose what class of object this view will display. Note that this should
@@ -267,18 +272,18 @@ class ObjectDetailView(EvenniaDetailView):
     model = class_from_module(settings.BASE_OBJECT_TYPECLASS)
 
     # What HTML template you wish to use to display this page.
-    template_name = 'website/object_detail.html'
+    template_name = "website/object_detail.html"
 
     # -- Evennia constructs --
     #
     # What lock type to check for the requesting user, authenticated or not.
     # https://github.com/evennia/evennia/wiki/Locks#valid-access_types
-    access_type = 'view'
+    access_type = "view"
 
     # What attributes of the object you wish to display on the page. Model-level
     # attributes will take precedence over identically-named db.attributes!
     # The order you specify here will be followed.
-    attributes = ['name', 'desc']
+    attributes = ["name", "desc"]
 
     def get_context_data(self, **kwargs):
         """
@@ -304,15 +309,15 @@ def get_context_data(self, **kwargs):
         for attribute in self.attributes:
             # Check if the attribute is a core fieldname (name, desc)
             if attribute in self.typeclass._meta._property_names:
-                attribute_list[attribute.title()] = getattr(obj, attribute, '')
+                attribute_list[attribute.title()] = getattr(obj, attribute, "")
 
             # Check if the attribute is a db attribute (char1.db.favorite_color)
             else:
-                attribute_list[attribute.title()] = getattr(obj.db, attribute, '')
+                attribute_list[attribute.title()] = getattr(obj.db, attribute, "")
 
         # Add our attribute map to the Django request context, so it gets
         # displayed on the template
-        context['attribute_list'] = attribute_list
+        context["attribute_list"] = attribute_list
 
         # Return the comprehensive context object
         return context
@@ -336,18 +341,19 @@ def get_object(self, queryset=None):
             queryset = self.get_queryset()
 
         # Get the object, ignoring all checks and filters for now
-        obj = self.typeclass.objects.get(pk=self.kwargs.get('pk'))
+        obj = self.typeclass.objects.get(pk=self.kwargs.get("pk"))
 
         # Check if this object was requested in a valid manner
         if slugify(obj.name) != self.kwargs.get(self.slug_url_kwarg):
             raise HttpResponseBadRequest(
-                u"No %(verbose_name)s found matching the query" %
-                {'verbose_name': queryset.model._meta.verbose_name})
+                "No %(verbose_name)s found matching the query"
+                % {"verbose_name": queryset.model._meta.verbose_name}
+            )
 
         # Check if the requestor account has permissions to access object
         account = self.request.user
         if not obj.access(account, self.access_type):
-            raise PermissionDenied(u"You are not authorized to %s this object." % self.access_type)
+            raise PermissionDenied("You are not authorized to %s this object." % self.access_type)
 
         # Get the object, if it is in the specified queryset
         obj = super(ObjectDetailView, self).get_object(queryset)
@@ -365,6 +371,7 @@ class ObjectCreateView(LoginRequiredMixin, EvenniaCreateView):
     default title for the page.
 
     """
+
     model = class_from_module(settings.BASE_OBJECT_TYPECLASS)
 
 
@@ -378,12 +385,13 @@ class ObjectDeleteView(LoginRequiredMixin, ObjectDetailView, EvenniaDeleteView):
     permissions to delete the requested object.
 
     """
+
     # -- Django constructs --
     model = class_from_module(settings.BASE_OBJECT_TYPECLASS)
-    template_name = 'website/object_confirm_delete.html'
+    template_name = "website/object_confirm_delete.html"
 
     # -- Evennia constructs --
-    access_type = 'delete'
+    access_type = "delete"
 
     def delete(self, request, *args, **kwargs):
         """
@@ -420,11 +428,12 @@ class ObjectUpdateView(LoginRequiredMixin, ObjectDetailView, EvenniaUpdateView):
     it does not update core model fields, *only* object attributes!
 
     """
+
     # -- Django constructs --
     model = class_from_module(settings.BASE_OBJECT_TYPECLASS)
 
     # -- Evennia constructs --
-    access_type = 'edit'
+    access_type = "edit"
 
     def get_success_url(self):
         """
@@ -454,10 +463,10 @@ def get_initial(self):
         obj = self.get_object()
 
         # Get attributes
-        data = {k: getattr(obj.db, k, '') for k in self.form_class.base_fields}
+        data = {k: getattr(obj.db, k, "") for k in self.form_class.base_fields}
 
         # Get model fields
-        data.update({k: getattr(obj, k, '') for k in self.form_class.Meta.fields})
+        data.update({k: getattr(obj, k, "") for k in self.form_class.Meta.fields})
 
         return data
 
@@ -493,6 +502,7 @@ def form_valid(self, form):
 # Account views
 #
 
+
 class AccountMixin(TypeclassMixin):
     """
     This is a "mixin", a modifier of sorts.
@@ -501,6 +511,7 @@ class AccountMixin(TypeclassMixin):
     with Account objects instead of generic Objects or otherwise.
 
     """
+
     # -- Django constructs --
     model = class_from_module(settings.BASE_ACCOUNT_TYPECLASS)
     form_class = website_forms.AccountForm
@@ -511,9 +522,10 @@ class AccountCreateView(AccountMixin, EvenniaCreateView):
     Account creation view.
 
     """
+
     # -- Django constructs --
-    template_name = 'website/registration/register.html'
-    success_url = reverse_lazy('login')
+    template_name = "website/registration/register.html"
+    success_url = reverse_lazy("login")
 
     def form_valid(self, form):
         """
@@ -526,15 +538,12 @@ def form_valid(self, form):
 
         """
         # Get values provided
-        username = form.cleaned_data['username']
-        password = form.cleaned_data['password1']
-        email = form.cleaned_data.get('email', '')
+        username = form.cleaned_data["username"]
+        password = form.cleaned_data["password1"]
+        email = form.cleaned_data.get("email", "")
 
         # Create account
-        account, errs = self.typeclass.create(
-            username=username,
-            password=password,
-            email=email,)
+        account, errs = self.typeclass.create(username=username, password=password, email=email)
 
         # If unsuccessful, display error messages to user
         if not account:
@@ -544,8 +553,11 @@ def form_valid(self, form):
             return self.form_invalid(form)
 
         # Inform user of success
-        messages.success(self.request, "Your account '%s' was successfully created! "
-                                       "You may log in using it now." % account.name)
+        messages.success(
+            self.request,
+            "Your account '%s' was successfully created! "
+            "You may log in using it now." % account.name,
+        )
 
         # Redirect the user to the login page
         return HttpResponseRedirect(self.success_url)
@@ -555,6 +567,7 @@ def form_valid(self, form):
 # Character views
 #
 
+
 class CharacterMixin(TypeclassMixin):
     """
     This is a "mixin", a modifier of sorts.
@@ -563,10 +576,11 @@ class CharacterMixin(TypeclassMixin):
     with Character objects instead of generic Objects or otherwise.
 
     """
+
     # -- Django constructs --
     model = class_from_module(settings.BASE_CHARACTER_TYPECLASS)
     form_class = website_forms.CharacterForm
-    success_url = reverse_lazy('character-manage')
+    success_url = reverse_lazy("character-manage")
 
     def get_queryset(self):
         """
@@ -580,10 +594,10 @@ def get_queryset(self):
         """
         # Get IDs of characters owned by account
         account = self.request.user
-        ids = [getattr(x, 'id') for x in account.characters if x]
+        ids = [getattr(x, "id") for x in account.characters if x]
 
         # Return a queryset consisting of those characters
-        return self.typeclass.objects.filter(id__in=ids).order_by(Lower('db_key'))
+        return self.typeclass.objects.filter(id__in=ids).order_by(Lower("db_key"))
 
 
 class CharacterListView(LoginRequiredMixin, CharacterMixin, ListView):
@@ -595,13 +609,14 @@ class CharacterListView(LoginRequiredMixin, CharacterMixin, ListView):
     human stalkers and automated bots/scrapers from harvesting data on your users.
 
     """
+
     # -- Django constructs --
-    template_name = 'website/character_list.html'
+    template_name = "website/character_list.html"
     paginate_by = 100
 
     # -- Evennia constructs --
-    page_title = 'Character List'
-    access_type = 'view'
+    page_title = "Character List"
+    access_type = "view"
 
     def get_queryset(self):
         """
@@ -617,10 +632,11 @@ def get_queryset(self):
 
         # Return a queryset consisting of characters the user is allowed to
         # see.
-        ids = [obj.id for obj in self.typeclass.objects.all()
-               if obj.access(account, self.access_type)]
+        ids = [
+            obj.id for obj in self.typeclass.objects.all() if obj.access(account, self.access_type)
+        ]
 
-        return self.typeclass.objects.filter(id__in=ids).order_by(Lower('db_key'))
+        return self.typeclass.objects.filter(id__in=ids).order_by(Lower("db_key"))
 
 
 class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, ObjectDetailView):
@@ -632,6 +648,7 @@ class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, Obje
     and that their intended puppet is one that they own.
 
     """
+
     def get_redirect_url(self, *args, **kwargs):
         """
         Django hook.
@@ -647,17 +664,17 @@ def get_redirect_url(self, *args, **kwargs):
         char = self.get_object()
 
         # Get the page the user came from
-        next_page = self.request.GET.get('next', self.success_url)
+        next_page = self.request.GET.get("next", self.success_url)
 
         if char:
             # If the account owns the char, store the ID of the char in the
             # Django request's session (different from Evennia session!).
             # We do this because characters don't serialize well.
-            self.request.session['puppet'] = int(char.pk)
+            self.request.session["puppet"] = int(char.pk)
             messages.success(self.request, "You become '%s'!" % char)
         else:
             # If the puppeting failed, clear out the cached puppet value
-            self.request.session['puppet'] = None
+            self.request.session["puppet"] = None
             messages.error(self.request, "You cannot become '%s'." % char)
 
         return next_page
@@ -669,12 +686,13 @@ class CharacterManageView(LoginRequiredMixin, CharacterMixin, ListView):
     edit, or delete their own characters.
 
     """
+
     # -- Django constructs --
     paginate_by = 10
-    template_name = 'website/character_manage_list.html'
+    template_name = "website/character_manage_list.html"
 
     # -- Evennia constructs --
-    page_title = 'Manage Characters'
+    page_title = "Manage Characters"
 
 
 class CharacterUpdateView(CharacterMixin, ObjectUpdateView):
@@ -683,9 +701,10 @@ class CharacterUpdateView(CharacterMixin, ObjectUpdateView):
     ObjectUpdateView) can edit the attributes of a character they own.
 
     """
+
     # -- Django constructs --
     form_class = website_forms.CharacterUpdateForm
-    template_name = 'website/character_form.html'
+    template_name = "website/character_form.html"
 
 
 class CharacterDetailView(CharacterMixin, ObjectDetailView):
@@ -694,13 +713,14 @@ class CharacterDetailView(CharacterMixin, ObjectDetailView):
     a character, owned by them or not.
 
     """
+
     # -- Django constructs --
-    template_name = 'website/object_detail.html'
+    template_name = "website/object_detail.html"
 
     # -- Evennia constructs --
     # What attributes to display for this object
-    attributes = ['name', 'desc']
-    access_type = 'view'
+    attributes = ["name", "desc"]
+    access_type = "view"
 
     def get_queryset(self):
         """
@@ -715,10 +735,11 @@ def get_queryset(self):
 
         # Return a queryset consisting of characters the user is allowed to
         # see.
-        ids = [obj.id for obj in self.typeclass.objects.all()
-               if obj.access(account, self.access_type)]
+        ids = [
+            obj.id for obj in self.typeclass.objects.all() if obj.access(account, self.access_type)
+        ]
 
-        return self.typeclass.objects.filter(id__in=ids).order_by(Lower('db_key'))
+        return self.typeclass.objects.filter(id__in=ids).order_by(Lower("db_key"))
 
 
 class CharacterDeleteView(CharacterMixin, ObjectDeleteView):
@@ -727,6 +748,7 @@ class CharacterDeleteView(CharacterMixin, ObjectDeleteView):
     ObjectDeleteView) can delete a character they own.
 
     """
+
     pass
 
 
@@ -736,8 +758,9 @@ class CharacterCreateView(CharacterMixin, ObjectCreateView):
     ObjectCreateView) can create a new character.
 
     """
+
     # -- Django constructs --
-    template_name = 'website/character_form.html'
+    template_name = "website/character_form.html"
 
     def form_valid(self, form):
         """
@@ -755,8 +778,8 @@ def form_valid(self, form):
 
         # Get attributes from the form
         self.attributes = {k: form.cleaned_data[k] for k in form.cleaned_data.keys()}
-        charname = self.attributes.pop('db_key')
-        description = self.attributes.pop('desc')
+        charname = self.attributes.pop("db_key")
+        description = self.attributes.pop("desc")
         # Create a character
         character, errors = self.typeclass.create(charname, account, description=description)
 
@@ -783,6 +806,7 @@ def form_valid(self, form):
 # Channel views
 #
 
+
 class ChannelMixin(TypeclassMixin):
     """
     This is a "mixin", a modifier of sorts.
@@ -791,15 +815,16 @@ class ChannelMixin(TypeclassMixin):
     with HelpEntry objects instead of generic Objects or otherwise.
 
     """
+
     # -- Django constructs --
     model = class_from_module(settings.BASE_CHANNEL_TYPECLASS)
 
     # -- Evennia constructs --
-    page_title = 'Channels'
+    page_title = "Channels"
 
     # What lock type to check for the requesting user, authenticated or not.
     # https://github.com/evennia/evennia/wiki/Locks#valid-access_types
-    access_type = 'listen'
+    access_type = "listen"
 
     def get_queryset(self):
         """
@@ -816,14 +841,10 @@ def get_queryset(self):
         channels = self.typeclass.objects.all().iterator()
 
         # Now figure out which ones the current user is allowed to see
-        bucket = [channel.id for channel in channels if channel.access(account, 'listen')]
+        bucket = [channel.id for channel in channels if channel.access(account, "listen")]
 
         # Re-query and set a sorted list
-        filtered = self.typeclass.objects.filter(
-            id__in=bucket
-        ).order_by(
-            Lower('db_key')
-        )
+        filtered = self.typeclass.objects.filter(id__in=bucket).order_by(Lower("db_key"))
 
         return filtered
 
@@ -834,9 +855,10 @@ class ChannelListView(ChannelMixin, ListView):
     or not.
 
     """
+
     # -- Django constructs --
     paginate_by = 100
-    template_name = 'website/channel_list.html'
+    template_name = "website/channel_list.html"
 
     # -- Evennia constructs --
     page_title = "Channel Index"
@@ -854,10 +876,11 @@ def get_context_data(self, **kwargs):
         context = super(ChannelListView, self).get_context_data(**kwargs)
 
         # Calculate which channels are most popular
-        context['most_popular'] = sorted(
+        context["most_popular"] = sorted(
             list(self.get_queryset()),
             key=lambda channel: len(channel.subscriptions.all()),
-            reverse=True)[:self.max_popular]
+            reverse=True,
+        )[: self.max_popular]
 
         return context
 
@@ -867,14 +890,15 @@ class ChannelDetailView(ChannelMixin, ObjectDetailView):
     Returns the log entries for a given channel.
 
     """
+
     # -- Django constructs --
-    template_name = 'website/channel_detail.html'
+    template_name = "website/channel_detail.html"
 
     # -- Evennia constructs --
     # What attributes of the object you wish to display on the page. Model-level
     # attributes will take precedence over identically-named db.attributes!
     # The order you specify here will be followed.
-    attributes = ['name']
+    attributes = ["name"]
 
     # How many log entries to read and display.
     max_num_lines = 10000
@@ -893,27 +917,24 @@ def get_context_data(self, **kwargs):
 
         # Get the filename this Channel is recording to
         filename = self.object.attributes.get(
-            "log_file", default="channel_%s.log" % self.object.key)
+            "log_file", default="channel_%s.log" % self.object.key
+        )
 
         # Split log entries so we can filter by time
         bucket = []
         for log in (x.strip() for x in tail_log_file(filename, 0, self.max_num_lines)):
             if not log:
                 continue
-            time, msg = log.split(' [-] ')
-            time_key = time.split(':')[0]
+            time, msg = log.split(" [-] ")
+            time_key = time.split(":")[0]
 
-            bucket.append({
-                'key': time_key,
-                'timestamp': time,
-                'message': msg
-            })
+            bucket.append({"key": time_key, "timestamp": time, "message": msg})
 
         # Add the processed entries to the context
-        context['object_list'] = bucket
+        context["object_list"] = bucket
 
         # Get a list of unique timestamps by hour and sort them
-        context['object_filters'] = sorted(set([x['key'] for x in bucket]))
+        context["object_filters"] = sorted(set([x["key"] for x in bucket]))
 
         return context
 
@@ -931,14 +952,15 @@ def get_object(self, queryset=None):
             queryset = self.get_queryset()
 
         # Find the object in the queryset
-        channel = slugify(self.kwargs.get('slug', ''))
+        channel = slugify(self.kwargs.get("slug", ""))
         obj = next((x for x in queryset if slugify(x.db_key) == channel), None)
 
         # Check if this object was requested in a valid manner
         if not obj:
             raise HttpResponseBadRequest(
-                u"No %(verbose_name)s found matching the query" %
-                {'verbose_name': queryset.model._meta.verbose_name})
+                "No %(verbose_name)s found matching the query"
+                % {"verbose_name": queryset.model._meta.verbose_name}
+            )
 
         return obj
 
@@ -947,6 +969,7 @@ def get_object(self, queryset=None):
 # Help views
 #
 
+
 class HelpMixin(TypeclassMixin):
     """
     This is a "mixin", a modifier of sorts.
@@ -955,11 +978,12 @@ class HelpMixin(TypeclassMixin):
     with HelpEntry objects instead of generic Objects or otherwise.
 
     """
+
     # -- Django constructs --
     model = HelpEntry
 
     # -- Evennia constructs --
-    page_title = 'Help'
+    page_title = "Help"
 
     def get_queryset(self):
         """
@@ -976,15 +1000,13 @@ def get_queryset(self):
         entries = self.typeclass.objects.all().iterator()
 
         # Now figure out which ones the current user is allowed to see
-        bucket = [entry.id for entry in entries if entry.access(account, 'view')]
+        bucket = [entry.id for entry in entries if entry.access(account, "view")]
 
         # Re-query and set a sorted list
-        filtered = self.typeclass.objects.filter(
-            id__in=bucket
-        ).order_by(
-            Lower('db_key')
-        ).order_by(
-            Lower('db_help_category')
+        filtered = (
+            self.typeclass.objects.filter(id__in=bucket)
+            .order_by(Lower("db_key"))
+            .order_by(Lower("db_help_category"))
         )
 
         return filtered
@@ -996,9 +1018,10 @@ class HelpListView(HelpMixin, ListView):
     or not.
 
     """
+
     # -- Django constructs --
     paginate_by = 500
-    template_name = 'website/help_list.html'
+    template_name = "website/help_list.html"
 
     # -- Evennia constructs --
     page_title = "Help Index"
@@ -1009,8 +1032,9 @@ class HelpDetailView(HelpMixin, EvenniaDetailView):
     Returns the detail page for a given help entry.
 
     """
+
     # -- Django constructs --
-    template_name = 'website/help_detail.html'
+    template_name = "website/help_detail.html"
 
     def get_context_data(self, **kwargs):
         """
@@ -1027,9 +1051,12 @@ def get_context_data(self, **kwargs):
         obj = self.get_object()
 
         # Get queryset and filter out non-related categories
-        queryset = self.get_queryset().filter(
-            db_help_category=obj.db_help_category).order_by(Lower('db_key'))
-        context['topic_list'] = queryset
+        queryset = (
+            self.get_queryset()
+            .filter(db_help_category=obj.db_help_category)
+            .order_by(Lower("db_key"))
+        )
+        context["topic_list"] = queryset
 
         # Find the index position of the given obj in the queryset
         objs = list(queryset)
@@ -1039,23 +1066,23 @@ def get_context_data(self, **kwargs):
 
         # Find the previous and next topics, if either exist
         try:
-            assert i+1 <= len(objs) and objs[i+1] is not obj
-            context['topic_next'] = objs[i+1]
+            assert i + 1 <= len(objs) and objs[i + 1] is not obj
+            context["topic_next"] = objs[i + 1]
         except:
-            context['topic_next'] = None
+            context["topic_next"] = None
 
         try:
-            assert i-1 >= 0 and objs[i-1] is not obj
-            context['topic_previous'] = objs[i-1]
+            assert i - 1 >= 0 and objs[i - 1] is not obj
+            context["topic_previous"] = objs[i - 1]
         except:
-            context['topic_previous'] = None
+            context["topic_previous"] = None
 
         # Format the help entry using HTML instead of newlines
         text = obj.db_entrytext
-        text = text.replace('\r\n\r\n', '\n\n')
-        text = text.replace('\r\n', '\n')
-        text = text.replace('\n', '<br />')
-        context['entry_text'] = text
+        text = text.replace("\r\n\r\n", "\n\n")
+        text = text.replace("\r\n", "\n")
+        text = text.replace("\n", "<br />")
+        context["entry_text"] = text
 
         return context
 
@@ -1073,16 +1100,22 @@ def get_object(self, queryset=None):
             queryset = self.get_queryset()
 
         # Find the object in the queryset
-        category = slugify(self.kwargs.get('category', ''))
-        topic = slugify(self.kwargs.get('topic', ''))
-        obj = next((x for x in queryset
-                    if slugify(x.db_help_category) == category and
-                    slugify(x.db_key) == topic), None)
+        category = slugify(self.kwargs.get("category", ""))
+        topic = slugify(self.kwargs.get("topic", ""))
+        obj = next(
+            (
+                x
+                for x in queryset
+                if slugify(x.db_help_category) == category and slugify(x.db_key) == topic
+            ),
+            None,
+        )
 
         # Check if this object was requested in a valid manner
         if not obj:
             raise HttpResponseBadRequest(
-                u"No %(verbose_name)s found matching the query" %
-                {'verbose_name': queryset.model._meta.verbose_name})
+                "No %(verbose_name)s found matching the query"
+                % {"verbose_name": queryset.model._meta.verbose_name}
+            )
 
         return obj
diff --git a/requirements.txt b/requirements.txt
index 4e3e79ab8a1..cfbf6e5af30 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,16 +1,18 @@
-# Evennia dependencies, for Linux/Mac platforms
+# Evennia dependencies
 
 # general
-django >= 2.2.4, < 2.3
+django >= 2.2.5, < 2.3
 twisted >= 19.2.1, < 20.0.0
-pillow == 5.2.0
 pytz
-future >= 0.15.2
 django-sekizai
 inflect
 autobahn >= 17.9.3
 model_mommy
 
-# testing
+# testing and development
 mock >= 1.0.1
 anything
+black
+
+# windows-specific
+pypiwin32;platform_system=="Windows"
diff --git a/setup.py b/setup.py
index 68d8bdbeb82..a6dc27ad5a8 100644
--- a/setup.py
+++ b/setup.py
@@ -10,11 +10,9 @@
 
 def get_requirements():
     """
-    To update the requirements for Evennia, edit the requirements.txt
-    file, or win_requirements.txt for Windows platforms.
+    To update the requirements for Evennia, edit the requirements.txt file.
     """
-    filename = 'win_requirements.txt' if OS_WINDOWS else 'requirements.txt'
-    with open(filename, 'r') as f:
+    with open('requirements.txt', 'r') as f:
         req_lines = f.readlines()
     reqs = []
     for line in req_lines:
@@ -69,14 +67,57 @@ def package_data():
 setup(
     name='evennia',
     version=get_version(),
-    author="Evennia community",
+    author="The Evennia community",
     maintainer="Griatch",
-    maintainer_email="griatch AT gmail DOT com",
     url="http://www.evennia.com",
-    description='A full-featured MUD building toolkit.',
+    description="A full-featured toolkit and server for text-based multiplayer games (MUDs, MU*).",
+    license="BSD",
+    long_description="""
+    _Evennia_ is an open-source library and toolkit for building multi-player
+    online text games (MUD, MUX, MUSH, MUCK and other MU*). You easily design
+    your entire game using normal Python modules, letting Evennia handle the
+    boring stuff all multiplayer games need. Apart from supporting traditional
+    MUD clients, Evennia comes with both a HTML5 game web-client and a
+    web-server out of the box.
+    """,
+    long_description_content_type="text/markdown",
     packages=find_packages(),
     scripts=get_scripts(),
     install_requires=get_requirements(),
     package_data={'': package_data()},
-    zip_safe=False
+    zip_safe=False,
+    classifiers=[
+        "Programming Language :: Python :: 3 :: Only",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: JavaScript",
+        "Development Status :: 4 - Beta",
+        "License :: OSI Approved :: BSD License",
+        "Environment :: Console",
+        "Environment :: Web Environment",
+        "Framework :: Django",
+        "Framework :: Django :: 2.2",
+        "Framework :: Twisted",
+        "Intended Audience :: Developers",
+        "Intended Audience :: Education",
+        "Operating System :: MacOS",
+        "Operating System :: Microsoft :: Windows",
+        "Operating System :: POSIX :: Linux",
+        "Topic :: Database",
+        "Topic :: Education",
+        "Topic :: Games/Entertainment :: Multi-User Dungeons (MUD)",
+        "Topic :: Games/Entertainment :: Puzzle Games",
+        "Topic :: Games/Entertainment :: Role-Playing",
+        "Topic :: Games/Entertainment :: Simulation",
+        "Topic :: Software Development :: Libraries :: Application Frameworks",
+        "Topic :: Internet :: WWW/HTTP :: WSGI :: Server",
+    ],
+    python_requires='>=3.7',
+    project_urls={
+        "Source": "https://github.com/evennia/evennia",
+        "Issue tracker": "https://github.com/evennia/evennia/issues",
+        "Chat": "http://www.evennia.com/chat-redirect-3",
+        "Forum":  "https://groups.google.com/forum/#%21forum/evennia",
+        "Dev Blog": "http://evennia.blogspot.com/",
+        "Patreon": "https://www.patreon.com/griatch",
+    }
 )
diff --git a/win_requirements.txt b/win_requirements.txt
deleted file mode 100644
index ea3bb46fb75..00000000000
--- a/win_requirements.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-# Evennia dependencies, for Windows platform
-
-# windows specific
-pypiwin32
-
-# general
-django >= 2.2.4, < 2.3
-twisted >= 19.2.1, < 20.0.0
-pillow == 5.2.0
-pytz
-future >= 0.15.2
-django-sekizai
-autobahn >= 17.9.3
-inflect
-model_mommy
-
-# testing
-mock >= 1.0.1
-anything