Bumps django to 4.0 and fixes associated issues

src/documents/tests/test_api.py

@@ -579,13 +579,13 @@ class TestDocumentApi(DirectoriesMixin, APITestCase):
         d3.tags.add(t2)
         d4 = Document.objects.create(
             checksum="4",
-            created=timezone.datetime(2020, 7, 13),
+            created=timezone.make_aware(datetime.datetime(2020, 7, 13)),
             content="test",
         )
         d4.tags.add(t2)
         d5 = Document.objects.create(
             checksum="5",
-            added=timezone.datetime(2020, 7, 13),
+            added=timezone.make_aware(datetime.datetime(2020, 7, 13)),
             content="test",
         )
         d6 = Document.objects.create(checksum="6", content="test2")
@@ -1897,21 +1897,21 @@ class TestBulkDownload(DirectoriesMixin, APITestCase):
             filename="docA.pdf",
             mime_type="application/pdf",
             checksum="B",
-            created=datetime.datetime(2021, 1, 1),
+            created=timezone.make_aware(datetime.datetime(2021, 1, 1)),
         )
         self.doc2b = Document.objects.create(
             title="document A",
             filename="docA2.pdf",
             mime_type="application/pdf",
             checksum="D",
-            created=datetime.datetime(2021, 1, 1),
+            created=timezone.make_aware(datetime.datetime(2021, 1, 1)),
         )
         self.doc3 = Document.objects.create(
             title="document B",
             filename="docB.jpg",
             mime_type="image/jpeg",
             checksum="C",
-            created=datetime.datetime(2020, 3, 21),
+            created=timezone.make_aware(datetime.datetime(2020, 3, 21)),
             archive_filename="docB.pdf",
             archive_checksum="D",
         )

src/documents/tests/test_consumer.py

@@ -5,6 +5,11 @@ import tempfile
 from unittest import mock
 from unittest.mock import MagicMock
 
+try:
+    import zoneinfo
+except ImportError:
+    import backports.zoneinfo as zoneinfo
+
 from django.conf import settings
 from django.test import override_settings
 from django.test import TestCase
@@ -341,7 +346,7 @@ class TestConsumer(DirectoriesMixin, TestCase):
 
         self._assert_first_last_send_progress()
 
-        self.assertEqual(document.created.tzinfo.zone, "America/Chicago")
+        self.assertEqual(document.created.tzinfo, zoneinfo.ZoneInfo("America/Chicago"))
 
     @override_settings(PAPERLESS_FILENAME_FORMAT=None)
     def testDeleteMacFiles(self):

src/documents/views.py

@@ -18,6 +18,7 @@ from django.db.models.functions import Lower
 from django.http import Http404
 from django.http import HttpResponse
 from django.http import HttpResponseBadRequest
+from django.utils.decorators import method_decorator
 from django.utils.translation import get_language
 from django.views.decorators.cache import cache_control
 from django.views.generic import TemplateView
@@ -332,7 +333,7 @@ class DocumentViewSet(
             raise Http404()
 
     @action(methods=["get"], detail=True)
-    @cache_control(public=False, max_age=315360000)
+    @method_decorator(cache_control(public=False, max_age=315360000))
     def thumb(self, request, pk=None):
         try:
             doc = Document.objects.get(id=pk)