summaryrefslogtreecommitdiffstats
path: root/packages
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 /packages
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 'packages')
-rw-r--r--packages/urls.py71
-rw-r--r--packages/urls_groups.py15
2 files changed, 44 insertions, 42 deletions
diff --git a/packages/urls.py b/packages/urls.py
index 4e2e2638..60899921 100644
--- a/packages/urls.py
+++ b/packages/urls.py
@@ -1,42 +1,41 @@
-from django.conf.urls import include, patterns
+from django.conf.urls import include, url
from .views.search import SearchListView
+import views
-package_patterns = patterns('packages.views',
- (r'^$', 'details'),
- (r'^json/$', 'details_json'),
- (r'^files/$', 'files'),
- (r'^files/json/$', 'files_json'),
- (r'^flag/$', 'flag'),
- (r'^flag/done/$', 'flag_confirmed', {}, 'package-flag-confirmed'),
- (r'^unflag/$', 'unflag'),
- (r'^unflag/all/$', 'unflag_all'),
- (r'^signoff/$', 'signoff_package'),
- (r'^signoff/revoke/$', 'signoff_package', {'revoke': True}),
- (r'^signoff/options/$', 'signoff_options'),
- (r'^download/$', 'download'),
-)
-
-urlpatterns = patterns('packages.views',
- (r'^flaghelp/$', 'flaghelp'),
- (r'^signoffs/$', 'signoffs', {}, 'package-signoffs'),
- (r'^signoffs/json/$', 'signoffs_json', {}, 'package-signoffs-json'),
- (r'^update/$', 'update'),
-
- (r'^$', SearchListView.as_view(), {}, 'packages-search'),
- (r'^search/json/$', 'search_json'),
-
- (r'^differences/$', 'arch_differences', {}, 'packages-differences'),
- (r'^stale_relations/$', 'stale_relations'),
- (r'^stale_relations/update/$','stale_relations_update'),
-
- (r'^(?P<name>[^ /]+)/$',
- 'details'),
- (r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[^ /]+)/$',
- 'details'),
+
+package_patterns = [
+ url(r'^$', views.details),
+ url(r'^json/$', views.details_json),
+ url(r'^files/$', views.files),
+ url(r'^files/json/$', views.files_json),
+ url(r'^flag/$', views.flag),
+ url(r'^flag/done/$', views.flag_confirmed, name='package-flag-confirmed'),
+ url(r'^unflag/$', views.unflag),
+ url(r'^unflag/all/$', views.unflag_all),
+ url(r'^signoff/$', views.signoff_package),
+ url(r'^signoff/revoke/$', views.signoff_package, {'revoke': True}),
+ url(r'^signoff/options/$', views.signoff_options),
+ url(r'^download/$', views.download),
+]
+
+urlpatterns = [
+ url(r'^flaghelp/$', views.flaghelp),
+ url(r'^signoffs/$', views.signoffs, name='package-signoffs'),
+ url(r'^signoffs/json/$', views.signoffs_json, name='package-signoffs-json'),
+ url(r'^update/$', views.update),
+
+ url(r'^$', SearchListView.as_view(), name='packages-search'),
+ url(r'^search/json/$', views.search_json),
+
+ url(r'^differences/$', views.arch_differences, name='packages-differences'),
+ url(r'^stale_relations/$', views.stale_relations),
+ url(r'^stale_relations/update/$', views.stale_relations_update),
+
+ url(r'^(?P<name>[^ /]+)/$', views.details),
+ url(r'^(?P<repo>[A-z0-9\-]+)/(?P<name>[^ /]+)/$', views.details),
# canonical package url. subviews defined above
- (r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/',
- include(package_patterns)),
-)
+ url(r'^(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/', include(package_patterns)),
+]
# vim: set ts=4 sw=4 et:
diff --git a/packages/urls_groups.py b/packages/urls_groups.py
index 49ced145..ebd8e527 100644
--- a/packages/urls_groups.py
+++ b/packages/urls_groups.py
@@ -1,9 +1,12 @@
-from django.conf.urls import patterns
+from django.conf.urls import url
-urlpatterns = patterns('packages.views',
- (r'^$', 'groups', {}, 'groups-list'),
- (r'^(?P<arch>[A-z0-9]+)/$', 'groups'),
- (r'^(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/$', 'group_details'),
-)
+import views
+
+
+urlpatterns = [
+ url(r'^$', views.groups, name='groups-list'),
+ url(r'^(?P<arch>[A-z0-9]+)/$', views.groups),
+ url(r'^(?P<arch>[A-z0-9]+)/(?P<name>[^ /]+)/$', views.group_details),
+]
# vim: set ts=4 sw=4 et: