Stop using an array as a cache key

[sommitrealweird.git] / sommitrealweird / settings.py

diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index cc4b236e7c62d97891f6fc6a2b632b96cf1621c7..95ead0af9503abad2d07062952eb71ac66b1076c 100644 (file)
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -13,12 +13,12 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
 
 MANAGERS = ADMINS
 

-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = os.path.join(topdir, 'sommitrealweird.db')
-DATABASE_USER = ''
-DATABASE_PASSWORD = ''
-DATABASE_HOST = ''
-DATABASE_PORT = ''
+DATABASES = {
+    'default': {
+            'ENGINE': 'django.db.backends.sqlite3',
+            'NAME': os.path.join(topdir, 'sommitrealweird.db')
+    }
+}

 
 TIME_ZONE = 'Europe/London'
 
 
 TIME_ZONE = 'Europe/London'
 


@@ -33,24 +33,31 @@ USE_I18N = True
 MEDIA_ROOT = os.path.join(topdir, 'media') + os.sep
 MEDIA_URL = '/media/'
 
 MEDIA_ROOT = os.path.join(topdir, 'media') + os.sep
 MEDIA_URL = '/media/'
 

-ADMIN_MEDIA_PREFIX = '/admin-media/'
+STATIC_URL = '/static/'

 
 import random
 import string
 key_chars = "%s%s%s" % (string.letters, string.digits, '+-()_#~')
 SECRET_KEY = [random.choice(key_chars) for a in range(0,50)]
 
 
 import random
 import string
 key_chars = "%s%s%s" % (string.letters, string.digits, '+-()_#~')
 SECRET_KEY = [random.choice(key_chars) for a in range(0,50)]
 

-CACHE_BACKEND = 'file://%s/tmp' %(topdir)
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+         'LOCATION': '%s/tmp' %(topdir),
+    }
+}

 
 TEMPLATE_LOADERS = (
 
 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 = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 )
 
 MIDDLEWARE_CLASSES = (
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',

     'django.middleware.doc.XViewMiddleware',
 )
 
     'django.middleware.doc.XViewMiddleware',
 )
 


@@ -67,6 +74,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.markup',
     'django.contrib.sites',
     'django.contrib.admin',
     'django.contrib.markup',

+    'django.contrib.comments',

     'bpcms',
     'generic',
     'blog',
     'bpcms',
     'generic',
     'blog',


@@ -74,7 +82,7 @@ INSTALLED_APPS = (
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
 )
 
 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',
     'django.core.context_processors.debug',
     'django.core.context_processors.i18n',
     'generic.context_processors.media',


@@ -82,6 +90,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'bpcms.context_processors.content_submenu',
     'bpcms.context_processors.content_breadcrumb',
     'blog.context_processors.content_breadcrumb',
     'bpcms.context_processors.content_submenu',
     'bpcms.context_processors.content_breadcrumb',
     'blog.context_processors.content_breadcrumb',

+    'blog.context_processors.blog_feed',

     'photo.context_processors.content_breadcrumb',
 )
 
     'photo.context_processors.content_breadcrumb',
 )
 


@@ -89,7 +98,7 @@ APPEND_SLASH=False
 
 RESTRUCTUREDTEXT_FILTER_SETTINGS = {
     'initial_header_level': 2,
 
 RESTRUCTUREDTEXT_FILTER_SETTINGS = {
     'initial_header_level': 2,

-    'compact_field_list': 0,
+    'doctitle_xform': False,

 }
 
 BPCMS_ROOT = '/'
 }
 
 BPCMS_ROOT = '/'


@@ -101,6 +110,7 @@ BPCMS_DISALLOWED_ROOT_DOC_NAMES = (
 
 BLOG_ROOT = '/blog/'
 BLOG_TITLE = u'The World of SommitRealWeird.'
 
 BLOG_ROOT = '/blog/'
 BLOG_TITLE = u'The World of SommitRealWeird.'

+BLOG_FEED_ROOT = '/feeds/blog/'

 
 try:
     from localsettings import *
 
 try:
     from localsettings import *