Changeset 1336

Timestamp:

11/21/05 08:56:06 (3 years ago)

Author:

jacob

Message:

Upgraded djangoproject.com feeds to use new syndication framework

Files:

• djangoproject.com/django_website/apps/aggregator/feeds.py (added)
• djangoproject.com/django_website/apps/blog/feeds.py (added)
• djangoproject.com/django_website/settings/main_rss.py (deleted)
• djangoproject.com/django_website/settings/urls/main.py (modified) (3 diffs)

djangoproject.com/django_website/settings/urls/main.py

@@ -1 +1 @@
-from django.conf.urls.defaults import *
+from django.contrib.comments.feeds import LatestFreeCommentsFeed
+from django_website.apps.aggregator.feeds import CommunityAggregatorFeed
+from django_website.apps.blog.feeds import WeblogEntryFeed
-
-comments_info_dict = {
@@ -14 +17 @@
-}
-
+feeds = {
+    'weblog' : WeblogEntryFeed,
+    'comments' : LatestFreeCommentsFeed,
+    'community' : CommunityAggregatorFeed,
+}
+
-urlpatterns = patterns('',
-    (r'^weblog/', include('django_website.apps.blog.urls.blog')),
@@ -20 +29 @@
-    (r'^comments/', include('django.contrib.comments.urls.comments')),
-    (r'^community/$', 'django.views.generic.list_detail.object_list', aggregator_info_dict),
-', include('django.conf.urls.rss')
+(?P<url>.*)/$', 'django.contrib.syndication.views.feed', {'feed_dict': feeds}
-    (r'', include('django.contrib.flatpages.urls')),
-)