replace usages of url() with re_path()

Author: sophiebsw

ocfweb/account/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from ocfweb.account.chpass import change_password
 from ocfweb.account.commands import commands
@@ -17,24 +17,24 @@
 
 
 urlpatterns = [
-    url(r'^password/$', change_password, name='change_password'),
-    url(r'^commands/$', commands, name='commands'),
+    re_path(r'^password/$', change_password, name='change_password'),
+    re_path(r'^commands/$', commands, name='commands'),
 
     # account creation
-    url(r'^register/$', request_account, name='register'),
-    url(r'^register/wait/$', wait_for_account, name='wait_for_account'),
-    url(r'^register/created/$', account_created, name='account_created'),
-    url(r'^register/pending/$', account_pending, name='account_pending'),
-    url(r'^register/recommend/$', recommend, name='recommend'),
-    url(r'^register/validate/$', validate, name='validate'),
+    re_path(r'^register/$', request_account, name='register'),
+    re_path(r'^register/wait/$', wait_for_account, name='wait_for_account'),
+    re_path(r'^register/created/$', account_created, name='account_created'),
+    re_path(r'^register/pending/$', account_pending, name='account_pending'),
+    re_path(r'^register/recommend/$', recommend, name='recommend'),
+    re_path(r'^register/validate/$', validate, name='validate'),
 
     # request vhost
-    url(r'^vhost/$', request_vhost, name='request_vhost'),
-    url(r'^vhost/success/$', request_vhost_success, name='request_vhost_success'),
+    re_path(r'^vhost/$', request_vhost, name='request_vhost'),
+    re_path(r'^vhost/success/$', request_vhost_success, name='request_vhost_success'),
 
     # mail vhost management
-    url(r'^vhost/mail/$', vhost_mail, name='vhost_mail'),
-    url(r'^vhost/mail/update/$', vhost_mail_update, name='vhost_mail_update'),
-    url(r'vhost/mail/import/([0-9a-zA-Z-.]+)/$', vhost_mail_csv_import, name='vhost_mail_csv_import'),
-    url(r'vhost/mail/export/([0-9a-zA-Z-.]+)/$', vhost_mail_csv_export, name='vhost_mail_csv_export'),
+    re_path(r'^vhost/mail/$', vhost_mail, name='vhost_mail'),
+    re_path(r'^vhost/mail/update/$', vhost_mail_update, name='vhost_mail_update'),
+    re_path(r'vhost/mail/import/([0-9a-zA-Z-.]+)/$', vhost_mail_csv_import, name='vhost_mail_csv_import'),
+    re_path(r'vhost/mail/export/([0-9a-zA-Z-.]+)/$', vhost_mail_csv_export, name='vhost_mail_csv_export'),
 ]

ocfweb/announcements/urls.py

