From 6b634a541f8f0b7d6d0ac2409b5f321ab96a0f0b Mon Sep 17 00:00:00 2001
From: Benedikt Willi <benedikt.willi@unibas.ch>
Date: Fri, 9 Jun 2023 15:25:15 +0200
Subject: [PATCH] Add Django4.2 support

---
 .github/workflows/django.yml | 12 ++++++++++++
 tos/views.py                 |  9 ++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
index 9f43293..4776d08 100644
--- a/.github/workflows/django.yml
+++ b/.github/workflows/django.yml
@@ -26,6 +26,9 @@ jobs:
           - python-version: "3.8"
             django-version: Django==4.0
 
+          - python-version: "3.8"
+            django-version: Django==4.2
+
           - python-version: "3.9"
             django-version: Django==2.2
 
@@ -35,12 +38,21 @@ jobs:
           - python-version: "3.9"
             django-version: Django==4.0
 
+          - python-version: "3.9"
+            django-version: Django==4.2
+
           - python-version: "3.10"
             django-version: Django==3.2
 
           - python-version: "3.10"
             django-version: Django==4.0
 
+          - python-version: "3.10"
+            django-version: Django==4.2
+
+          - python-version: "3.11"
+            django-version: Django==4.2
+
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
diff --git a/tos/views.py b/tos/views.py
index bba44ab..b0143c3 100644
--- a/tos/views.py
+++ b/tos/views.py
@@ -1,14 +1,12 @@
 import re
 
-from django import VERSION as DJANGO_VERSION
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth import login as auth_login
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth import get_user_model
 from django.contrib.auth.forms import AuthenticationForm
-from django.contrib.sites.models import Site
-from django.contrib.sites.requests import RequestSite
+from django.contrib.sites.shortcuts import get_current_site
 from django.core.cache import caches
 from django.http import HttpResponseRedirect
 from django.shortcuts import render
@@ -136,10 +134,7 @@ def login(request, template_name='registration/login.html',
 
     request.session.set_test_cookie()
 
-    if Site._meta.installed:
-        current_site = Site.objects.get_current()
-    else:
-        current_site = RequestSite(request)
+    current_site = get_current_site(request)
 
     context = {
         'form': form,