Commit 10a12cd6 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #15336 -- Silenced a warning about the DATABASES transition when... 

[1.2.X] Fixed #15336 -- Silenced a warning about the DATABASES transition when a database backend isn't specified. Thanks to Ivan Sagalaev for the report and patch.

Backport of r15571 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15575 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 19fa3bce

django/db/__init__.py

+6 −5
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ __all__ = ('backend', 'connection', 'connections', 'router', 'DatabaseError', 
# For backwards compatibility - Port any old database settings over to

# the new values.

if not settings.DATABASES:

    if settings.DATABASE_ENGINE:

        import warnings

        warnings.warn(

            "settings.DATABASE_* is deprecated; use settings.DATABASES instead.",