Changeset 355

Timestamp:

07/19/10 22:57:28 (7 weeks ago)

Author:

nicholas

Message:

Feeds now use new framework and require Django 1.2.
The Tags feed now works as expected.

Location:

Python/blog/trunk

Files:

• Changes (modified) (1 diff)
• blog/feeds.py (modified) (4 diffs)
• blog/urls.py (modified) (2 diffs)

Python/blog/trunk/Changes

@@ -6 +6 @@
    provided by Carson Gee.)
  - Added month_calendar template tag.
+ - Migrated to new feeds framework (Now reuqire Django 1.2)
+ - Feed by tag now works as expected. You can specify one custom tag to
+   get a individualized feed.
  
 1.2 (May  3 2010):

Python/blog/trunk/blog/feeds.py

@@ -1 @@
-from django.contrib.syndication.feeds import Feed
+from django.contrib.syndication.views import Feed
 from django.contrib.sites.models import Site
 from django.contrib.comments.feeds import LatestCommentFeed
@@ -5 +5 @@
 from django.shortcuts import get_object_or_404
 
-from blog.models import Entry
+from blog.models import Entry, Tag
 
-class LatestEntries(Feed):
+class LatestEntriesFeed(Feed):
     _site = Site.objects.get_current()
     title = '%s feed' % _site.name
     description = '%s posts feed.' % _site.name
 
-    def link(self):
-        return reverse('entry_index')
+    def items(self):
+        return Entry.objects.published()[:10]
 
     def item_pubdate(self, obj):
         return obj.pub_date
 
-    def items(self):
-        return Entry.objects.published()[:10]
+    def link(self):
+        return reverse('entry_index')
+
 
 class LatestEntriesByTag(Feed):
@@ -25 +26 @@
 
     def get_object(self, request, tag):
-        return get_object_or_404(Tag, slug=tag)
+        return get_object_or_404(Tag, tag=tag)
 
     def title(self, obj):
-        return '%s feed: %s' % [_site.name, obj.tag]
+        return '%s feed: %s' % (self._site.name, obj.tag)
 
     def description(self, obj):
-        return '%s posts feed for %s' % [_site.name, obj.tag]
+        return '%s posts feed for %s' % (self._site.name, obj.tag)
 
     def link(self, obj):
-        return reverse('tag_list', ident=obj.tag)
+        return reverse('tag_list', args=[obj.tag])
 
     def item_pubdate(self, obj):
@@ -43 +44 @@
 
 class LatestComments(LatestCommentFeed):
+    # Accept all of the contrib.comments defaults.
     pass
-    # Accept all of the contrib.comments defaults.

Python/blog/trunk/blog/urls.py

@@ -1 +1 @@
 from django.conf.urls.defaults import *
-from blog.feeds import LatestEntriesByTag, LatestEntries, LatestComments
+from blog.feeds import LatestEntriesByTag, LatestEntriesFeed, LatestComments
 
-feeds = {   
-    'latest': LatestEntries,
-    'tags': LatestEntriesByTag,
-    'comments': LatestComments,
-}
 
 urlpatterns = patterns('',
@@ -46 +41 @@
 
     # /feeds/tags, /feeds/latest,
-    url(r'^feeds/(?P<url>.*)/?$', 'django.contrib.syndication.views.feed',
-            {'feed_dict': feeds}),
+    url(r'^feeds/latest/?$', LatestEntriesFeed(), 
+        name='feed_latest'),
+
+    url(r'^feeds/tags/(?P<tag>[-\w]+)/?$', LatestEntriesByTag(), 
+        name='feed_tags' ),
+
+    url(r'^feeds/comments/?$', LatestComments(), name='feed_comments' ),
 
     url(r'^comments/', include('django.contrib.comments.urls')),