From 8c22ddde36d1a7d46f8226727478334890c63da4 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Sat, 16 Apr 2011 19:26:23 +0200 Subject: [PATCH] fix DeprecationWarnings about DATABASES setting by converting to the new Django style --- pyweb/settings.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pyweb/settings.py b/pyweb/settings.py index 310edc7..52cb172 100644 --- a/pyweb/settings.py +++ b/pyweb/settings.py @@ -157,12 +157,16 @@ elif MUMBLE_DJANGO_URL[-1] != '/': # Database settings for Mumble-Django's database. These do NOT need to point # to Murmur's database, Mumble-Django should use its own! -DATABASE_ENGINE = 'sqlite3' -DATABASE_NAME = join( MUMBLE_DJANGO_ROOT, 'db', 'mumble-django.db3' ) -DATABASE_USER = '' -DATABASE_PASSWORD = '' -DATABASE_HOST = '' -DATABASE_PORT = '' +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': join( MUMBLE_DJANGO_ROOT, 'db', 'mumble-django.db3' ), + 'USER': '', + 'PASSWORD': '', + 'HOST': '', + 'PORT': '', + } + } # Email settings. only change if the defaults don't work #EMAIL_HOST = "localhost"