From 4eb631af74fa213fe46ead6a9e0f017fd4489071 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Wed, 12 Feb 2020 23:07:56 +0100
Subject: [PATCH] Ran black on sources, some minor tweaks

---
 evennia/server/deprecations.py  | 11 +++++++----
 evennia/server/portal/portal.py |  1 -
 evennia/utils/dbserialize.py    | 18 ++++++------------
 evennia/web/urls.py             |  3 +--
 4 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/evennia/server/deprecations.py b/evennia/server/deprecations.py
index 6cf3ab1af7..fd6a7fbc85 100644
--- a/evennia/server/deprecations.py
+++ b/evennia/server/deprecations.py
@@ -115,7 +115,10 @@ def check_warnings(settings):
         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.]")
-    for k,v in settings.DATABASES.items():
-        if "psycopg" in v.get("ENGINE",None):
-            print(" [Devel: postgresql_psycopg2 backend is deprecated. This module is now called postgresql")
-            print("  Switch settings.DATABASES to use \"ENGINE\": \"django.db.backends.postgresql\"")
+    for dbentry in settings.DATABASES.values():
+        if "psycopg" in dbentry.get("ENGINE", ""):
+            print(
+                'Deprecation: postgresql_psycopg2 backend is deprecated". '
+                "Switch settings.DATABASES to use "
+                '"ENGINE": "django.db.backends.postgresql instead"'
+            )
diff --git a/evennia/server/portal/portal.py b/evennia/server/portal/portal.py
index abbdb7f3a6..27270d7af0 100644
--- a/evennia/server/portal/portal.py
+++ b/evennia/server/portal/portal.py
@@ -190,7 +190,6 @@ class Portal(object):
         self.sessions.disconnect_all()
         if _stop_server:
             self.amp_protocol.stop_server(mode="shutdown")
-
         if not _reactor_stopping:
             # shutting down the reactor will trigger another signal. We set
             # a flag to avoid loops.
diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py
index 27fc43e1a1..eb728863c1 100644
--- a/evennia/utils/dbserialize.py
+++ b/evennia/utils/dbserialize.py
@@ -32,8 +32,7 @@ from django.utils.safestring import SafeString
 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
 
@@ -117,15 +116,13 @@ def _init_globals():
     global _FROM_MODEL_MAP, _TO_MODEL_MAP, _SESSION_HANDLER, _IGNORE_DATETIME_MODELS
     if not _FROM_MODEL_MAP:
         _FROM_MODEL_MAP = defaultdict(str)
-        _FROM_MODEL_MAP.update(dict((c.model, c.natural_key())
-                                    for c in ContentType.objects.all()))
+        _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())
+            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:
@@ -188,8 +185,7 @@ class _SaverMutable(object):
                 )
             self._db_obj.value = self
         else:
-            logger.log_err(
-                "_SaverMutable %s has no root Attribute to save to." % self)
+            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"""
@@ -205,8 +201,7 @@ class _SaverMutable(object):
                 return dat
             elif dtype == dict:
                 dat = _SaverDict(_parent=parent)
-                dat._data.update((key, process_tree(val, dat))
-                                 for key, val in item.items())
+                dat._data.update((key, process_tree(val, dat)) for key, val in item.items())
                 return dat
             elif dtype == set:
                 dat = _SaverSet(_parent=parent)
@@ -582,8 +577,7 @@ def to_pickle(data):
         except TypeError:
             return item
         except Exception:
-            logger.log_error(
-                f"The object {item} of type {type(item)} could not be stored.")
+            logger.log_error(f"The object {item} of type {type(item)} could not be stored.")
             raise
 
     return process_item(data)
diff --git a/evennia/web/urls.py b/evennia/web/urls.py
index 22db55cde6..a617a6289f 100644
--- a/evennia/web/urls.py
+++ b/evennia/web/urls.py
@@ -18,6 +18,5 @@ urlpatterns = [
     # webclient
     path("webclient/", include("evennia.web.webclient.urls")),
     # favicon
-    path("favicon.ico", RedirectView.as_view(
-        url="/media/images/favicon.ico", permanent=False))
+    path("favicon.ico", RedirectView.as_view(url="/media/images/favicon.ico", permanent=False)),
 ]