From 169365dfb45177fbe642a17bff7cfb6b70bf0498 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 8 Apr 2011 16:44:25 +0200 Subject: [PATCH] Removed deprecation warnings. see #130 --- settings_sample.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/settings_sample.py b/settings_sample.py index 7765235e7..f7b55d9e7 100644 --- a/settings_sample.py +++ b/settings_sample.py @@ -13,12 +13,16 @@ ADMINS = ( MANAGERS = ADMINS -DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. -DATABASE_NAME = 'modoboa' # Or path to database file if using sqlite3. -DATABASE_USER = '' # Not used with sqlite3. -DATABASE_PASSWORD = '' # Not used with sqlite3. -DATABASE_HOST = '' # Set to empty string for localhost. Not used with sqlite3. -DATABASE_PORT = '' # Set to empty string for default. Not used with sqlite3. +DATABASES = { + "default" : { + "ENGINE" : "", + "NAME" : "modoboa", + "USER" : "", + "PASSWORD" : "", + "HOST" : "", + "PORT" : "" + } +} # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -58,8 +62,8 @@ SECRET_KEY = '2)e+la#y$1b&v!p)s^&4lwpc92o59fye)mj^3^7$jytmvx379d' # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', # 'django.template.loaders.eggs.load_template_source', )