From 89cae2bcb5610fa50d70e47bf74853bb04dbca9c Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 8 Jun 2010 10:52:53 -0500 Subject: Update feeds to new 1.2 framework Feeds are now views-based and don't need the dictionary anymore. get_object() now takes named arguments as well making it a bit more understandable when reading the code. Signed-off-by: Dan McGee --- urls.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 8fe7d7d..64e60cc 100644 --- a/urls.py +++ b/urls.py @@ -10,12 +10,6 @@ from main.models import Todolist from feeds import PackageFeed, NewsFeed from sitemaps import NewsSitemap, PackagesSitemap, PackageFilesSitemap - -feeds = { - 'news': NewsFeed, - 'packages': PackageFeed, -} - sitemaps = { 'news': NewsSitemap, 'packages': PackagesSitemap, @@ -85,8 +79,12 @@ urlpatterns = patterns('', # Feeds and sitemaps (r'^feeds/$', 'public.views.feeds', {}, 'feeds-list'), - (r'^feeds/(?P.*)/$', - 'django.contrib.syndication.views.feed', {'feed_dict': feeds}), + (r'^feeds/news/$', NewsFeed()), + (r'^feeds/packages/$', PackageFeed()), + (r'^feeds/packages/(?P[A-z0-9]+)/$', + PackageFeed()), + (r'^feeds/packages/(?P[A-z0-9]+)/(?P[A-z0-9\-]+)/$', + PackageFeed()), (r'^sitemap.xml$', 'django.contrib.sitemaps.views.index', {'sitemaps': sitemaps}), (r'^sitemap-(?P
.+)\.xml$', 'django.contrib.sitemaps.views.sitemap', -- cgit v1.2.3-24-g4f1b