Fixed #25175 -- Renamed the postgresql_psycopg2 database backend to postgresql.

16 files changed, 15 insertions, 9 deletions

diff --git a/django/contrib/gis/db/backends/postgis/base.py b/django/contrib/gis/db/backends/postgis/base.py
index fc8a16d97f..203e3ba075 100644
--- a/django/contrib/gis/db/backends/postgis/base.py
+++ b/django/contrib/gis/db/backends/postgis/base.py
@@ -1,5 +1,5 @@
 from django.db.backends.base.base import NO_DB_ALIAS
-from django.db.backends.postgresql_psycopg2.base import \
+from django.db.backends.postgresql.base import \
     DatabaseWrapper as Psycopg2DatabaseWrapper
 
 from .features import DatabaseFeatures
diff --git a/django/contrib/gis/db/backends/postgis/features.py b/django/contrib/gis/db/backends/postgis/features.py
index 3fad9e70c0..ea1d450008 100644
--- a/django/contrib/gis/db/backends/postgis/features.py
+++ b/django/contrib/gis/db/backends/postgis/features.py
@@ -1,5 +1,5 @@
 from django.contrib.gis.db.backends.base.features import BaseSpatialFeatures
-from django.db.backends.postgresql_psycopg2.features import \
+from django.db.backends.postgresql.features import \
     DatabaseFeatures as Psycopg2DatabaseFeatures
 
 
diff --git a/django/contrib/gis/db/backends/postgis/introspection.py b/django/contrib/gis/db/backends/postgis/introspection.py
index 7f231a578a..71aa57f163 100644
--- a/django/contrib/gis/db/backends/postgis/introspection.py
+++ b/django/contrib/gis/db/backends/postgis/introspection.py
@@ -1,6 +1,5 @@
 from django.contrib.gis.gdal import OGRGeomType
-from django.db.backends.postgresql_psycopg2.introspection import \
-    DatabaseIntrospection
+from django.db.backends.postgresql.introspection import DatabaseIntrospection
 
 
 class GeoIntrospectionError(Exception):
diff --git a/django/contrib/gis/db/backends/postgis/operations.py b/django/contrib/gis/db/backends/postgis/operations.py
index 31406e6506..e5bb115b71 100644
--- a/django/contrib/gis/db/backends/postgis/operations.py
+++ b/django/contrib/gis/db/backends/postgis/operations.py
@@ -11,8 +11,7 @@ from django.contrib.gis.db.backends.utils import SpatialOperator
 from django.contrib.gis.geometry.backend import Geometry
 from django.contrib.gis.measure import Distance
 from django.core.exceptions import ImproperlyConfigured
-from django.db.backends.postgresql_psycopg2.operations import \
-    DatabaseOperations
+from django.db.backends.postgresql.operations import DatabaseOperations
 from django.db.utils import ProgrammingError
 from django.utils.functional import cached_property
 
diff --git a/django/contrib/gis/db/backends/postgis/schema.py b/django/contrib/gis/db/backends/postgis/schema.py
index 8c2cb38608..8b4444b213 100644
--- a/django/contrib/gis/db/backends/postgis/schema.py
+++ b/django/contrib/gis/db/backends/postgis/schema.py
@@ -1,4 +1,4 @@
-from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor
+from django.db.backends.postgresql.schema import DatabaseSchemaEditor
 
 
 class PostGISSchemaEditor(DatabaseSchemaEditor):
diff --git a/django/db/backends/postgresql_psycopg2/__init__.py b/django/db/backends/postgresql/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/django/db/backends/postgresql_psycopg2/__init__.py
+++ b/django/db/backends/postgresql/__init__.py
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql/base.py
index af616e48c4..af616e48c4 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql/base.py
diff --git a/django/db/backends/postgresql_psycopg2/client.py b/django/db/backends/postgresql/client.py
index 5e3e288301..5e3e288301 100644
--- a/django/db/backends/postgresql_psycopg2/client.py
+++ b/django/db/backends/postgresql/client.py
diff --git a/django/db/backends/postgresql_psycopg2/creation.py b/django/db/backends/postgresql/creation.py
index 13eea0d3b7..13eea0d3b7 100644
--- a/django/db/backends/postgresql_psycopg2/creation.py
+++ b/django/db/backends/postgresql/creation.py
diff --git a/django/db/backends/postgresql_psycopg2/features.py b/django/db/backends/postgresql/features.py
index a07700e601..a07700e601 100644
--- a/django/db/backends/postgresql_psycopg2/features.py
+++ b/django/db/backends/postgresql/features.py
diff --git a/django/db/backends/postgresql_psycopg2/introspection.py b/django/db/backends/postgresql/introspection.py
index 9b3e9074b2..9b3e9074b2 100644
--- a/django/db/backends/postgresql_psycopg2/introspection.py
+++ b/django/db/backends/postgresql/introspection.py
diff --git a/django/db/backends/postgresql_psycopg2/operations.py b/django/db/backends/postgresql/operations.py
index 866e2ca38b..866e2ca38b 100644
--- a/django/db/backends/postgresql_psycopg2/operations.py
+++ b/django/db/backends/postgresql/operations.py
diff --git a/django/db/backends/postgresql_psycopg2/schema.py b/django/db/backends/postgresql/schema.py
index bc03a12e8d..bc03a12e8d 100644
--- a/django/db/backends/postgresql_psycopg2/schema.py
+++ b/django/db/backends/postgresql/schema.py
diff --git a/django/db/backends/postgresql_psycopg2/utils.py b/django/db/backends/postgresql/utils.py
index 2c03ab36cd..2c03ab36cd 100644
--- a/django/db/backends/postgresql_psycopg2/utils.py
+++ b/django/db/backends/postgresql/utils.py
diff --git a/django/db/backends/postgresql_psycopg2/version.py b/django/db/backends/postgresql/version.py
index d558fb2e51..d558fb2e51 100644
--- a/django/db/backends/postgresql_psycopg2/version.py
+++ b/django/db/backends/postgresql/version.py
diff --git a/django/db/utils.py b/django/db/utils.py
index 64d44a715b..380a4b9554 100644
--- a/django/db/utils.py
+++ b/django/db/utils.py
@@ -104,7 +104,14 @@ class DatabaseErrorWrapper(object):
 
 
 def load_backend(backend_name):
-    # Look for a fully qualified database backend name
+    """
+    Return a database backend's "base" module given a fully qualified database
+    backend name, or raise an error if it doesn't exist.
+    """
+    # This backend was renamed in Django 1.9.
+    if backend_name == 'django.db.backends.postgresql_psycopg2':
+        backend_name = 'django.db.backends.postgresql'
+
     try:
         return import_module('%s.base' % backend_name)
     except ImportError as e_user:
@@ -114,7 +121,8 @@ def load_backend(backend_name):
         try:
             builtin_backends = [
                 name for _, name, ispkg in pkgutil.iter_modules([npath(backend_dir)])
-                if ispkg and name not in {'base', 'dummy'}]
+                if ispkg and name not in {'base', 'dummy', 'postgresql_psycopg2'}
+            ]
         except EnvironmentError:
             builtin_backends = []
         if backend_name not in ['django.db.backends.%s' % b for b in