Mentally prepare for Django 5.2 upgrade

api/urls_v2.py

@@ -1,7 +1,7 @@
 import copy
 
 from django.conf import settings
-from django.conf.urls import include
+from django.urls import include
 from django.urls import path, re_path
 from rest_framework_extensions.routers import ExtendedDefaultRouter
 
@@ -107,7 +107,7 @@ def __init__(self):
                          basename='submission-files')
 
 urlpatterns = [
-    re_path(r'^', include((api.urls, 'api'), namespace='api')),
+    path('', include((api.urls, 'api'), namespace='api')),
 
     re_path(r"^get-token", authorization.api.views.RemoteAuthenticationView.as_view(), name="get-token"),
     re_path(r'^me', userprofile.api.views.MeDetail.as_view()),

aplus/urls.py

@@ -1,7 +1,7 @@
 from django.conf import settings
-from django.conf.urls import include
 from django.contrib import admin
 from django.contrib.sitemaps.views import sitemap
+from django.urls import include
 from django.urls import path, re_path
 
 from . import views
@@ -37,22 +37,22 @@
 #  Pay attention to the order the URL patterns will be matched!
 urlpatterns = [
     re_path(r'^admin/', admin.site.urls),
-    re_path(r'^', include(shibboleth_login.urls)),
-    re_path('', include(social_django.urls, namespace='social')),
+    path('', include(shibboleth_login.urls)),
+    path('', include(social_django.urls, namespace='social')),
     re_path(r'^api/v(?P<version>(2))/', include(api.urls_v2)), # why version in url? doc/api_versioning.md
-    re_path(r'^accounts/', include(userprofile.urls)),
-    re_path(r'^diploma/', include(diploma.urls)),
-    re_path(r'^', include(redirect_old_urls.urls)),
-    re_path(r'^', include(apps.urls)),
-    re_path(r'^', include(news.urls)),
-    re_path(r'^', include(external_services.urls)),
-    re_path(r'^', include(course.long_urls)),
-    re_path(r'^', include(deviations.urls)),
-    re_path(r'^', include(edit_course.urls)),
-    re_path(r'^', include(notification.urls)),
-    re_path(r'^', include(lti_tool.urls)),
-    re_path(r'^', include(exercise.urls)),
-    re_path(r'^', include(course.urls)),
+    path('accounts/', include(userprofile.urls)),
+    path('diploma/', include(diploma.urls)),
+    path('', include(redirect_old_urls.urls)),
+    path('', include(apps.urls)),
+    path('', include(news.urls)),
+    path('', include(external_services.urls)),
+    path('', include(course.long_urls)),
+    path('', include(deviations.urls)),
+    path('', include(edit_course.urls)),
+    path('', include(notification.urls)),
+    path('', include(lti_tool.urls)),
+    path('', include(exercise.urls)),
+    path('', include(course.urls)),
     path('sitemap.xml', sitemap, { 'sitemaps': all_sitemaps },
         name='django.contrib.sitemaps.views.sitemap'),
 ]

apps/admin.py

@@ -12,20 +12,23 @@
 )
 
 
+@admin.register(BaseTab)
 class BaseTabAdmin(admin.ModelAdmin):
     search_fields = (
         'label',
         'title',
     )
 
 
+@admin.register(HTMLTab)
 class HTMLTabAdmin(admin.ModelAdmin):
     search_fields = (
         'label',
         'title',
     )
 
 
