Ticket #14595: 14595.diff

__init__.py

@@ -12 +12 @@
 # For backwards compatibility - Port any old database settings over to
 # the new values.
 if not settings.DATABASES:
-    import warnings
-    warnings.warn(
-        "settings.DATABASE_* is deprecated; use settings.DATABASES instead.",
-        DeprecationWarning
-    )
+    import warnings, pprint
 
     settings.DATABASES[DEFAULT_DB_ALIAS] = {
         'ENGINE': settings.DATABASE_ENGINE,
@@ -30 +26 @@
         'TEST_COLLATION': settings.TEST_DATABASE_COLLATION,
         'TEST_NAME': settings.TEST_DATABASE_NAME,
     }
+    warnings.warn(
+        "settings.DATABASE_* is deprecated; instead use\nDATABASES =  {'default': %s }" % pprint.pformat( settings.DATABASES[DEFAULT_DB_ALIAS] ),
+        DeprecationWarning
+    )
+    
 
 if DEFAULT_DB_ALIAS not in settings.DATABASES:
     raise ImproperlyConfigured("You must define a '%s' database" % DEFAULT_DB_ALIAS)
@@ -53 +54 @@
             else:
                 full_engine = 'django.contrib.gis.db.backends.%s' % database['ENGINE']
         else:
+            full_engine = "django.db.backends.%s" % database['ENGINE']
             warnings.warn(
                 "Short names for ENGINE in database configurations are deprecated. "
-                "Prepend %s.ENGINE with 'django.db.backends.'" % alias,
+                "Prepend %s.ENGINE with 'django.db.backends.'\n %s" 
+                    % (alias, full_engine),
                 DeprecationWarning
             )
-            full_engine = "django.db.backends.%s" % database['ENGINE']
         database['ENGINE'] = full_engine
 
 connections = ConnectionHandler(settings.DATABASES)