Replace deprecated functions

members/forms.py

@@ -2,7 +2,7 @@
 
 from django import forms
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from members.models import Member, Payment, Request
 

members/models.py

@@ -2,7 +2,7 @@
 
 from django.db import models
 from django.utils import timezone
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.db.models import Q, OuterRef, Subquery
 
 

members/tables.py

@@ -1,7 +1,7 @@
 """File containing member application django tables."""
 
 import django_tables2 as tables
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F, OuterRef, Subquery
 from django.utils import timezone

members/urls.py

@@ -1,6 +1,6 @@
 """File containing Member application URLs."""
 
-from django.conf.urls import url
+from django.urls import re_path
 from django.conf import settings
 from django.contrib.auth.decorators import login_required, permission_required
 
@@ -42,61 +42,61 @@ from members.views import application_submit
 
 urlpatterns = [
     # landing page
-    url(r"^$", member_list),
-    url(r"^list$", member_list),
+    re_path(r"^$", member_list),
+    re_path(r"^list$", member_list),
     # add member form view
-    url(r"^add$", member_add),
+    re_path(r"^add$", member_add),
     # add many members view
-    url(r"^add_many$", member_add_many),
+    re_path(r"^add_many$", member_add_many),
     # edit member information view
-    url(r"^edit/(?P<index>\d+)$", member_edit),
+    re_path(r"^edit/(?P<index>\d+)$", member_edit),
     # delete confirmation view
-    url(r"^delete_member_confirm/(?P<index>\d+)$", member_delete_confirm),
+    re_path(r"^delete_member_confirm/(?P<index>\d+)$", member_delete_confirm),
     # list all member applications
-    url(r"^applications$", application_list),
+    re_path(r"^applications$", application_list),
     # edit member application
-    url(r"^edit_application/(?P<index>\d+)$", application_edit),
+    re_path(r"^edit_application/(?P<index>\d+)$", application_edit),
     # post request targets
-    url(r"^submit_member$", member_submit),
-    url(r"^update_member$", member_update),
-    url(r"^delete_member$", member_delete),
-    url(r"^submit_payment$", payment_submit),
-    url(r"^update_payment$", payment_update),
-    url(r"^delete_payment$", payment_delete),
-    url(r"^submit_application$", application_submit),
-    url(r"^accept_application$", application_accept),
-    url(r"^delete_application$", application_delete),
+    re_path(r"^submit_member$", member_submit),
+    re_path(r"^update_member$", member_update),
+    re_path(r"^delete_member$", member_delete),
+    re_path(r"^submit_payment$", payment_submit),
+    re_path(r"^update_payment$", payment_update),
+    re_path(r"^delete_payment$", payment_delete),
+    re_path(r"^submit_application$", application_submit),
+    re_path(r"^accept_application$", application_accept),
+    re_path(r"^delete_application$", application_delete),
     # the actual member application form
-    url(r"^application/$", application_form),
+    re_path(r"^application/$", application_form),
     # delete confirmation view for applications
-    url(r"^delete_application_confirm/(?P<index>\d+)$", application_delete_confirm),
+    re_path(r"^delete_application_confirm/(?P<index>\d+)$", application_delete_confirm),
     # list all payment events
-    url(r"^payments$", payment_list),
+    re_path(r"^payments$", payment_list),
     # add payment event
-    url(r"^add_payment$", payment_add),
+    re_path(r"^add_payment$", payment_add),
     # edit payment event
-    url(r"^edit_payment/(?P<index>\d+)$", payment_edit),
+    re_path(r"^edit_payment/(?P<index>\d+)$", payment_edit),
     # delete confirmation view
-    url(r"^delete_payment_confirm/(?P<index>\d+)$", payment_delete_confirm),
+    re_path(r"^delete_payment_confirm/(?P<index>\d+)$", payment_delete_confirm),
     # post endpoint for confirming multiple entries
-    url(r"^add_many_confirm$", add_many_confirm),
+    re_path(r"^add_many_confirm$", add_many_confirm),
     # settings page
-    url(r"^settings$", settings_page),
+    re_path(r"^settings$", settings_page),
     # send CSV member data by POST
-    url(r"^import_csv", import_csv),
+    re_path(r"^import_csv", import_csv),
     # export members as excel file
-    url(r"export_members", export_members_excel),
-    url(r"export_payments", export_payments_excel),
-    url(r"export_applications", export_applications_excel),
+    re_path(r"export_members", export_members_excel),
+    re_path(r"export_payments", export_payments_excel),
+    re_path(r"export_applications", export_applications_excel),
     # rest api url
-    url(r"^api/members/(?P<pk>\d+)$", MemberDetail.as_view()),
+    re_path(r"^api/members/(?P<pk>\d+)$", MemberDetail.as_view()),
     # member select autocomplete view
-    url(
+    re_path(
         r"^member-autocomplete/$",
         MemberAutoComplete.as_view(),
         name="member-autocomplete",
     ),
-    url(r"^check", CheckByEmail.as_view()),
+    re_path(r"^check", CheckByEmail.as_view()),
 ]
 
 if settings.DEBUG:

members/views.py

@@ -1,4 +1,4 @@
 """File containing Members application views."""
 
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _

members/views/applications.py

@@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.forms.models import model_to_dict
 from django.template.loader import render_to_string
 

members/views/members.py

@@ -10,7 +10,7 @@ from django.http import (
     HttpResponseForbidden,
 )
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.forms.models import model_to_dict
 from dal import autocomplete
 from django.utils import timezone

members/views/payments.py

@@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.forms.models import model_to_dict
 
 import logging

members/views/utils.py

@@ -4,7 +4,7 @@ from django.views.decorators.http import require_http_methods
 from django.views.decorators.csrf import ensure_csrf_cookie
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseBadRequest
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.forms.models import model_to_dict
 from django_tables2.config import RequestConfig