[SCM] UNNAMED PROJECT branch, master, updated. 25d29d8c96f310203004a481bb2df01710b9e39c

[Michal Cihar]

The following commit has been merged in the master branch:
commit 25d29d8c96f310203004a481bb2df01710b9e39c
Author: Michal Čihař <***@cihar.com>
Date: Mon Apr 2 10:51:12 2012 +0200

Use new feeds syntax

diff --git a/urls.py b/urls.py
index b39d87c..a12458e 100644
--- a/urls.py
+++ b/urls.py
@@ -9,16 +9,6 @@ from downloads.models import Release
import os
import datetime

-newsfeeds = {
- 'rss': RssNewsFeed,
- 'atom': AtomNewsFeed,
-}
-
-phonesfeeds = {
- 'rss': RssPhonesFeed,
- 'atom': AtomPhonesFeed,
-}
-
news_dict = {
'queryset': Entry.objects.all(),
'date_field': 'pub_date',
@@ -138,8 +128,9 @@ urlpatterns = patterns('',
(r'^tools/networks/$', 'tools.views.networks'),

# RSS feeds
- (r'^news/(?P<url>(rss|atom).*)/$', 'django.contrib.syndication.views.feed',
- {'feed_dict': newsfeeds}),
+ (r'^news/rss/$', RssNewsFeed),
+ (r'^news/atom': AtomNewsFeed),
+}

# News
(r'^news/$', 'news.views.index'),
@@ -153,8 +144,10 @@ urlpatterns = patterns('',
(r'^download/(?P<program>[^/]*)/(?P<platform>[^/]*)/$', 'downloads.views.list'),

# RSS feeds
- (r'^phones/(?P<url>(rss|atom).*)/$', 'django.contrib.syndication.views.feed',
- {'feed_dict': phonesfeeds}),
+ (r'^phones/rss/$', RssPhonesFeed),
+ (r'^phones/atom/$', AtomPhonesFeed),
+
+
(r'^phones/csv/$', 'phonedb.views.phones_csv'),

# Phone database