updated django 3.2.25 to 4.0.10

requirements.txt

@@ -1,5 +1,5 @@
 coverage==6.3.3
-Django==3.2.25
+Django==4.0.10
 django-debug-toolbar==3.2.4
 docutils==0.20.1
 freezegun==1.2.2

src/feedback/auth.py

@@ -6,7 +6,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.backends import RemoteUserBackend, ModelBackend
 from django.contrib.auth.middleware import RemoteUserMiddleware
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_str
 
 from feedback.models.base import Veranstaltung
 
@@ -52,7 +52,7 @@ def clean_username(self, username):
         if settings.DEBUG:
             credentials = str(b64decode(username.split()[1]))
             user = credentials.split(':')[0]
-            return (smart_text(user))
+            return (smart_str(user))
         else:
             return username
 

src/feedback/models/base.py

@@ -4,7 +4,7 @@
 import random
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.db.utils import OperationalError
 from django.urls import reverse
 from django.core.exceptions import ValidationError

src/feedback/tests/redirect_urls.py

@@ -1,11 +1,11 @@
 # coding=utf-8
 
-from django.conf.urls import url
+from django.urls import re_path
 from feedback.views import redirect
 
 urlpatterns = [
-    url(r'^redirect/$', redirect,
+    re_path(r'^redirect/$', redirect,
         {'redirect_to': 'http://www.d120.de/'}),
-    url(r'^redirect/(?P<tail>.*)$', redirect,
+    re_path(r'^redirect/(?P<tail>.*)$', redirect,
         {'redirect_to': 'http://www.d120.de/'}),
 ]

src/urls.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 
-from django.conf.urls import include, url
+from django.conf.urls import include
 from django.contrib import admin
 from django.contrib.auth.models import User
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -13,7 +13,7 @@
 import feedback.views.intern.auth
 from django.views.decorators.csrf import csrf_exempt
 import django.contrib.auth.views
-from django.urls import reverse_lazy
+from django.urls import reverse_lazy, re_path
 from django.conf import settings
 from feedback.views.veranstalter import VeranstalterWizard
 
@@ -30,75 +30,75 @@
 # Datenbank-Admin und Entwicklerdoku
 urlpatterns = [
     # Muss in dieser Reihenfolge stehen bleiben, da sonst /doc nicht funktioniert!
-    url(r'^intern/admin/doc/', include('django.contrib.admindocs.urls')),
-    url(r'^intern/admin/', admin.site.urls),
+    re_path(r'^intern/admin/doc/', include('django.contrib.admindocs.urls')),
+    re_path(r'^intern/admin/', admin.site.urls),
 ]
 
 # allgemeine Views
 urlpatterns += [
-    url(r'^$', feedback.views.redirect, {'redirect_to': default_redirect}),
+    re_path(r'^$', feedback.views.redirect, {'redirect_to': default_redirect}),
 ]
 
 # öffentliche Views
 urlpatterns += [
-    url(r'^ergebnisse/(?P<vid>\d+)/$', feedback.views.public.veranstaltung, name='public-veranstaltung'),
-    url(r'^ergebnisse/$', feedback.views.public.index, name='public-results'),
+    re_path(r'^ergebnisse/(?P<vid>\d+)/$', feedback.views.public.veranstaltung, name='public-veranstaltung'),
+    re_path(r'^ergebnisse/$', feedback.views.public.index, name='public-results'),
 ]
 
-urlpatterns += [url(r'^deadlines/$', VeranstaltungsDeadlines.as_view(), name='Deadlines'),
-                url(r'^barcodedrop/$', csrf_exempt(feedback.views.public.barcodedrop), name='barcodedrop'),]
+urlpatterns += [re_path(r'^deadlines/$', VeranstaltungsDeadlines.as_view(), name='Deadlines'),
+                re_path(r'^barcodedrop/$', csrf_exempt(feedback.views.public.barcodedrop), name='barcodedrop'),]
 
 
 # Veranstalter-Views
 urlpatterns += [
-    url(r'^veranstalter/login/$', feedback.views.veranstalter.login, name='veranstalter-login'),
-    url(r'^veranstalter/logout/$',
+    re_path(r'^veranstalter/login/$', feedback.views.veranstalter.login, name='veranstalter-login'),
+    re_path(r'^veranstalter/logout/$',
         django.contrib.auth.views.LogoutView.as_view(),
         {'template_name': "veranstalter/logout.html"},
         name='veranstalter-logout'),
 
-    url(r'^veranstalter/bestellung', VeranstalterWizard.as_view(), name='veranstalter-bestellung'),
-    url(r'^veranstalter/', feedback.views.veranstalter.veranstalter_dashboard, name='veranstalter-index')
+    re_path(r'^veranstalter/bestellung', VeranstalterWizard.as_view(), name='veranstalter-bestellung'),
+    re_path(r'^veranstalter/', feedback.views.veranstalter.veranstalter_dashboard, name='veranstalter-index')
 ]
 
 # interne Views
 urlpatterns += [
-    url(r'^intern/uebersicht/$', feedback.views.intern.index, name='intern-index'),
-    url(r'^intern/sendmail/$', feedback.views.intern.sendmail, name='sendmail'),
-    url(r'^intern/export_veranstaltungen/$', feedback.views.intern.export_veranstaltungen, name='export_veranstaltungen'),
-    url(r'^intern/generate_letters/$', feedback.views.intern.generate_letters, name='generate_letters'),
-    url(r'^intern/import_ergebnisse/$', feedback.views.intern.import_ergebnisse, name='import_ergebnisse'),
-    url(r'^intern/status_final/$', feedback.views.intern.CloseOrderFormView.as_view(), name='status_final'),
-    url(r'^intern/sync_ergebnisse/$', feedback.views.intern.sync_ergebnisse, name='sync_ergebnisse'),
-    url(r'^intern/fragebogensprache/$', feedback.views.intern.fragebogensprache, name='fragebogensprache'),
-    url(r'^intern/lange_ohne_evaluation/$', feedback.views.intern.lange_ohne_evaluation, name='lange_ohne_evaluation'),
-    url(r'^intern/ergebnisse/$', feedback.views.intern.ergebnisse, name='intern-ergebnisse'),
-    url(r'^intern/tans/$', feedback.views.intern.ProcessTANs.as_view(),
+    re_path(r'^intern/uebersicht/$', feedback.views.intern.index, name='intern-index'),
+    re_path(r'^intern/sendmail/$', feedback.views.intern.sendmail, name='sendmail'),
+    re_path(r'^intern/export_veranstaltungen/$', feedback.views.intern.export_veranstaltungen, name='export_veranstaltungen'),
+    re_path(r'^intern/generate_letters/$', feedback.views.intern.generate_letters, name='generate_letters'),
+    re_path(r'^intern/import_ergebnisse/$', feedback.views.intern.import_ergebnisse, name='import_ergebnisse'),
+    re_path(r'^intern/status_final/$', feedback.views.intern.CloseOrderFormView.as_view(), name='status_final'),
+    re_path(r'^intern/sync_ergebnisse/$', feedback.views.intern.sync_ergebnisse, name='sync_ergebnisse'),
+    re_path(r'^intern/fragebogensprache/$', feedback.views.intern.fragebogensprache, name='fragebogensprache'),
+    re_path(r'^intern/lange_ohne_evaluation/$', feedback.views.intern.lange_ohne_evaluation, name='lange_ohne_evaluation'),
+    re_path(r'^intern/ergebnisse/$', feedback.views.intern.ergebnisse, name='intern-ergebnisse'),
+    re_path(r'^intern/tans/$', feedback.views.intern.ProcessTANs.as_view(),
     name='process-tans'),
 ]
 
 # interne Views: Vorlesungsverzeichnis
 urlpatterns += [
-    url(r'^intern/import_vv/$', feedback.views.intern.vv.import_vv, name='import_vv'),
-    url(r'^intern/import_vv_edit/$', feedback.views.intern.vv.import_vv_edit, name='import_vv_edit'),
-    url(r'^intern/import_vv_edit_users/$', feedback.views.intern.vv.PersonFormView.as_view(),
+    re_path(r'^intern/import_vv/$', feedback.views.intern.vv.import_vv, name='import_vv'),
+    re_path(r'^intern/import_vv_edit/$', feedback.views.intern.vv.import_vv_edit, name='import_vv_edit'),
+    re_path(r'^intern/import_vv_edit_users/$', feedback.views.intern.vv.PersonFormView.as_view(),
         name='import_vv_edit_users'),
-    url(r'^intern/import_vv_edit_users/(?P<pk>\d+)/$', feedback.views.intern.vv.PersonFormUpdateView.as_view(),
+    re_path(r'^intern/import_vv_edit_users/(?P<pk>\d+)/$', feedback.views.intern.vv.PersonFormUpdateView.as_view(),
         name='import_vv_edit_users_update'),
-    url(r'^intern/import_vv_edit_users/(?P<pk>\d+)/namecheck/$', feedback.views.intern.vv.SimilarNamesView.as_view(),
+    re_path(r'^intern/import_vv_edit_users/(?P<pk>\d+)/namecheck/$', feedback.views.intern.vv.SimilarNamesView.as_view(),
         name='import_vv_edit_users_update_namecheck')
 ]
 
 # interne Views: Authentifizierung
 urlpatterns += [
-    url(r'^intern/rechte_uebernehmen/$', feedback.views.intern.auth.rechte_uebernehmen, name='rechte-uebernehmen'),
-    url(r'^intern/rechte_zuruecknehmen/$', feedback.views.intern.auth.rechte_zuruecknehmen, name='rechte_zuruecknehmen'),
-    url(r'^intern/$', feedback.views.intern.auth.login, name='auth-login'),
+    re_path(r'^intern/rechte_uebernehmen/$', feedback.views.intern.auth.rechte_uebernehmen, name='rechte-uebernehmen'),
+    re_path(r'^intern/rechte_zuruecknehmen/$', feedback.views.intern.auth.rechte_zuruecknehmen, name='rechte_zuruecknehmen'),
+    re_path(r'^intern/$', feedback.views.intern.auth.login, name='auth-login'),
 ]
 
 # Logout
 urlpatterns += [
-    url(r'^logout/$', django.contrib.auth.views.LogoutView.as_view(), {'next_page': reverse_lazy('public-results')}, name='logout'),
+    re_path(r'^logout/$', django.contrib.auth.views.LogoutView.as_view(), {'next_page': reverse_lazy('public-results')}, name='logout'),
 ]
 
 urlpatterns += staticfiles_urlpatterns()
@@ -107,10 +107,10 @@
     # Ausschließlich in der Entwicklung nötig, damit statische Dateien (JS, CSS, Bilder...)
     # angezeigt werden. Im Server-Betrieb kümmert sich Apache darum.
     urlpatterns += [
-        url(r'^d120de/(?P<tail>.*)$', feedback.views.redirect, {'redirect_to': 'http://www.d120.de/d120de/'}),
+        re_path(r'^d120de/(?P<tail>.*)$', feedback.views.redirect, {'redirect_to': 'http://www.d120.de/d120de/'}),
     ]
 
     import debug_toolbar
     urlpatterns += [
-        url(r'^__debug__/', include(debug_toolbar.urls)),
+        re_path(r'^__debug__/', include(debug_toolbar.urls)),
     ]