And the last changes for 1.4

[eatslugs.git] / eatslugs / settings.py

diff --git a/eatslugs/settings.py b/eatslugs/settings.py
index 27227aa092103bae12d2b6d5c6d16c4455d4463c..cd97c9642321868754a6a54fc0ce7482e9c9ddb3 100644 (file)
--- a/eatslugs/settings.py
+++ b/eatslugs/settings.py
@@ -15,12 +15,12 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = os.path.join(topdir, 'eatslugs.db')
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''
-DATABASE_PORT = ''
+DATABASES = {
+    'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': os.path.join(topdir, 'eatslugs.db')
+    }
+}
 
 TIME_ZONE = 'Europe/London'
 
@@ -44,8 +44,8 @@ SECRET_KEY = "".join([random.choice(key_chars) for a in range(0,50)])
 
 # 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',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -70,7 +70,7 @@ INSTALLED_APPS = (
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.core.context_processors.auth',
+    'django.contrib.auth.context_processors.auth',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'generic.context_processors.media',