From ebb786673914476f4a95a8bd41979cc7d4faca9b Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Mon, 27 Nov 2023 19:40:06 +1100 Subject: [PATCH] Switch CCS upload, copyright assignment, FOSSY and podcast components to use path() This is the newer approach to URL routing in Django. --- conservancy/assignment/urls.py | 6 +++--- conservancy/ccs_upload/urls.py | 4 ++-- conservancy/urls.py | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/conservancy/assignment/urls.py b/conservancy/assignment/urls.py index 980fe18c..70bc14f9 100644 --- a/conservancy/assignment/urls.py +++ b/conservancy/assignment/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url +from django.urls import path from .views import AssignmentCreateView, AssignmentThanksView urlpatterns = [ - url(r'^$', AssignmentCreateView.as_view(), name='assignement-add'), - url(r'^(?P[\w-]+)/$', AssignmentThanksView.as_view(), name='assignment-thanks'), + path('', AssignmentCreateView.as_view(), name='assignement-add'), + path('/', AssignmentThanksView.as_view(), name='assignment-thanks'), ] diff --git a/conservancy/ccs_upload/urls.py b/conservancy/ccs_upload/urls.py index 465cf355..dd79c6c9 100644 --- a/conservancy/ccs_upload/urls.py +++ b/conservancy/ccs_upload/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url +from django.urls import path from . import views app_name = "ccs_upload" urlpatterns = [ - url(r'^$', views.upload, name='form') + path('', views.upload, name='form') ] diff --git a/conservancy/urls.py b/conservancy/urls.py index 3ea31805..ad04d188 100644 --- a/conservancy/urls.py +++ b/conservancy/urls.py @@ -62,10 +62,10 @@ urlpatterns = [ url(r'^sustainer/', include('conservancy.supporter.urls')), url(r'^coming-soon.html', static_views.index), url(r'^fundraiser_data', fundgoal_views.view), - url(r'^ccs-upload/', include('conservancy.ccs_upload.urls', namespace='ccs_upload')), - url(r'^assignment/', include('conservancy.assignment.urls')), + path('ccs-upload/', include('conservancy.ccs_upload.urls', namespace='ccs_upload')), + path('assignment/', include('conservancy.assignment.urls')), url(r'^fossy/$', static_views.index), - url(r'^fossy/', include('conservancy.fossy.urls')), - url(r'^cast/', include('conservancy.podjango.urls')), + path('fossy/', include('conservancy.fossy.urls')), + path('cast/', include('conservancy.podjango.urls')), path('usethesource/', include('conservancy.usethesource.urls')), ]