From 6a2918c288c26ed1503365ded9ceb2f52a7b7d09 2014-07-14 14:49:29
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2014-07-14 14:49:29
Subject: [PATCH] In Django 1.2, feed_dict was deprecated.

Therefore, change this to use the method explained at:

https://docs.djangoproject.com/en/dev/releases/1.2/#feed-in-django-contrib-syndication-feeds

---

diff --git a/www/conservancy/feeds.py b/www/conservancy/feeds.py
index 4b3d03f90409e392b5431a97e4b515e305bb2ddd..aca04afeae248ec7e5f96bd4eee7ec1ab661bcd1 100644
--- a/www/conservancy/feeds.py
+++ b/www/conservancy/feeds.py
@@ -238,13 +238,6 @@ class BlogFeed(ConservancyFeedBase):
         return queryset.order_by('-pub_date')[:10]
 
 
-feed_dict = {
-    'blog': BlogFeed,
-    'news': PressReleaseFeed,
-    'omnibus': OmnibusFeed,
-#    'event-media': RecentEventMediaFeed,
-}
-# make each feed know its canonical url
 
 for k, v in feed_dict.items():
     v.get_absolute_url = '/feeds/%s/' % k
diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py
index 9d9820d09654ed50ddc350f240b07d817670ae37..a2e26368d1755fbda71ede3b6b88c915978d2704 100644
--- a/www/conservancy/urls.py
+++ b/www/conservancy/urls.py
@@ -28,9 +28,9 @@ admin.autodiscover()
 urlpatterns = patterns('',
     (r'^admin/doc/', include('django.contrib.admindocs.urls')),
     (r'^admin/(.*)', admin.site.urls),
-    (r'^$', 'conservancy.frontpage.view'),
-    (r'^feeds/(?P<url>.*)/?$', 'django.contrib.syndication.views.Feed',
-     {'feed_dict': feed_dict}),
+    (r'^feeds/blog/?$', 'django.contrib.syndication.views.Feed', BlogFeed()),
+    (r'^feeds/news/?$', 'django.contrib.syndication.views.Feed', PressReleaseFeed()),
+    (r'^feeds/omnibus/?$', 'django.contrib.syndication.views.Feed', OmnibusFeed()),
     (r'^feeds/?$', 'conservancy.feeds.view'),
     (r'^news(/|$)', include('conservancy.apps.news.urls')),
     (r'^blog(/|$)', include('conservancy.apps.blog.urls')),