summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/db/__init__.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/django/db/__init__.py b/django/db/__init__.py
index 7136b2f258..9bfe4659bf 100644
--- a/django/db/__init__.py
+++ b/django/db/__init__.py
@@ -12,11 +12,12 @@ __all__ = ('backend', 'connection', 'connections', 'router', 'DatabaseError',
# 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.",
- PendingDeprecationWarning
- )
+ if settings.DATABASE_ENGINE:
+ import warnings
+ warnings.warn(
+ "settings.DATABASE_* is deprecated; use settings.DATABASES instead.",
+ PendingDeprecationWarning
+ )
settings.DATABASES[DEFAULT_DB_ALIAS] = {
'ENGINE': settings.DATABASE_ENGINE,