+@admin.register(ExternalEmbeddedTab)
 class ExternalEmbeddedTabAdmin(admin.ModelAdmin):
     search_fields = (
         'label',
@@ -34,6 +37,7 @@ class ExternalEmbeddedTabAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(ExternalIFrameTab)
 class ExternalIFrameTabAdmin(admin.ModelAdmin):
     search_fields = (
         'label',
@@ -42,17 +46,20 @@ class ExternalIFrameTabAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(BasePlugin)
 class BasePluginAdmin(admin.ModelAdmin):
     search_fields = ('title',)
 
 
+@admin.register(RSSPlugin)
 class RSSPluginAdmin(admin.ModelAdmin):
     search_fields = (
         'title',
         'feed_url',
     )
 
 
+@admin.register(HTMLPlugin)
 class HTMLPluginAdmin(admin.ModelAdmin):
     search_fields = ('title',)
     list_display_links = ('title',)
@@ -67,18 +74,11 @@ def course_instance_id(self, obj):
         return obj.container_pk
 
 
+@admin.register(ExternalIFramePlugin)
 class ExternalIFramePluginAdmin(admin.ModelAdmin):
     search_fields = (
         'title',
         'service_url',
     )
 
 
-admin.site.register(BaseTab, BaseTabAdmin)
-admin.site.register(HTMLTab, HTMLTabAdmin)
-admin.site.register(ExternalEmbeddedTab, ExternalEmbeddedTabAdmin)
-admin.site.register(ExternalIFrameTab, ExternalIFrameTabAdmin)
-admin.site.register(BasePlugin, BasePluginAdmin)
-admin.site.register(RSSPlugin, RSSPluginAdmin)
-admin.site.register(HTMLPlugin, HTMLPluginAdmin)
-admin.site.register(ExternalIFramePlugin, ExternalIFramePluginAdmin)

course/admin.py

@@ -26,6 +26,7 @@ def instance_url(instance):
 instance_url.short_description = _('URL')
 
 
+@admin.register(Course)
 class CourseAdmin(admin.ModelAdmin):
     search_fields = (
         'name',
@@ -44,6 +45,7 @@ class CourseAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(CourseInstance)
 class CourseInstanceAdmin(admin.ModelAdmin):
     search_fields = (
         'instance_name',
@@ -74,6 +76,7 @@ def get_queryset(self, request):
         return CourseInstance.objects.get_teaching(request.user.userprofile)
 
 
+@admin.register(Enrollment)
 class EnrollmentAdmin(admin.ModelAdmin):
     search_fields = (
         'course_instance__instance_name',
@@ -104,6 +107,7 @@ class EnrollmentAdmin(admin.ModelAdmin):
     readonly_fields = ('timestamp',)
 
 
+@admin.register(CourseModule)
 class CourseModuleAdmin(admin.ModelAdmin):
     search_fields = (
         'name',
@@ -127,6 +131,7 @@ class CourseModuleAdmin(admin.ModelAdmin):
     raw_id_fields = ('course_instance',)
 
 
+@admin.register(LearningObjectCategory)
 class LearningObjectCategoryAdmin(admin.ModelAdmin):
     search_fields = (
         'name',
@@ -149,6 +154,7 @@ class LearningObjectCategoryAdmin(admin.ModelAdmin):
     raw_id_fields = ('course_instance',)
 
 
+@admin.register(StudentGroup)
 class StudentGroupAdmin(admin.ModelAdmin):
     search_fields = (
         'course_instance__instance_name',
@@ -182,6 +188,7 @@ def members_string(self, obj):
         )
 
 
+@admin.register(UserTag)
 class UserTagAdmin(admin.ModelAdmin):
     search_fields = (
         'name',
@@ -207,6 +214,7 @@ class UserTagAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(UserTagging)
 class UserTaggingAdmin(admin.ModelAdmin):
     search_fields = (
         'tag__name',
@@ -238,6 +246,7 @@ class UserTaggingAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(SubmissionTag)
 class SubmissionTagAdmin(admin.ModelAdmin):
     search_fields = (
         'name',
@@ -264,6 +273,7 @@ class SubmissionTagAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(CourseHook)
 class CourseHookAdmin(admin.ModelAdmin):
     search_fields = (
         'hook_url',
@@ -274,13 +284,3 @@ class CourseHookAdmin(admin.ModelAdmin):
     raw_id_fields = ('course_instance',)
 
 
-admin.site.register(Course, CourseAdmin)
-admin.site.register(CourseInstance, CourseInstanceAdmin)
-admin.site.register(Enrollment, EnrollmentAdmin)
-admin.site.register(StudentGroup, StudentGroupAdmin)
-admin.site.register(CourseHook, CourseHookAdmin)
-admin.site.register(CourseModule, CourseModuleAdmin)
-admin.site.register(LearningObjectCategory, LearningObjectCategoryAdmin)
-admin.site.register(UserTag, UserTagAdmin)
-admin.site.register(UserTagging, UserTaggingAdmin)
-admin.site.register(SubmissionTag, SubmissionTagAdmin)

course/urls.py

@@ -1,3 +1,4 @@
+from django.urls import path
 from django.urls import re_path
 
 from . import views
@@ -10,10 +11,10 @@
 MODULE_URL_PREFIX = INSTANCE_URL_PREFIX + r'(?P<module_slug>[\w\d\-\.]+)/'
 
 urlpatterns = [
-    re_path(r'^$',
+    path('',
         views.HomeView.as_view(),
         name='home'),
-    re_path(r'^archive/$',
+    path('archive/',
         views.ArchiveView.as_view(),
         name="archive"),
     re_path(COURSE_URL_PREFIX + r'instances/$',

course/views.py

@@ -356,7 +356,7 @@ def post(self, request, *args, **kwargs):
                 not url_has_allowed_host_and_scheme(url=next,
                                 allowed_hosts={request.get_host()},
                                 require_https=request.is_secure())):
-            next = remove_query_param_from_url(request.META.get('HTTP_REFERER'), 'hl')
+            next = remove_query_param_from_url(request.headers.get('referer'), 'hl')
             next = next and unquote(next)  # HTTP_REFERER may be encoded.
             if not url_has_allowed_host_and_scheme(url=next,
                                 allowed_hosts={request.get_host()},

deviations/admin.py

@@ -8,6 +8,7 @@ class DeviationRecentCourseInstanceListFilter(RecentCourseInstanceListFilter):
     course_instance_query = 'exercise__course_module__course_instance'
 
 
+@admin.register(DeadlineRuleDeviation)
 class DeadlineRuleDeviationAdmin(admin.ModelAdmin):
     search_fields = (
         'submitter__student_id',
@@ -35,6 +36,7 @@ class DeadlineRuleDeviationAdmin(admin.ModelAdmin):
     readonly_fields = ('grant_time',)
 
 
+@admin.register(MaxSubmissionsRuleDeviation)
 class MaxSubmissionsRuleDeviationAdmin(admin.ModelAdmin):
     search_fields = (
         'submitter__student_id',
@@ -62,5 +64,3 @@ class MaxSubmissionsRuleDeviationAdmin(admin.ModelAdmin):
     readonly_fields = ('grant_time',)
 
 
-admin.site.register(DeadlineRuleDeviation, DeadlineRuleDeviationAdmin)
-admin.site.register(MaxSubmissionsRuleDeviation, MaxSubmissionsRuleDeviationAdmin)

diploma/admin.py

@@ -3,6 +3,7 @@
 from .models import CourseDiplomaDesign, StudentDiploma
 
 
+@admin.register(CourseDiplomaDesign)
 class CourseDiplomaDesignAdmin(admin.ModelAdmin):
     search_fields = (
         'course__instance_name',
@@ -30,6 +31,7 @@ class CourseDiplomaDesignAdmin(admin.ModelAdmin):
     )
 
 
+@admin.register(StudentDiploma)
 class StudentDiplomaAdmin(admin.ModelAdmin):
     search_fields = (
         'name',
@@ -61,5 +63,3 @@ class StudentDiplomaAdmin(admin.ModelAdmin):
     readonly_fields = ('created',)
 
 
-admin.site.register(CourseDiplomaDesign, CourseDiplomaDesignAdmin)
-admin.site.register(StudentDiploma, StudentDiplomaAdmin)

diploma/urls.py

@@ -1,13 +1,14 @@
+from django.urls import path
 from django.urls import re_path
 
 from . import views
 
 
 urlpatterns = [
-    re_path(r'list/(?P<coursediploma_id>\d+)/$',
+    path('list/<int:coursediploma_id>/',
         views.DiplomaListView.as_view(),
         name="diploma-list"),
-    re_path(r'create/(?P<coursediploma_id>\d+)/(?P<userprofile_id>\d+)/$',
+    path('create/<int:coursediploma_id>/<int:userprofile_id>/',
         views.DiplomaCreateView.as_view(),
         name="diploma-create"),
     re_path(r'(?P<diploma_hash>[a-f0-9]{32})/$',