Base feature detection on django.VERSION

Author: ahumeau

debug_toolbar/_compat.py

@@ -1,3 +1,5 @@
+import django
+
 try:
     from django.contrib.auth.decorators import login_not_required
 except ImportError:
@@ -10,9 +12,9 @@ def login_not_required(view_func):
         return view_func
 
 
-try:
+if django.VERSION >= (6, 0):
     from django.middleware.csp import get_nonce
-except ImportError:
+else:
     # For Django < 6.0, there is no native CSP support, hence no CSP nonces.
     def get_nonce(request):
         return None

tests/test_csp_rendering.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-from importlib.util import find_spec
-
+import django
 from django.conf import settings
 from django.test.utils import override_settings
 from html5lib.constants import E
@@ -22,7 +21,7 @@
 
 VALID_MIDDLEWARE_VARIATIONS = [MIDDLEWARE_CSP_LIB_BEFORE, MIDDLEWARE_CSP_LIB_LAST]
 
-django_has_builtin_csp_support = bool(find_spec("django.middleware.csp"))
+django_has_builtin_csp_support = django.VERSION >= (6, 0)
 if django_has_builtin_csp_support:
     MIDDLEWARE_CSP_BUILTIN_BEFORE = settings.MIDDLEWARE.copy()
     MIDDLEWARE_CSP_BUILTIN_BEFORE.insert(