Upgrade settings for django 1.4

[sommitrealweird.git] / sommitrealweird / blog / feeds.py

diff --git a/sommitrealweird/blog/feeds.py b/sommitrealweird/blog/feeds.py
index d08456f1564ea3aaf98368a119f050ab9851f521..991d2f0c7271dd3fa3893b798e76357bad144705 100644 (file)
--- a/sommitrealweird/blog/feeds.py
+++ b/sommitrealweird/blog/feeds.py
@@ -1,10 +1,9 @@
-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
 
-class LatestBlogEntries(Feed):
-    feed_type = Atom1Feed
+class LatestBlogEntriesRss(Feed):
     title = settings.BLOG_TITLE
     description = u'Updates on %s' %(title,)
     link = settings.BLOG_ROOT
@@ -14,9 +13,25 @@ class LatestBlogEntries(Feed):
 
     def items(self):
         try:
-            return BlogEntry.objects.all().order_by('-publish_date')[:20]
+            return BlogEntry.objects.filter(islive=True).order_by('-publish_date')[:20]
         except:
-            return BlogEntry.objects.all().order_by('-publish_date')
+            return BlogEntry.objects.filter(islive=True).order_by('-publish_date')
+
+    def author_name(self, obj):
+        return "Brett Parker"
+
+    def author_email(self, obj):
+        return "iDunno@sommitrealweird.co.uk"
+
+    def item_author_name(self, obj):
+        return "Brett Parker"
+
+    def item_author_email(self, obj):
+        return "iDunno@sommitrealweird.co.uk"
 
     def item_pubdate(self, obj):
         return obj.publish_date
+
+class LatestBlogEntries(LatestBlogEntriesRss):
+    feed_type = Atom1Feed
+    subtitle = LatestBlogEntriesRss.description