Change urls.py from patterns to list of url()

Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>

1 files changed, 63 insertions, 61 deletions

diff --git a/urls.py b/urls.py
index 081331e0..3205100c 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,7 @@
-from django.conf.urls import include, patterns
+from django.conf.urls import include, url
 from django.contrib import admin
 from django.contrib.sitemaps import views as sitemap_views
+from django.contrib.auth import views as auth_views
 
 from django.views.decorators.cache import cache_page
 from django.views.generic import TemplateView
@@ -8,6 +9,18 @@ from django.views.generic import TemplateView
 from feeds import PackageFeed, NewsFeed, ReleaseFeed
 import sitemaps
 
+import devel.urls
+import mirrors.urls
+import mirrors.urls_mirrorlist
+import news.urls
+import packages.urls
+import packages.urls_groups
+import public.views
+import releng.urls
+import retro.views
+import todolists.urls
+import visualize.urls
+
 our_sitemaps = {
     'base':           sitemaps.BaseSitemap,
     'news':           sitemaps.NewsSitemap,
@@ -24,79 +37,68 @@ news_sitemaps = {'news': sitemaps.RecentNewsSitemap}
 urlpatterns = []
 
 # Public pages
-urlpatterns += patterns('public.views',
-    (r'^$', 'index', {}, 'index'),
-    (r'^about/$', TemplateView.as_view(template_name='public/about.html'),
-        {}, 'page-about'),
-    (r'^art/$',   TemplateView.as_view(template_name='public/art.html'),
-        {}, 'page-art'),
-    (r'^svn/$',   TemplateView.as_view(template_name='public/svn.html'),
-        {}, 'page-svn'),
-    (r'^donate/$',       'donate',   {}, 'page-donate'),
-    (r'^download/$',     'download', {}, 'page-download'),
-    (r'^master-keys/$',  'keys',     {}, 'page-keys'),
-    (r'^master-keys/json/$', 'keys_json', {}, 'pgp-keys-json'),
-    (r'^people/(?P<slug>[-\w]+)/$', 'people', {}, 'people'),
-)
+urlpatterns.extend([
+    url(r'^$', public.views.index),
+    url(r'^about/$', TemplateView.as_view(template_name='public/about.html'), name='page-about'),
+    url(r'^art/$',   TemplateView.as_view(template_name='public/art.html'), name='page-art'),
+    url(r'^svn/$',   TemplateView.as_view(template_name='public/svn.html'), name='page-svn'),
+    url(r'^donate/$', public.views.donate, name='page-donate'),
+    url(r'^download/$', public.views.download, name='page-download'),
+    url(r'^master-keys/$', public.views.keys, name='page-keys'),
+    url(r'^master-keys/json/$', public.views.keys_json, name='pgp-keys-json'),
+    url(r'^people/(?P<slug>[-\w]+)/$', public.views.people, name='people'),
+])
 
 # Feeds patterns, used below
-feeds_patterns = patterns('',
-    (r'^$',          'public.views.feeds', {}, 'feeds-list'),
-    (r'^news/$',     cache_page(311)(NewsFeed())),
-    (r'^packages/$', cache_page(313)(PackageFeed())),
-    (r'^packages/(?P<arch>[A-z0-9]+)/$',
-        cache_page(313)(PackageFeed())),
-    (r'^packages/all/(?P<repo>[A-z0-9\-]+)/$',
-        cache_page(313)(PackageFeed())),
-    (r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$',
-        cache_page(313)(PackageFeed())),
-    (r'^releases/$', cache_page(317)(ReleaseFeed())),
-)
+feeds_patterns = [
+    url(r'^$', public.views.feeds, name='feeds-list'),
+    url(r'^news/$', cache_page(311)(NewsFeed())),
+    url(r'^packages/$', cache_page(313)(PackageFeed())),
+    url(r'^packages/(?P<arch>[A-z0-9]+)/$', cache_page(313)(PackageFeed())),
+    url(r'^packages/all/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageFeed())),
+    url(r'^packages/(?P<arch>[A-z0-9]+)/(?P<repo>[A-z0-9\-]+)/$', cache_page(313)(PackageFeed())),
+    url(r'^releases/$', cache_page(317)(ReleaseFeed())),
+]
 
 # Includes and other remaining stuff
-urlpatterns += patterns('',
-    (r'^admin/',     include(admin.site.urls)),
-    (r'^devel/',     include('devel.urls')),
-    (r'^feeds/',     include(feeds_patterns)),
-    (r'^groups/',    include('packages.urls_groups')),
-    (r'^mirrorlist/',include('mirrors.urls_mirrorlist')),
-    (r'^mirrors/',   include('mirrors.urls')),
-    (r'^news/',      include('news.urls')),
-    (r'^packages/',  include('packages.urls')),
-    (r'^releng/',    include('releng.urls')),
-    (r'^todo/',      include('todolists.urls')),
-    (r'^visualize/', include('visualize.urls')),
-    (r'^opensearch/packages/$', 'packages.views.opensearch',
-        {}, 'opensearch-packages'),
-    (r'^opensearch/packages/suggest$', 'packages.views.opensearch_suggest',
-        {}, 'opensearch-packages-suggest'),
-)
+urlpatterns.extend([
+    url(r'^admin/',     include(admin.site.urls)),
+    url(r'^devel/',     include(devel.urls)),
+    url(r'^feeds/',     include(feeds_patterns)),
+    url(r'^groups/',    include(packages.urls_groups)),
+    url(r'^mirrorlist/',include(mirrors.urls_mirrorlist)),
+    url(r'^mirrors/',   include(mirrors.urls)),
+    url(r'^news/',      include(news.urls)),
+    url(r'^packages/',  include(packages.urls)),
+    url(r'^releng/',    include(releng.urls)),
+    url(r'^todo/',      include(todolists.urls)),
+    url(r'^visualize/', include(visualize.urls)),
+    url(r'^opensearch/packages/$', packages.views.opensearch, name='opensearch-packages'),
+    url(r'^opensearch/packages/suggest$', packages.views.opensearch_suggest, name='opensearch-packages-suggest'),
+])
 
 # Retro home page views
-urlpatterns += patterns('retro.views',
-    (r'^retro/(?P<year>[0-9]{4})/$', 'retro_homepage', {}, 'retro-homepage'),
-)
+urlpatterns.extend([
+    url(r'^retro/(?P<year>[0-9]{4})/$', retro.views.retro_homepage, name='retro-homepage'),
+])
 
 # Sitemaps
-urlpatterns += patterns('',
-    (r'^sitemap.xml$',
-        cache_page(1831)(sitemap_views.index),
+urlpatterns.extend([
+    url(r'^sitemap.xml$', cache_page(1831)(sitemap_views.index),
         {'sitemaps': our_sitemaps, 'sitemap_url_name': 'sitemaps'}),
-    (r'^sitemap-(?P<section>.+)\.xml$',
-        cache_page(1831)(sitemap_views.sitemap),
+    url(r'^sitemap-(?P<section>.+)\.xml$', cache_page(1831)(sitemap_views.sitemap),
         {'sitemaps': our_sitemaps, 'template_name': 'sitemaps/sitemap.xml'},
-        'sitemaps'),
-    (r'^news-sitemap\.xml$',
-        cache_page(1831)(sitemap_views.sitemap),
+        name='sitemaps'),
+    url(r'^news-sitemap\.xml$', cache_page(1831)(sitemap_views.sitemap),
         {'sitemaps': news_sitemaps, 'template_name': 'sitemaps/news_sitemap.xml'},
-        'news-sitemap'),
-)
+        name='news-sitemap'),
+])
 
 # Authentication
-urlpatterns += patterns('django.contrib.auth.views',
-    (r'^login/$', 'login', {'template_name': 'registration/login.html'}, 'login'),
-    (r'^logout/$', 'logout', {'template_name': 'registration/logout.html'}, 'logout'),
-)
+urlpatterns.extend([
+    url(r'^login/$', auth_views.login, {'template_name': 'registration/login.html'}, name='login'),
+    url(r'^logout/$', auth_views.logout, {'template_name': 'registration/logout.html'}, name='logout'),
+])
 
 
 def show_urls(urllist=urlpatterns, depth=0):