Merge pull request #2050 from trhr/django3

Django3

evennia/server/deprecations.py

@@ -115,3 +115,7 @@ 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\"")

evennia/server/initial_setup.py

@@ -9,7 +9,7 @@ Everything starts at handle_setup()
 
 import time
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from evennia.accounts.models import AccountDB
 from evennia.server.models import ServerConfig
 from evennia.utils import create, logger

evennia/server/server.py

@@ -38,7 +38,7 @@ from evennia.utils import logger
 from evennia.comms import channelhandler
 from evennia.server.sessionhandler import SESSIONS
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _SA = object.__setattr__
 

evennia/server/serversession.py

@@ -23,7 +23,7 @@ _ObjectDB = None
 _ANSI = None
 
 # i18n
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 # Handlers for Session.db/ndb operation
 

evennia/server/sessionhandler.py

@@ -67,7 +67,7 @@ PSTATUS = chr(18)  # ping server or portal status
 SRESET = chr(19)  # server shutdown in reset mode
 
 # i18n
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 _SERVERNAME = settings.SERVERNAME
 _MULTISESSION_MODE = settings.MULTISESSION_MODE