diff options
author | Johannes Löthberg <johannes@kyriasis.com> | 2018-01-01 22:25:02 +0100 |
---|---|---|
committer | Jelle van der Waa <jelle@vdwaa.nl> | 2018-04-08 12:51:19 +0200 |
commit | 996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4 (patch) | |
tree | de922c4fa251187ac80e31198957e45ddbaaf479 /mirrors | |
parent | 2fbbbf946fcb5cc0ceeb8031b778e184995ddefc (diff) | |
download | archweb-996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4.tar.gz archweb-996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4.zip |
Change urls.py from patterns to list of url()
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
Diffstat (limited to 'mirrors')
-rw-r--r-- | mirrors/urls.py | 24 | ||||
-rw-r--r-- | mirrors/urls_mirrorlist.py | 14 |
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: |