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

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

2 files changed, 19 insertions, 19 deletions

diff --git a/mirrors/urls.py b/mirrors/urls.py
index fc510fbb..f979c86e 100644
--- a/mirrors/urls.py
+++ b/mirrors/urls.py
@@ -1,18 +1,18 @@
-from django.conf.urls import patterns
+from django.conf.urls import url
 
 from .views import mirrors, status, mirror_details, url_details
 from .views.api import status_json, mirror_details_json, locations_json
 
-urlpatterns = patterns('',
-    (r'^$', mirrors, {}, 'mirror-list'),
-    (r'^status/$', status,  {}, 'mirror-status'),
-    (r'^status/json/$', status_json,  {}, 'mirror-status-json'),
-    (r'^status/tier/(?P<tier>\d+)/$', status, {}, 'mirror-status-tier'),
-    (r'^status/tier/(?P<tier>\d+)/json/$', status_json, {}, 'mirror-status-tier-json'),
-    (r'^locations/json/$', locations_json,  {}, 'mirror-locations-json'),
-    (r'^(?P<name>[\.\-\w]+)/$', mirror_details),
-    (r'^(?P<name>[\.\-\w]+)/json/$', mirror_details_json),
-    (r'^(?P<name>[\.\-\w]+)/(?P<url_id>\d+)/$', url_details),
-)
+urlpatterns = [
+    url(r'^$', mirrors, name='mirror-list'),
+    url(r'^status/$', status, name='mirror-status'),
+    url(r'^status/json/$', status_json, name='mirror-status-json'),
+    url(r'^status/tier/(?P<tier>\d+)/$', status, name='mirror-status-tier'),
+    url(r'^status/tier/(?P<tier>\d+)/json/$', status_json, name='mirror-status-tier-json'),
+    url(r'^locations/json/$', locations_json, name='mirror-locations-json'),
+    url(r'^(?P<name>[\.\-\w]+)/$', mirror_details),
+    url(r'^(?P<name>[\.\-\w]+)/json/$', mirror_details_json),
+    url(r'^(?P<name>[\.\-\w]+)/(?P<url_id>\d+)/$', url_details),
+]
 
 # vim: set ts=4 sw=4 et:
diff --git a/mirrors/urls_mirrorlist.py b/mirrors/urls_mirrorlist.py
index a64656a9..483e2430 100644
--- a/mirrors/urls_mirrorlist.py
+++ b/mirrors/urls_mirrorlist.py
@@ -1,11 +1,11 @@
-from django.conf.urls import patterns
+from django.conf.urls import url
 
+from views import mirrorlist as views
 
-urlpatterns = patterns('mirrors.views.mirrorlist',
-    (r'^$',         'generate_mirrorlist', {}, 'mirrorlist'),
-    (r'^all/$',     'find_mirrors', {'countries': ['all']}),
-    (r'^all/(?P<protocol>[A-z]+)/$', 'find_mirrors_simple',
-        {}, 'mirrorlist_simple')
-)
+urlpatterns = [
+    url(r'^$', views.generate_mirrorlist, name='mirrorlist'),
+    url(r'^all/$', views.find_mirrors, {'countries': ['all']}),
+    url(r'^all/(?P<protocol>[A-z]+)/$', views.find_mirrors_simple, name='mirrorlist_simple')
+]
 
 # vim: set ts=4 sw=4 et: