Django 3.1 deprecates django.conf.urls.url() as an alias for
django.urls.re_path(). Also switch to using django.urls.include() rather
than django.conf.urls.include().
Signed-off-by: Andrew Donnellan
---
patchwork/urls.py | 331 +++---
1 file changed, 167 insertions(+), 164 deletions(-)
diff --git a/patchwork/urls.py b/patchwork/urls.py
index 7d888d4a3dc0..280d28d8e5bd 100644
--- a/patchwork/urls.py
+++ b/patchwork/urls.py
@@ -4,10 +4,9 @@
# SPDX-License-Identifier: GPL-2.0-or-later
from django.conf import settings
-from django.conf.urls import url, include
from django.contrib import admin
from django.contrib.auth import views as auth_views
-from django.urls import reverse_lazy
+from django.urls import include, re_path, reverse_lazy
from patchwork.views import about as about_views
from patchwork.views import api as api_views
@@ -27,15 +26,16 @@ from patchwork.views import xmlrpc as xmlrpc_views
admin.autodiscover()
urlpatterns = [
-url(r'^admin/', admin.site.urls),
+re_path(r'^admin/', admin.site.urls),
-url(r'^$', project_views.project_list, name='project-list'),
-url(r'^project/(?P[^/]+)/list/$', patch_views.patch_list,
-name='patch-list'),
-url(r'^project/(?P[^/]+)/bundles/$', bundle_views.bundle_list,
-name='bundle-list'),
-url(r'^project/(?P[^/]+)/$', project_views.project_detail,
-name='project-detail'),
+re_path(r'^$', project_views.project_list, name='project-list'),
+re_path(r'^project/(?P[^/]+)/list/$', patch_views.patch_list,
+name='patch-list'),
+re_path(r'^project/(?P[^/]+)/bundles/$',
+bundle_views.bundle_list,
+name='bundle-list'),
+re_path(r'^project/(?P[^/]+)/$', project_views.project_detail,
+name='project-detail'),
# patch views
# NOTE(dja): Per the RFC, msgids can contain slashes. There doesn't seem
@@ -49,128 +49,129 @@ urlpatterns = [
# work, but it is RECOMMENDED by the RFC that the right hand side of the @
# contains a domain, so I think breaking on messages that have "domains"
# ending in /raw/ or /mbox/ is good enough.
-url(r'^project/(?P[^/]+)/patch/(?P.+)/raw/$',
-patch_views.patch_raw, name='patch-raw'),
-url(r'^project/(?P[^/]+)/patch/(?P.+)/mbox/$',
-patch_views.patch_mbox, name='patch-mbox'),
-url(r'^project/(?P[^/]+)/patch/(?P.+)/$',
-patch_views.patch_detail, name='patch-detail'),
+re_path(r'^project/(?P[^/]+)/patch/(?P.+)/raw/$',
+patch_views.patch_raw, name='patch-raw'),
+re_path(r'^project/(?P[^/]+)/patch/(?P.+)/mbox/$',
+patch_views.patch_mbox, name='patch-mbox'),
+re_path(r'^project/(?P[^/]+)/patch/(?P.+)/$',
+patch_views.patch_detail, name='patch-detail'),
# ... old-style /patch/N/* urls
-url(r'^patch/(?P\d+)/raw/$', patch_views.patch_raw_by_id,
-name='patch-raw-redirect'),
-url(r'^patch/(?P\d+)/mbox/$', patch_views.patch_mbox_by_id,
-name='patch-mbox-redirect'),
-url(r'^patch/(?P\d+)/$', patch_views.patch_by_id,
-name='patch-id-redirect'),
+re_path(r'^patch/(?P\d+)/raw/$', patch_views.patch_raw_by_id,
+name='patch-raw-redirect'),
+re_path(r'^patch/(?P\d+)/mbox/$', patch_views.patch_mbox_by_id,
+name='patch-mbox-redirect'),
+re_path(r'^patch/(?P\d+)/$', patch_views.patch_by_id,
+name='patch-id-redirect'),
# cover views
-url(r'^project/(?P[^/]+)/cover/(?P.+)/mbox/$',
-cover_views.cover_mbox, name='cover-mbox'),
-url(r'^project/(?P[^/]+)/cover/(?P.+)/$',
-cover_views.cover_detail, name='cover-detail'),
+re_path(r'^project/(?P[^/]+)/cover/(?P.+)/mbox/$',
+cover_views.cover_mbox, name='cover-mbox'),
+re_path(r'^project/(?P[^/]+)/cover/(?P.+)/$',
+cover_views.cover_detail, name='cover-detail'),
# ... old-style /cover/N/* urls
-url(r'^cover/(?P\d+)/mbox/$', cover_views.cover_mbox_by_id,
-name='cover-mbox-redirect'),
-url(r'^cover/(?P\d+)/$', cover_views.cover_by_id,
-name='cover-id-redirect'),
+re_path(r'^cover/(?P\d+)/mbox/$', cover_views.cover_mbox_by_id,
+name='cover-mbox-redirect'),
+re_path(r'^cover/(?P\d+)/$', cover_views.cover_by_id,
+name='cover-id-redirect'),
# comment views
-url(r'^comment/(?P\d+)/$', comment_views.comment,
-name='comment-redirect'),
+re_path(r'^comment/(?P\d+)/$', comment_views.comment,
+name='comment-redirect'),
# series views
-url(r'^series/(?P\d+)/mbox/$', series_views.series_mbox,
-name='series-mbox'),
+re_path(r'^series/(?P\d+)/mbox/$', series_views.series_mbox,
+name='series-mbox'),
# logged-in user stuff
-url(r'^user/$', user_views.profile, name='user-profile'),
-url(r'^user/todo/$', user_views.todo_lists,
-name='user-todos'),
-url(r'^user/todo/(?P[^/]+)/$',
