From cc938b76612126d8b9d7d182307925d3353e6b48 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Mon, 18 Mar 2024 17:48:56 +1100
Subject: [PATCH] Switch from `url()` to `path()`

Path is the new way to handle simpler routing rules.
---
 conservancy/contacts/urls.py            | 10 ++++++----
 conservancy/contacts/views.py           |  1 -
 conservancy/contractpatch/urls.py       |  4 ++--
 conservancy/events/urls.py              |  9 +++++----
 conservancy/podjango/urls.py            | 22 +++++++++++-----------
 conservancy/summit_registration/urls.py | 10 ++++++----
 6 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/conservancy/contacts/urls.py b/conservancy/contacts/urls.py
index bb0ae07c..661e6891 100644
--- a/conservancy/contacts/urls.py
+++ b/conservancy/contacts/urls.py
@@ -1,5 +1,7 @@
-from django.conf.urls import include, patterns, url
+from django.urls import path
 
-urlpatterns = patterns('www.contacts.views',
-   (r'^/?$', 'subscribe'),
-)
+from .views import subscribe
+
+urlpatterns = [
+    path('', subscribe),
+]
diff --git a/conservancy/contacts/views.py b/conservancy/contacts/views.py
index 154251a8..95ccfc09 100644
--- a/conservancy/contacts/views.py
+++ b/conservancy/contacts/views.py
@@ -1,4 +1,3 @@
-from django import forms
 from django.forms import ModelForm
 from django.shortcuts import render
 
diff --git a/conservancy/contractpatch/urls.py b/conservancy/contractpatch/urls.py
index 8943efb9..a21c1e83 100644
--- a/conservancy/contractpatch/urls.py
+++ b/conservancy/contractpatch/urls.py
@@ -1,7 +1,7 @@
-from django.conf.urls import include, url
+from django.urls import path
 
 from . import views as cpatch_views
 
 urlpatterns = [
-    url(r'', cpatch_views.index),
+    path('', cpatch_views.index),
 ]
diff --git a/conservancy/events/urls.py b/conservancy/events/urls.py
index 2f62a4ce..94249ed1 100644
--- a/conservancy/events/urls.py
+++ b/conservancy/events/urls.py
@@ -1,6 +1,7 @@
-from django.conf.urls import include, patterns, url
+from django.urls import re_path
 
 from .models import Event
+from .views import custom_index
 
 info_dict = {
     'queryset': Event.objects.all(),
@@ -20,6 +21,6 @@ info_dict = {
 #     (r'^ics/$', 'future_event_ics', info_dict),
 # )
 
-urlpatterns = patterns('www.events.views',
-    (r'^.*$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)),
-)
+urlpatterns = [
+    re_path('', custom_index, dict(info_dict, queryset=Event.past.all(), paginate_by=10)),
+]
diff --git a/conservancy/podjango/urls.py b/conservancy/podjango/urls.py
index 1fab0391..0d6896a3 100644
--- a/conservancy/podjango/urls.py
+++ b/conservancy/podjango/urls.py
@@ -20,7 +20,7 @@
 import datetime
 
 from django.conf import settings
-from django.conf.urls import url
+from django.urls import path
 from django.views.generic.dates import (
     DateDetailView,
     DayArchiveView,
@@ -44,16 +44,16 @@ info_dict = {
 }
 
 urlpatterns = [
-    url(r'^$', frontpage.view, name='cast-home'),
-    url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/(?P<slug>[-\w]+)/$', DateDetailView.as_view(**info_dict), name='detail'),
-    url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/(?P<day>\w{1,2})/$', DayArchiveView.as_view(**info_dict), name='day-archive'),
-    url(r'^(?P<year>\d{4})/(?P<month>[a-z]{3})/$', MonthArchiveView.as_view(**info_dict), name='month-archive'),
-    url(r'^(?P<year>\d{4})/$', YearArchiveView.as_view(**info_dict), name='year-archive'),
-    url(r'^all/$', custom_index, dict(info_dict, paginate_by=20), name='cast'),
-    url(r'^query/$', query, name='query'),
-    url(r'^feeds/ogg/$', OggCastFeed(), name='feed-ogg'),
-    url(r'^feeds/mp3/$', Mp3CastFeed(), name='feed-mp3'),
-    url(r'^feeds/$', view, name='feeds'),
+    path('', frontpage.view, name='cast-home'),
+    path('<int:year>/<month>/<int:day>/<slug:slug>/', DateDetailView.as_view(**info_dict), name='detail'),
+    path('<int:year>/<month>/<int:day>/', DayArchiveView.as_view(**info_dict), name='day-archive'),
+    path('<int:year>/<month>/', MonthArchiveView.as_view(**info_dict), name='month-archive'),
+    path('<int:year>/', YearArchiveView.as_view(**info_dict), name='year-archive'),
+    path('all/', custom_index, dict(info_dict, paginate_by=20), name='cast'),
+    path('query/', query, name='query'),
+    path('feeds/ogg/', OggCastFeed(), name='feed-ogg'),
+    path('feeds/mp3/', Mp3CastFeed(), name='feed-mp3'),
+    path('feeds/', view, name='feeds'),
 ]
 
 if settings.DEBUG:
diff --git a/conservancy/summit_registration/urls.py b/conservancy/summit_registration/urls.py
index 3245b9d2..7457d87e 100644
--- a/conservancy/summit_registration/urls.py
+++ b/conservancy/summit_registration/urls.py
@@ -1,5 +1,7 @@
-from django.conf.urls import include, patterns, url
+from django.urls import path
 
-urlpatterns = patterns('www.summit_registration.views',
-   (r'^/?$', 'register'),
-)
+from .views import register
+
+urlpatterns = [
+    path('', register),
+]