@@ -1,13 +1,13 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from ocfweb.announcements.announcements import announcements
 from ocfweb.announcements.announcements import index
 
 
 urlpatterns = [
-    url(r'^$', index, name='announcements'),
+    re_path(r'^$', index, name='announcements'),
 ] + [
-    url(
+    re_path(
         f'^{announcement.date.isoformat()}/{announcement.path}$',
         announcement.render,
         name=announcement.route_name,

ocfweb/docs/urls.py

@@ -2,7 +2,7 @@
 from itertools import chain
 from typing import Union
 
-from django.conf.urls import url
+from django.urls import re_path
 from django.http import Http404
 from django.http import HttpRequest
 from django.http import HttpResponse
@@ -71,11 +71,11 @@ def doc_name(doc_name: str) -> str:
 
 
 urlpatterns = [
-    url(r'^$', docs_index, name='docs'),
+    re_path(r'^$', docs_index, name='docs'),
 
     # we use a complicated generated regex here so that we have actual
     # validation of URLs (in other words, if you try to make a link to a
     # missing document, it will fail)
-    url(fr'^({redir_names})/$', send_redirect),
-    url(fr'^({doc_names})/$', render_doc, name='doc'),
+    re_path(fr'^({redir_names})/$', send_redirect),
+    re_path(fr'^({doc_names})/$', render_doc, name='doc'),
 ]

ocfweb/lab_reservations/urls.py

@@ -1,13 +1,13 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from ocfweb.lab_reservations.reserve import request_reservation
 from ocfweb.lab_reservations.reserve import request_reservation_success
 
 
 urlpatterns = [
     # reservation creation form
-    url(r'^request/$', request_reservation, name='request_reservation'),
+    re_path(r'^request/$', request_reservation, name='request_reservation'),
 
     # reservation pending
-    url(r'^request/pending/$', request_reservation_success, name='request_reservation_success'),
+    re_path(r'^request/pending/$', request_reservation_success, name='request_reservation_success'),
 ]

ocfweb/login/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from ocfweb.login.calnet import login as calnet_login
 from ocfweb.login.calnet import logout as calnet_logout
@@ -7,9 +7,9 @@
 
 
 urlpatterns = [
-    url(r'^login/$', login, name='login'),
-    url(r'^logout/$', logout, name='logout'),
+    re_path(r'^login/$', login, name='login'),
+    re_path(r'^logout/$', logout, name='logout'),
 
-    url(r'^calnet/login/$', calnet_login, name='calnet_login'),
-    url(r'^calnet/logout/$', calnet_logout, name='calnet_logout'),
+    re_path(r'^calnet/login/$', calnet_login, name='calnet_login'),
+    re_path(r'^calnet/logout/$', calnet_logout, name='calnet_logout'),
 ]

ocfweb/stats/urls.py

@@ -1,4 +1,4 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from ocfweb.stats.accounts import stats_accounts
 from ocfweb.stats.daily_graph import daily_graph_image
@@ -15,18 +15,18 @@
 from ocfweb.stats.summary import summary
 
 urlpatterns = [
-    url(r'^$', summary, name='stats'),
-    url(r'^daily-graph/graph$', daily_graph_image, name='daily_graph_image'),
-    url(r'^session-count/graph$', session_count_image, name='session_count_image'),
-    url(r'^session-length/graph$', session_length_image, name='session_length_image'),
-    url(r'^printing/$', stats_printing, name='stats_printing'),
-    url(r'^accounts/$', stats_accounts, name='stats_accounts'),
-    url(r'^printing/semester-histogram/graph$', semester_histogram, name='semester_histogram'),
-    url(r'^printing/pages-printed$', pages_printed, name='pages_printed'),
-    url(r'^printing/daily-job/graph$', daily_jobs_image, name='daily_job_image'),
-    url(r'^printing/weekend-jobs/graph$', weekend_jobs_image, name='weekend_jobs_image'),
-    url(r'^printing/weekday-jobs/graph$', weekday_jobs_image, name='weekday_jobs_image'),
+    re_path(r'^$', summary, name='stats'),
+    re_path(r'^daily-graph/graph$', daily_graph_image, name='daily_graph_image'),
+    re_path(r'^session-count/graph$', session_count_image, name='session_count_image'),
+    re_path(r'^session-length/graph$', session_length_image, name='session_length_image'),
+    re_path(r'^printing/$', stats_printing, name='stats_printing'),
+    re_path(r'^accounts/$', stats_accounts, name='stats_accounts'),
+    re_path(r'^printing/semester-histogram/graph$', semester_histogram, name='semester_histogram'),
+    re_path(r'^printing/pages-printed$', pages_printed, name='pages_printed'),
+    re_path(r'^printing/daily-job/graph$', daily_jobs_image, name='daily_job_image'),
+    re_path(r'^printing/weekend-jobs/graph$', weekend_jobs_image, name='weekend_jobs_image'),
+    re_path(r'^printing/weekday-jobs/graph$', weekday_jobs_image, name='weekday_jobs_image'),
 
-    url(r'^mirrors/$', stats_mirrors, name='stats_mirrors'),
-    url(r'^session-stats/$', session_stats, name='session-stats'),
+    re_path(r'^mirrors/$', stats_mirrors, name='stats_mirrors'),
+    re_path(r'^session-stats/$', session_stats, name='session-stats'),
 ]

ocfweb/tv/urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import re_path
 
 from ocfweb.tv import main
 
 urlpatterns = [
-    url(r'^$', main.tv_main, name='tv_main'),
-    url(r'^labmap$', main.tv_labmap, name='tv_labmap'),
+    re_path(r'^$', main.tv_main, name='tv_main'),
+    re_path(r'^labmap$', main.tv_labmap, name='tv_labmap'),
 ]

ocfweb/urls.py

@@ -1,5 +1,4 @@
-from django.conf.urls import include
-from django.conf.urls import re_path
+from django.urls import include, re_path
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.urls import reverse

requirements.txt

@@ -35,7 +35,7 @@ ldap3==2.9.1
 libsass==0.23.0
 MarkupSafe==3.0.2
 matplotlib==3.10.5
-mistune==3.1.3
+mistune==0.8.4
 numpy==2.3.2
 ocflib==2024.4.23
 packaging==25.0
@@ -46,7 +46,7 @@ ply==3.11
 prometheus_client==0.22.1
 prompt_toolkit==3.0.51
 ptyprocess==0.7.0
-pyasn1==0.6.1
+pyasn1==0.6.0
 pycparser==2.22
 pycryptodome==3.23.0
 pycryptodomex==3.23.0