Clean up remaining code for dropped Django versions (#407)

KOliver94 · codingjoe · web-flow · commit d51661639825 · 2025-06-09T18:35:35.000+02:00
* Remove leftover as Django 3.2 is the lowest supported version * Remove leftover as Django 4.2 is the lowest supported version * Run pyupgrade && django-upgrade Ref 4fbf74f Ref 597cfd6 --------- Co-authored-by: Johannes Maron <johannes@maron.family>
diff --git a/health_check/cache/__init__.py b/health_check/cache/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.cache.apps.HealthCheckConfig"
diff --git a/health_check/contrib/celery/__init__.py b/health_check/contrib/celery/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.celery.apps.HealthCheckConfig"
diff --git a/health_check/contrib/celery_ping/__init__.py b/health_check/contrib/celery_ping/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.celery_ping.apps.HealthCheckConfig"
diff --git a/health_check/contrib/celery_ping/backends.py b/health_check/contrib/celery_ping/backends.py
@@ -51,7 +51,7 @@ def _check_active_queues(self, active_workers):
         if not defined_queues:
             return
 
-        defined_queues = set([queue.name for queue in defined_queues])
+        defined_queues = {queue.name for queue in defined_queues}
         active_queues = set()
 
         for queues in app.control.inspect(active_workers).active_queues().values():
diff --git a/health_check/contrib/db_heartbeat/__init__.py b/health_check/contrib/db_heartbeat/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.db_heartbeat.apps.HealthCheckConfig"
diff --git a/health_check/contrib/migrations/__init__.py b/health_check/contrib/migrations/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.migrations.apps.HealthCheckConfig"
diff --git a/health_check/contrib/psutil/__init__.py b/health_check/contrib/psutil/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.psutil.apps.HealthCheckConfig"
diff --git a/health_check/contrib/rabbitmq/__init__.py b/health_check/contrib/rabbitmq/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.rabbitmq.apps.HealthCheckConfig"
diff --git a/health_check/contrib/redis/__init__.py b/health_check/contrib/redis/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.redis.apps.HealthCheckConfig"
diff --git a/health_check/contrib/s3boto3_storage/__init__.py b/health_check/contrib/s3boto3_storage/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.s3boto3_storage.apps.HealthCheckConfig"
diff --git a/health_check/contrib/s3boto_storage/__init__.py b/health_check/contrib/s3boto_storage/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.contrib.s3boto_storage.apps.HealthCheckConfig"
diff --git a/health_check/db/__init__.py b/health_check/db/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.db.apps.HealthCheckConfig"
diff --git a/health_check/storage/__init__.py b/health_check/storage/__init__.py
@@ -1,4 +0,0 @@
-import django
-
-if django.VERSION < (3, 2):
-    default_app_config = "health_check.storage.apps.HealthCheckConfig"
diff --git a/health_check/storage/backends.py b/health_check/storage/backends.py
@@ -1,13 +1,7 @@
 import uuid
 
-import django
 from django.core.files.base import ContentFile
-from django.core.files.storage import default_storage
-
-if django.VERSION >= (4, 2):
-    from django.core.files.storage import InvalidStorageError, storages
-else:
-    from django.core.files.storage import get_storage_class
+from django.core.files.storage import InvalidStorageError, default_storage, storages
 
 from health_check.backends import BaseHealthCheckBackend
 from health_check.exceptions import ServiceUnavailable
@@ -31,16 +25,10 @@ class MyStorageHealthCheck(StorageHealthCheck):
     storage = None
 
     def get_storage(self):
-        if django.VERSION >= (4, 2):
-            try:
-                return storages[self.storage_alias]
-            except InvalidStorageError:
-                return None
-        else:
-            if isinstance(self.storage, str):
-                return get_storage_class(self.storage)()
-            else:
-                return self.storage
+        try:
+            return storages[self.storage_alias]
+        except InvalidStorageError:
+            return None
 
     def get_file_name(self):
         return f"health_check_storage_test/test-{uuid.uuid4()}.txt"
diff --git a/health_check/views.py b/health_check/views.py
@@ -92,7 +92,7 @@ def get(self, request, *args, **kwargs):
         if format_override == "json":
             return self.render_to_response_json(self.filter_plugins(subset=subset), status_code)
 
-        accept_header = request.META.get("HTTP_ACCEPT", "*/*")
+        accept_header = request.headers.get("accept", "*/*")
         for media in MediaType.parse_header(accept_header):
             if media.mime_type in (
                 "text/html",
diff --git a/tests/test_storage.py b/tests/test_storage.py
@@ -143,7 +143,6 @@ def test_get_storage_django_between_42_and_50(self):
             default_storage = DefaultFileStorageHealthCheck()
             self.assertIsInstance(default_storage.get_storage(), CustomStorage)
 
-    @unittest.skipUnless(django.VERSION >= (4, 2), "Django 4.2+ required")
     def test_get_storage_django_42_plus(self):
         """Check that the new STORAGES setting is supported."""
         with self.settings(STORAGES={"default": {"BACKEND": "tests.test_storage.CustomStorage"}}):
@@ -168,45 +167,21 @@ def test_check_status_working(self):
         ):
             self.assertTrue(default_storage_health.check_status())
 
-    @unittest.skipUnless(django.VERSION <= (4, 1), "Only for Django 4.1 and earlier")
-    @mock.patch(
-        "health_check.storage.backends.DefaultFileStorageHealthCheck.storage",
-        MockStorage(saves=False),
-    )
-    def test_file_does_not_exist_django_41_earlier(self):
-        """Test check_status raises ServiceUnavailable when file is not saved."""
-        default_storage_health = DefaultFileStorageHealthCheck()
-        with self.assertRaises(ServiceUnavailable):
-            default_storage_health.check_status()
-
-    @unittest.skipUnless(django.VERSION >= (4, 2), "Only for Django 4.2+")
     @mock.patch(
         "health_check.storage.backends.storages",
         {"default": MockStorage(saves=False)},
     )
-    def test_file_does_not_exist_django_42_plus(self):
+    def test_file_does_not_exist(self):
         """Test check_status raises ServiceUnavailable when file is not saved."""
         default_storage_health = DefaultFileStorageHealthCheck()
         with self.assertRaises(ServiceUnavailable):
             default_storage_health.check_status()
 
-    @unittest.skipUnless(django.VERSION <= (4, 1), "Only for Django 4.1 and earlier")
-    @mock.patch(
-        "health_check.storage.backends.DefaultFileStorageHealthCheck.storage",
-        MockStorage(deletes=False),
-    )
-    def test_file_not_deleted_django_41_earlier(self):
-        """Test check_status raises ServiceUnavailable when file is not deleted."""
-        default_storage_health = DefaultFileStorageHealthCheck()
-        with self.assertRaises(ServiceUnavailable):
-            default_storage_health.check_status()
-
-    @unittest.skipUnless(django.VERSION >= (4, 2), "Only for Django 4.2+")
     @mock.patch(
         "health_check.storage.backends.storages",
         {"default": MockStorage(deletes=False)},
     )
-    def test_file_not_deleted_django_42_plus(self):
+    def test_file_not_deleted(self):
         """Test check_status raises ServiceUnavailable when file is not deleted."""
         default_storage_health = DefaultFileStorageHealthCheck()
         with self.assertRaises(ServiceUnavailable):
@@ -222,23 +197,6 @@ def test_file_not_deleted_django_42_plus(self):
 class HealthCheckS3Boto3StorageTests(TestCase):
     """Tests health check behavior with a mocked S3Boto3Storage backend."""
 
-    @unittest.skipUnless(django.VERSION <= (4, 1), "Only for Django 4.1 and earlier")
-    @mock.patch(
-        "storages.backends.s3boto3.S3Boto3Storage",
-        MockS3Boto3Storage(deletes=False),
-    )
-    def test_check_delete_success_django_41_earlier(self):
-        """Test that check_delete correctly deletes a file when S3Boto3Storage is working."""
-        health_check = S3Boto3StorageHealthCheck()
-        mock_storage = health_check.get_storage()
-        file_name = "testfile.txt"
-        content = BytesIO(b"Test content")
-        mock_storage.save(file_name, content)
-
-        with self.assertRaises(ServiceUnavailable):
-            health_check.check_delete(file_name)
-
-    @unittest.skipUnless(django.VERSION >= (4, 2), "Only for Django 4.2+")
     def test_check_delete_success(self):
         """Test that check_delete correctly deletes a file when S3Boto3Storage is working."""
         health_check = S3Boto3StorageHealthCheck()
@@ -261,18 +219,6 @@ def test_check_delete_failure(self):
             with self.assertRaises(ServiceUnavailable):
                 health_check.check_delete("testfile.txt")
 
-    @unittest.skipUnless(django.VERSION <= (4, 1), "Only for Django 4.1 and earlier")
-    @mock.patch(
-        "storages.backends.s3boto3.S3Boto3Storage",
-        MockS3Boto3Storage(deletes=False),
-    )
-    def test_check_status_working_django_41_earlier(self):
-        """Test check_status returns True when S3Boto3Storage can save and delete files."""
-        health_check = S3Boto3StorageHealthCheck()
-        with self.assertRaises(ServiceUnavailable):
-            self.assertTrue(health_check.check_status())
-
-    @unittest.skipUnless(django.VERSION >= (4, 2), "Only for Django 4.2+")
     def test_check_status_working(self):
         """Test check_status returns True when S3Boto3Storage can save and delete files."""
         health_check = S3Boto3StorageHealthCheck()
diff --git a/tests/test_views.py b/tests/test_views.py
@@ -1,18 +1,14 @@
 import json
 
 import pytest
+from django.urls import reverse
 
 from health_check.backends import BaseHealthCheckBackend
 from health_check.conf import HEALTH_CHECK
 from health_check.exceptions import ServiceWarning
 from health_check.plugins import plugin_dir
 from health_check.views import MediaType
 
-try:
-    from django.urls import reverse
-except ImportError:
-    from django.core.urlresolvers import reverse
-
 
 class TestMediaType:
     def test_lt(self):
diff --git a/tests/testapp/urls.py b/tests/testapp/urls.py
@@ -1,5 +1,5 @@
-from django.urls import include, re_path
+from django.urls import include, path
 
 urlpatterns = [
-    re_path(r"^ht/", include("health_check.urls")),
+    path("ht/", include("health_check.urls")),
 ]
