diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 02:38:51 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-04-16 02:38:51 -0400 |
| commit | c8d979b8a48805d162ab46cdc4e493da0aa1595c (patch) | |
| tree | 6846db4f47e29a3fb6a951383ec764a897d3ab85 /mirrors/urls.py | |
| parent | 4d4f76a4fd24891669c254b86b0173258b719b0e (diff) | |
| parent | 790def2f4db2afec150bab8dc842f6068fb751db (diff) | |
Merge tag 'release_2015-04-13' into archweb-generic
Fix up 'None' display in places
Diffstat (limited to 'mirrors/urls.py')
| -rw-r--r-- | mirrors/urls.py | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/mirrors/urls.py b/mirrors/urls.py index b1054380..fc510fbb 100644 --- a/mirrors/urls.py +++ b/mirrors/urls.py @@ -1,15 +1,18 @@ from django.conf.urls import patterns -urlpatterns = patterns('mirrors.views', - (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'), +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), ) # vim: set ts=4 sw=4 et: |