CC-2138 NZSL Upgrade Django 3.2.25 > 4.2

pyproject.toml

@@ -10,7 +10,7 @@ repository = "https://github.com/ODNZSL/NZSL-signbank"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-django = "~3.2.25"
+django = "~4.2.13"
 django-bootstrap3 = "*"
 django-contrib-comments = "*"
 django-debug-toolbar = "*"

signbank/comments.py

@@ -8,8 +8,8 @@
 from django.forms import ModelForm
 from django.forms.models import model_to_dict
 from django.http import HttpResponseForbidden
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy as _lazy
+from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _lazy
 from django.contrib.sites.shortcuts import get_current_site
 from django.dispatch import receiver
 from django.contrib.contenttypes.models import ContentType

signbank/customregistration/forms.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from django_registration.forms import RegistrationFormTermsOfService
 

signbank/customregistration/signals.py

@@ -1,6 +1,6 @@
 from django.dispatch import receiver
 from django.contrib.auth.models import User
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 
 from django_registration.signals import user_registered
 from notifications.signals import notify

signbank/dictionary/admin.py

@@ -9,7 +9,7 @@
 from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.forms import CheckboxSelectMultiple, ModelForm, Textarea
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from guardian.admin import GuardedModelAdmin
 from modeltranslation.admin import TranslationAdmin as ModelTranslationAdmin
 from reversion.admin import VersionAdmin

signbank/dictionary/adminviews.py

@@ -21,7 +21,7 @@
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.translation import get_language
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic.detail import DetailView
 from django.views.generic.list import ListView
 from django_comments.models import Comment

signbank/dictionary/choicelists.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 __author__ = 'heilniem'
 

signbank/dictionary/csv_import.py

@@ -20,7 +20,7 @@
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, reverse
 from django.utils.timezone import get_current_timezone
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django_comments.models import Comment
 from guardian.shortcuts import get_objects_for_user, get_perms
 from tagging.models import Tag, TaggedItem

signbank/dictionary/delete.py

@@ -2,7 +2,7 @@
 from django.shortcuts import get_object_or_404
 from django.core.exceptions import PermissionDenied
 from django.contrib import messages
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.http import HttpResponse, HttpResponseForbidden, HttpResponseNotAllowed
 
 from guardian.shortcuts import get_perms

signbank/dictionary/forms.py

@@ -5,7 +5,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.utils import OperationalError, ProgrammingError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from tagging.models import Tag
 
 from .models import (AllowedTags, Dataset, FieldChoice, Gloss, Lemma, GlossRelation,

signbank/dictionary/models.py

@@ -13,7 +13,7 @@
 from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned
 from django.db import OperationalError, models
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from tagging.models import Tag
 from tagging.registry import AlreadyRegistered, register as tagging_register
 

signbank/dictionary/publicviews.py

@@ -6,7 +6,7 @@
 from django.db.models import Q, Prefetch
 from django.db.models.functions import Substr, Upper
 from django.templatetags.static import static
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.decorators.cache import cache_page
 from django.shortcuts import get_object_or_404
 

signbank/dictionary/templates/dictionary/paginate.html

@@ -1,7 +1,7 @@
 {% if page_obj.paginator.num_pages > 1 %}
 <ul class="pagination pagination-sm">
     {% if page_obj.has_previous %}
-        <li><a href="?page={{ page_obj.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">&laquo;</a></li>
+        <li><a href="?page={{ page_obj.previous_page_number }}{% for key,value in request.GET.items %}{% if key != 'page' %}&{{ key }}={{ value }}{% endif %}{% endfor %}">&laquo;</a></li>
     {% endif %}
     {% if page_obj.number > 10 %}
     <li><a>...</a></li>

signbank/dictionary/tools.py

@@ -1,7 +1,7 @@
 import json
 
 from django.conf import settings
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from zipfile import ZipFile
 
 from signbank.dictionary.models import Dataset, Gloss

signbank/dictionary/update.py

@@ -11,7 +11,7 @@
                          HttpResponseForbidden, HttpResponseNotAllowed,
                          HttpResponseRedirect, HttpResponseServerError)
 from django.shortcuts import get_object_or_404, redirect, render, reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from guardian.shortcuts import get_perms
 from tagging.models import Tag, TaggedItem
 

signbank/dictionary/views.py

@@ -13,7 +13,7 @@
 from django.contrib.admin.views.decorators import user_passes_test
 from django.core.exceptions import PermissionDenied
 from django.urls import reverse, reverse_lazy
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic.list import ListView
 from django.views.generic import FormView
 from django.db.models import Q, F, Count, Case, Value, When, BooleanField

signbank/settings/base.py

@@ -8,8 +8,12 @@
 import sys
 
 import dj_database_url
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
+# Workaround for an issue in django-tagging which seems to no longer be maintained
+import django
+from django.utils.encoding import smart_str
+django.utils.encoding.smart_text = smart_str
 
 sentry_dsn = os.environ.get('SENTRY_DSN', '')
 

signbank/tools.py

@@ -9,7 +9,7 @@
 from django.db import connection
 from django.urls import reverse
 from django.core.mail import mail_admins
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.conf import settings
 
 from signbank.dictionary.models import Gloss, Language, Translation, Keyword, Dataset, GlossRelation

signbank/video/admin.py

@@ -3,8 +3,8 @@
 
 from django.contrib import admin
 from django.db.models import Count
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy as _lazy
+from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _lazy
 
 from .models import GlossVideo, GlossVideoToken
 

signbank/video/forms.py

@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from signbank.dictionary.models import Dataset, FieldChoice, Gloss
 
 from .models import GlossVideo

signbank/video/models.py

@@ -11,7 +11,7 @@
 from django.core.files.storage import FileSystemStorage
 from django.db import models
 from django.utils.module_loading import import_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from storages.backends.s3boto3 import S3Boto3Storage
 
 

signbank/video/views.py

@@ -11,7 +11,7 @@
 from django.http import HttpResponse, HttpResponseNotAllowed, HttpResponseNotFound
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse, reverse_lazy
-from django.utils.translation import ugettext as _
+from django.utils.translation import gettext as _
 from django.views.generic.edit import FormView
 from django.views.generic.list import ListView
 from djqscsv import render_to_csv_response
@@ -287,7 +287,7 @@ def render_to_response(self, context, **response_kwargs):
 
 def update_glossvideo(request):
     """Process the post request for updating a glossvideo."""
-    if request.is_ajax():
+    if request.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest':
         # If request is AJAX, follow this procedure.
         data = json.loads(request.body.decode('utf-8'))
         if request.method == 'POST':