From cb6f2f10ddd3e2410f6c9cc3536ec83dd50c862d Mon Sep 17 00:00:00 2001
From: Brett Parker <iDunno@sommitrealweird.co.uk>
Date: Sun, 28 Apr 2013 00:15:38 +0100
Subject: [PATCH] Upgrade settings for django 1.4

---
 sommitrealweird/blog/feeds.py |  2 +-
 sommitrealweird/settings.py   | 28 +++++++++++++++++-----------
 sommitrealweird/urls.py       |  4 ++--
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/sommitrealweird/blog/feeds.py b/sommitrealweird/blog/feeds.py
index 064f22a..991d2f0 100644
--- a/sommitrealweird/blog/feeds.py
+++ b/sommitrealweird/blog/feeds.py
@@ -1,4 +1,4 @@
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from blog.models import BlogEntry
 from django.conf import settings
diff --git a/sommitrealweird/settings.py b/sommitrealweird/settings.py
index 41f9656..95ead0a 100644
--- a/sommitrealweird/settings.py
+++ b/sommitrealweird/settings.py
@@ -13,12 +13,12 @@ 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'
 
@@ -33,24 +33,30 @@ USE_I18N = True
 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)]
 
-CACHE_BACKEND = 'file://%s/tmp' %(topdir)
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
+         'LOCATION': '%s/tmp' %(topdir),
+    }
+}
 
 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',
+    'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.middleware.doc.XViewMiddleware',
 )
@@ -76,7 +82,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',
diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 6450746..2aaf73d 100644
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -27,8 +27,8 @@ urlpatterns = patterns('',
     (r'^photo/', include('photo.urls')),
     (r'^photos/', include('photo.urls')),
     (r'^css-doc/(?P<slug>.*)$', 'bpcms.views.css_view'),
-    (r'^feeds/rss/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': rssfeeds_dict}),
-    (r'^feeds/(?P<url>.*)/', 'django.contrib.syndication.views.feed', {'feed_dict': feeds_dict}),
+    (r'^feeds/rss/blog/', LatestBlogEntriesRss()),
+    (r'^feeds/blog/', LatestBlogEntries()),
     (r'^comments/', include('django.contrib.comments.urls')),
     (r'^(?:content/|)', include('bpcms.urls'))
 )
-- 
2.39.5