Remove conditional blocks for unsupported Django versions

Author: ulgens

django_prometheus/cache/backends/redis.py

@@ -1,4 +1,4 @@
-from django import VERSION as DJANGO_VERSION
+from django.core.cache.backends.redis import RedisCache as DjangoRedisCache
 from django_redis import cache, exceptions
 
 from django_prometheus.cache.metrics import (
@@ -33,20 +33,18 @@ def get(self, key, default=None, version=None, client=None):
                 return default
 
 
-if DJANGO_VERSION >= (4, 0):
-    from django.core.cache.backends.redis import RedisCache as DjangoRedisCache
 
-    class NativeRedisCache(DjangoRedisCache):
-        def get(self, key, default=None, version=None):
-            django_cache_get_total.labels(backend="native_redis").inc()
-            try:
-                result = super().get(key, default=None, version=version)
-            except Exception:
-                django_cache_get_fail_total.labels(backend="native_redis").inc()
-                raise
-            if result is not None:
-                django_cache_hits_total.labels(backend="native_redis").inc()
-                return result
-            else:
-                django_cache_misses_total.labels(backend="native_redis").inc()
-                return default
+class NativeRedisCache(DjangoRedisCache):
+    def get(self, key, default=None, version=None):
+        django_cache_get_total.labels(backend="native_redis").inc()
+        try:
+            result = super().get(key, default=None, version=version)
+        except Exception:
+            django_cache_get_fail_total.labels(backend="native_redis").inc()
+            raise
+        if result is not None:
+            django_cache_hits_total.labels(backend="native_redis").inc()
+            return result
+        else:
+            django_cache_misses_total.labels(backend="native_redis").inc()
+            return default

django_prometheus/db/backends/common.py

@@ -1,14 +1,14 @@
 from django.contrib.gis.db.backends.postgis import base
+from django.db.backends.postgresql.base import Cursor
 
-from django_prometheus.db.backends.common import get_postgres_cursor_class
 from django_prometheus.db.common import DatabaseWrapperMixin, ExportingCursorWrapper
 
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     def get_new_connection(self, *args, **kwargs):
         conn = super().get_new_connection(*args, **kwargs)
         conn.cursor_factory = ExportingCursorWrapper(
-            conn.cursor_factory or get_postgres_cursor_class(), "postgis", self.vendor
+            conn.cursor_factory or Cursor(), "postgis", self.vendor
         )
         return conn
 

django_prometheus/db/backends/postgis/base.py

@@ -1,14 +1,14 @@
 from django.db.backends.postgresql import base
+from django.db.backends.postgresql.base import Cursor
 
-from django_prometheus.db.backends.common import get_postgres_cursor_class
 from django_prometheus.db.common import DatabaseWrapperMixin, ExportingCursorWrapper
 
 
 class DatabaseWrapper(DatabaseWrapperMixin, base.DatabaseWrapper):
     def get_new_connection(self, *args, **kwargs):
         conn = super().get_new_connection(*args, **kwargs)
         conn.cursor_factory = ExportingCursorWrapper(
-            conn.cursor_factory or get_postgres_cursor_class(), self.alias, self.vendor
+            conn.cursor_factory or Cursor(), self.alias, self.vendor
         )
         return conn
 

django_prometheus/db/backends/postgresql/base.py

@@ -1,8 +1,6 @@
 import os
 import tempfile
 
-from django import VERSION as DJANGO_VERSION
-
 from testapp.helpers import get_middleware
 
 # SECURITY WARNING: keep the secret key used in production secret!
@@ -135,13 +133,11 @@
         "LOCATION": "redis://127.0.0.1:6666/1",
         "OPTIONS": {"IGNORE_EXCEPTIONS": True},
     },
-}
-
-if DJANGO_VERSION >= (4, 0):
-    CACHES["native_redis"] = {
+    "native_redis": {
         "BACKEND": "django_prometheus.cache.backends.redis.NativeRedisCache",
         "LOCATION": "redis://127.0.0.1:6379/0",
-    }
+    },
+}
 
 
 # Internationalization

django_prometheus/tests/end2end/testapp/settings.py

@@ -1,13 +1,10 @@
 import pytest
-from django import VERSION as DJANGO_VERSION
 from django.core.cache import caches
 from redis import RedisError
 
 from django_prometheus.testutils import assert_metric_equal, get_metric
 
-_SUPPORTED_CACHES = ["memcached.PyLibMCCache", "memcached.PyMemcacheCache", "filebased", "locmem", "redis"]
-if DJANGO_VERSION >= (4, 0):
-    _SUPPORTED_CACHES.append("native_redis")
+_SUPPORTED_CACHES = ["memcached.PyLibMCCache", "memcached.PyMemcacheCache", "filebased", "locmem", "redis", "native_redis"]
 
 
 class TestCachesMetrics: