diff --git a/www/conservancy/apps/news/urls.py b/www/conservancy/apps/news/urls.py
index 198c3488646c6f5128b6c91dfe2121fba990e7f9..1d621f12dddbf8c9133405912448a7d19033fd24 100644
--- a/www/conservancy/apps/news/urls.py
+++ b/www/conservancy/apps/news/urls.py
@@ -17,10 +17,10 @@
# along with this program in a file in the toplevel directory called
# "AGPLv3". If not, see .
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
from django.conf import settings
from conservancy.apps.news.models import PressRelease, ExternalArticle
-from conservancy.apps.news.views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView
+from conservancy.apps.news.views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView, listing
info_dict = {
'queryset': PressRelease.objects.all().filter(sites__id__exact=settings.SITE_ID),
@@ -31,18 +31,10 @@ external_article_dict = {
'articles': ExternalArticle.objects.all()
}
-urlpatterns = patterns('',
-# (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', 'conservancy.apps.news.views.object_detail', info_dict),
- (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', NewsDateDetailView.as_view(**info_dict)),
-# (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', 'conservancy.apps.news.views.archive_day', info_dict),
- (r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', NewsDayArchiveView.as_view(**info_dict)),
-# (r'^(?P\d{4})/(?P[a-z]{3})/$', 'conservancy.apps.news.views.archive_month', info_dict),
- (r'^(?P\d{4})/(?P[a-z]{3})/$', NewsMonthArchiveView.as_view(**info_dict)),
-# (r'^(?P\d{4})/$', 'conservancy.apps.news.views.archive_year',
-# dict(info_dict, make_object_list=True)),
- (r'^(?P\d{4})/$', NewsYearArchiveView.as_view(**info_dict)),
-)
-
-urlpatterns += patterns('',
- (r'^/?$', 'conservancy.apps.news.views.listing', dict(info_dict, paginate_by=6)),
-)
+urlpatterns = [
+ url(r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/(?P[-\w]+)/$', NewsDateDetailView.as_view(**info_dict)),
+ url(r'^(?P\d{4})/(?P[a-z]{3})/(?P\w{1,2})/$', NewsDayArchiveView.as_view(**info_dict)),
+ url(r'^(?P\d{4})/(?P[a-z]{3})/$', NewsMonthArchiveView.as_view(**info_dict)),
+ url(r'^(?P\d{4})/$', NewsYearArchiveView.as_view(**info_dict)),
+ url(r'^/?$', listing, dict(info_dict, paginate_by=6)),
+]