summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2018-01-01 22:25:02 +0100
committerJelle van der Waa <jelle@vdwaa.nl>2018-04-08 12:51:19 +0200
commit996ef6ec7205ac3c09b6d66ddcfbf91b21bed5b4 (patch)
treede922c4fa251187ac80e31198957e45ddbaaf479 /releng
parent2fbbbf946fcb5cc0ceeb8031b778e184995ddefc (diff)
downloadarchweb-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 'releng')
-rw-r--r--releng/urls.py35
1 files changed, 16 insertions, 19 deletions
diff --git a/releng/urls.py b/releng/urls.py
index eff17115..c0f313bd 100644
--- a/releng/urls.py
+++ b/releng/urls.py
@@ -1,26 +1,23 @@
-from django.conf.urls import include, patterns
+from django.conf.urls import include, url
from .views import ReleaseListView, ReleaseDetailView
+import views
-releases_patterns = patterns('releng.views',
- (r'^$',
- ReleaseListView.as_view(), {}, 'releng-release-list'),
- (r'^json/$',
- 'releases_json', {}, 'releng-release-list-json'),
- (r'^(?P<version>[-.\w]+)/$',
- ReleaseDetailView.as_view(), {}, 'releng-release-detail'),
- (r'^(?P<version>[-.\w]+)/torrent/$',
- 'release_torrent', {}, 'releng-release-torrent'),
-)
+releases_patterns = [
+ url(r'^$', ReleaseListView.as_view(), name='releng-release-list'),
+ url(r'^json/$', views.releases_json, name='releng-release-list-json'),
+ url(r'^(?P<version>[-.\w]+)/$', ReleaseDetailView.as_view(), name='releng-release-detail'),
+ url(r'^(?P<version>[-.\w]+)/torrent/$', views.release_torrent, name='releng-release-torrent'),
+]
-netboot_patterns = patterns('releng.views',
- (r'^archlinux\.ipxe$', 'netboot_config', {}, 'releng-netboot-config'),
- (r'^$', 'netboot_info', {}, 'releng-netboot-info')
-)
+netboot_patterns = [
+ url(r'^archlinux\.ipxe$', views.netboot_config, name='releng-netboot-config'),
+ url(r'^$', views.netboot_info, name='releng-netboot-info')
+]
-urlpatterns = patterns('',
- (r'^releases/', include(releases_patterns)),
- (r'^netboot/', include(netboot_patterns)),
-)
+urlpatterns = [
+ url(r'^releases/', include(releases_patterns)),
+ url(r'^netboot/', include(netboot_patterns)),
+]
# vim: set ts=4 sw=4 et: