From 85e391e7781464514b9df6e7b6936515c3db6c46 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Tue, 19 Apr 2011 13:18:45 +0800 Subject: [PATCH] settings: Use multiple-DB-style format for default settings The DATABASE_* settings have been deprecated in django 1.3, replaced by the multiple-database style format (introduced in 1.2, which patchwork requires anyway). This change modifies the default settings.py to use the new format. Signed-off-by: Jeremy Kerr --- apps/settings.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/settings.py b/apps/settings.py index f56da70..24d3762 100644 --- a/apps/settings.py +++ b/apps/settings.py @@ -10,12 +10,12 @@ ADMINS = ( MANAGERS = ADMINS -DATABASE_ENGINE = 'postgresql_psycopg2' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. -DATABASE_NAME = 'patchwork' # 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': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'patchwork', + }, +} # Local time zone for this installation. Choices can be found here: # http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE -- 2.39.2