Use tasks support checker in instrumentation method

Author: Chiemezuo

debug_toolbar/panels/tasks.py

@@ -1,3 +1,4 @@
+import django
 from django.utils.translation import gettext_lazy as _, ngettext
 
 from debug_toolbar.panels import Panel
@@ -34,27 +35,23 @@ def generate_stats(self, request, response):
 
     def enable_instrumentation(self):
         """Hook into task system to collect queued tasks"""
-        try:
-            import django
-
-            if django.VERSION < (6, 0):
-                return
-            from django.tasks import Task
+        if self._tasks_available is False:
+            # Django tasks not available means that we cannot instrument
+            return
+        from django.tasks import Task
 
-            print("[TasksPanel] instrumentation enabled:", hasattr(Task, "enqueue"))
+        print("[TasksPanel] instrumentation enabled:", hasattr(Task, "enqueue"))
 
-            # Store original enqueue method
-            if hasattr(Task, "enqueue"):
-                self._original_enqueue = Task.enqueue
+        # Store original enqueue method
+        if hasattr(Task, "enqueue"):
+            self._original_enqueue = Task.enqueue
 
-                def wrapped_enqueue(task, *args, **kwargs):
-                    result = self._original_enqueue(task, *args, **kwargs).return_value
-                    self._record_task(task, args, kwargs, result)
-                    return result
+            def wrapped_enqueue(task, *args, **kwargs):
+                result = self._original_enqueue(task, *args, **kwargs).return_value
+                self._record_task(task, args, kwargs, result)
+                return result
 
-                Task.enqueue = wrapped_enqueue
-        except (ImportError, AttributeError):
-            pass
+            Task.enqueue = wrapped_enqueue
 
     def _record_task(self, task, args, kwargs, result):
         """Record a task that was queued"""
@@ -75,13 +72,9 @@ def disable_instrumentation(self):
         except (ImportError, AttributeError):
             pass
 
-    def _check_tasks_available(self):
+    @property
+    def _tasks_available(self) -> bool:
         """Check if Django tasks system is available"""
-        try:
-            import django
-
-            if django.VERSION < (6, 0):
-                return False
-            return True
-        except (ImportError, AttributeError):
+        if django.VERSION < (6, 0):
             return False
+        return True

debug_toolbar/templates/debug_toolbar/panels/tasks.html

@@ -1,7 +1,9 @@
+{% load i18n %}
+
 <table>
     <thead>
         <tr>
-            <th>Task Info</th>
+            <th>{% translate "Task Info" %}</th>
         </tr>
     </thead>
     <tbody>