From ce0a012e518781acd33259df9e20b7317fb8262c Mon Sep 17 00:00:00 2001
From: trhr <sage@limitlessinteractive.com>
Date: Sun, 9 Feb 2020 19:58:21 -0600
Subject: [PATCH] =?UTF-8?q?The=20django.db.backends.postgresql=5Fpsycopg2?=
 =?UTF-8?q?=20module=20is=20deprecated=20in=20favor=20of=20django.db.backe?=
 =?UTF-8?q?nds.postgresql.=20It=E2=80=99s=20been=20an=20alias=20since=20Dj?=
 =?UTF-8?q?ango=201.9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis/postgresql_settings.py                                  | 2 +-
 evennia/settings_default.py                                     | 2 +-
 evennia/typeclasses/migrations/0010_delete_old_player_tables.py | 2 +-
 evennia/utils/picklefield.py                                    | 2 +-
 evennia/utils/utils.py                                          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis/postgresql_settings.py b/.travis/postgresql_settings.py
index 292cb9cc70..c12927af3a 100644
--- a/.travis/postgresql_settings.py
+++ b/.travis/postgresql_settings.py
@@ -40,7 +40,7 @@ SERVERNAME = "testing_mygame"
 
 DATABASES = {
     "default": {
-        "ENGINE": "django.db.backends.postgresql_psycopg2",
+        "ENGINE": "django.db.backends.postgresql",
         "NAME": "evennia",
         "USER": "evennia",
         "PASSWORD": "password",
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index b2a06e328e..5ecafb75b5 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -245,7 +245,7 @@ IN_GAME_ERRORS = True
 # ENGINE - path to the the database backend. Possible choices are:
 #            'django.db.backends.sqlite3', (default)
 #            'django.db.backends.mysql',
-#            'django.db.backends.postgresql_psycopg2',
+#            'django.db.backends.postgresql',
 #            'django.db.backends.oracle' (untested).
 # NAME - database name, or path to the db file for sqlite3
 # USER - db admin (unused in sqlite3)
diff --git a/evennia/typeclasses/migrations/0010_delete_old_player_tables.py b/evennia/typeclasses/migrations/0010_delete_old_player_tables.py
index 0732f0fe99..32e1f80923 100644
--- a/evennia/typeclasses/migrations/0010_delete_old_player_tables.py
+++ b/evennia/typeclasses/migrations/0010_delete_old_player_tables.py
@@ -27,7 +27,7 @@ def _drop_table(db_cursor, table_name):
             db_cursor.execute("SET FOREIGN_KEY_CHECKS=0;")
             db_cursor.execute("DROP TABLE {table};".format(table=table_name))
             db_cursor.execute("SET FOREIGN_KEY_CHECKS=1;")
-        elif _ENGINE == "postgresql_psycopg2":
+        elif _ENGINE == "postgresql":
             db_cursor.execute("ALTER TABLE {table} DISABLE TRIGGER ALL;".format(table=table_name))
             db_cursor.execute("DROP TABLE {table};".format(table=table_name))
             db_cursor.execute("ALTER TABLE {table} ENABLE TRIGGER ALL;".format(table=table_name))
diff --git a/evennia/utils/picklefield.py b/evennia/utils/picklefield.py
index 50408c5949..084fc6d638 100644
--- a/evennia/utils/picklefield.py
+++ b/evennia/utils/picklefield.py
@@ -268,7 +268,7 @@ class PickledObjectField(models.Field):
         """
         if value is not None and not isinstance(value, PickledObject):
             # We call force_str here explicitly, so that the encoded string
-            # isn't rejected by the postgresql_psycopg2 backend. Alternatively,
+            # isn't rejected by the postgresql backend. Alternatively,
             # we could have just registered PickledObject with the psycopg
             # marshaller (telling it to store it like it would a string), but
             # since both of these methods result in the same value being stored,
diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py
index 53fd73de42..cc191fdd53 100644
--- a/evennia/utils/utils.py
+++ b/evennia/utils/utils.py
@@ -1036,7 +1036,7 @@ def uses_database(name="sqlite3"):
     shortcut to having to use the full backend name.
 
     Args:
-        name (str): One of 'sqlite3', 'mysql', 'postgresql_psycopg2'
+        name (str): One of 'sqlite3', 'mysql', 'postgresql'
         or 'oracle'.
 
     Returns: