Bump django to 4.0

Pipfile

@@ -4,14 +4,14 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-django = "==3.2.*"
+django = "==4.0.*"
 # Templatetags for bootstrap3
 django-braces = "*"       # Extra mixinclasses for models and views
 django-contrib-comments = "*"
 django-filebrowser-no-grappelli = "*"  # Filebrowser for mediafiles.
-django-haystack = "==3.0b1"     # Search functionality for django models. See whoosh as well
+django-haystack = "==3.2"     # Search functionality for django models. See whoosh as well
 django-hitcount = "*"
-django-image-cropping = "==1.5"
+django-image-cropping = "==1.7"
 django-markdown-deux = "*"
 django-sekizai = "*"      # Templatetag library for extra block functionality
 easy-thumbnails = "*"     # Thumbnail creator
@@ -27,6 +27,7 @@ django-multi-email-field = "*"
 django-bootstrap4 = "*"
 django-ckeditor = "*"
 djangorestframework = "*"
+tzdata = "*"  # django-4.* uses zoneinfo, which in turn relies on tzdata. On windows tzdata is as of now ()13.10.2023) not installed by default 
 
 [dev-packages]
 pre-commit = "*"

nablapps/accounts/admin.py

@@ -11,7 +11,7 @@
 from django.contrib.flatpages.models import FlatPage
 from django.http import HttpResponseRedirect
 from django.urls import reverse
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 from .forms import NablaUserChangeForm, NablaUserCreationForm
 from .models import FysmatClass, NablaGroup, NablaUser, RegistrationRequest
@@ -30,7 +30,7 @@ class UserFullnameMultipleChoiceField(forms.ModelMultipleChoiceField):
     """
 
     def label_from_instance(self, obj):
-        return smart_text(f"{obj.get_full_name()} - {obj.username}")
+        return smart_str(f"{obj.get_full_name()} - {obj.username}")
 
 
 class GroupAdminForm(forms.ModelForm):

nablapps/events/templates/events/administer_penalties.html

@@ -44,9 +44,9 @@ <h2>Prikkadministrering for <a href="{{event.get_absolute_url}}">{{ event.headli
     <tr>
         <td><label for="user_penalty_{{registration.pk}}">{{ registration.user.get_full_name }}</label></td>
         {% for penalty in event.get_penalty_rule_dict.values %}
-        <td><label style="width: 100%"><input type="radio" class="penalty_table_radio" name="user_penalty_{{registration.pk}}" value="{{ penalty }}" {% ifequal registration.penalty penalty %}checked{% endifequal %}></label></td>
+        <td><label style="width: 100%"><input type="radio" class="penalty_table_radio" name="user_penalty_{{registration.pk}}" value="{{ penalty }}" {% if registration.penalty == penalty %}checked{% endif %}></label></td>
         {% endfor %}
-        <td><label style="width: 100%"><input type="radio" class="penalty_table_radio" name="user_penalty_{{registration.pk}}" value="None" {% ifequal registration.penalty None %}checked{% endifequal %}></label></td>
+        <td><label style="width: 100%"><input type="radio" class="penalty_table_radio" name="user_penalty_{{registration.pk}}" value="None" {% if registration.penalty == None %}checked{% endif %}></label></td>
         <td>
         {% if registration.attendance_registration %}
             Ja

nablapps/events/templates/events/event_detail.html

@@ -23,7 +23,7 @@ <h3>Påmeldte</h3>
     <div class="registrations">
         {% for registration in event.eventregistration_set.all %}
         {% with user=registration.user %}
-        <span class="badge {% ifequal user request.user %} badge-info {% else %} badge-secondary {% endifequal %}
+        <span class="badge {% if user == request.user %} badge-info {% else %} badge-secondary {% endif %}
                      {% if registration.waiting %}
                      waiting-place
                      {% endif %}" style="display: inline-block;">

templates/comments/preview.html

@@ -16,7 +16,7 @@ <h3>{% blocktrans count form.errors|length as counter %}Please correct the error
           {% else %}
             {% if field.errors %}
             <p  {% if field.errors %} class="error"{% endif %}
-                    {% ifequal field.name "honeypot" %} style="display:none;"{% endifequal %}>
+                    {% if field.name == "honeypot" %} style="display:none;"{% endif %}>
               {{ field.label_tag }}
               {{ field.errors }}
             </p>