django-debug-toolbar 5.1.0__tar.gz → 5.2.0__tar.gz

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/.pre-commit-config.yaml

@@ -14,10 +14,15 @@ repos:
     hooks:
     -   id: doc8
 -   repo: https://github.com/adamchainz/django-upgrade
-    rev: 1.23.1
+    rev: 1.24.0
     hooks:
     -   id: django-upgrade
         args: [--target-version, "4.2"]
+-   repo: https://github.com/adamchainz/djade-pre-commit
+    rev: "1.4.0"
+    hooks:
+    -   id: djade
+        args: [--target-version, "4.2"]
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
     hooks:
@@ -29,7 +34,7 @@ repos:
       - id: biome-check
         verbose: true
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.11.0'
+    rev: 'v0.11.7'
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
@@ -39,6 +44,6 @@ repos:
     hooks:
       - id: pyproject-fmt
 -   repo: https://github.com/abravalheri/validate-pyproject
-    rev: v0.24
+    rev: v0.24.1
     hooks:
       - id: validate-pyproject

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-debug-toolbar
-Version: 5.1.0
+Version: 5.2.0
 Summary: A configurable set of panels that display various debug information about the current request/response.
 Project-URL: Changelog, https://django-debug-toolbar.readthedocs.io/en/latest/changes.html
 Project-URL: Documentation, https://django-debug-toolbar.readthedocs.io/
@@ -76,7 +76,7 @@ Here's a screenshot of the toolbar in action:
 In addition to the built-in panels, a number of third-party panels are
 contributed by the community.
 
-The current stable version of the Debug Toolbar is 5.1.0. It works on
+The current stable version of the Debug Toolbar is 5.2.0. It works on
 Django ≥ 4.2.0.
 
 The Debug Toolbar has experimental support for `Django's asynchronous views

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/README.rst

@@ -40,7 +40,7 @@ Here's a screenshot of the toolbar in action:
 In addition to the built-in panels, a number of third-party panels are
 contributed by the community.
 
-The current stable version of the Debug Toolbar is 5.1.0. It works on
+The current stable version of the Debug Toolbar is 5.2.0. It works on
 Django ≥ 4.2.0.
 
 The Debug Toolbar has experimental support for `Django's asynchronous views

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/debug_toolbar/__init__.py

@@ -4,7 +4,7 @@ APP_NAME = "djdt"
 
 # Do not use pkg_resources to find the version but set it here directly!
 # see issue #1446
-VERSION = "5.1.0"
+VERSION = "5.2.0"
 
 # Code that discovers files or modules in INSTALLED_APPS imports this module.
 urls = "debug_toolbar.urls", APP_NAME

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/debug_toolbar/panels/redirects.py

@@ -22,20 +22,8 @@ class RedirectsPanel(Panel):
         Common response processing logic.
         """
         if 300 <= response.status_code < 400:
-            redirect_to = response.get("Location")
-            if redirect_to:
-                status_line = f"{response.status_code} {response.reason_phrase}"
-                cookies = response.cookies
-                context = {
-                    "redirect_to": redirect_to,
-                    "status_line": status_line,
-                    "toolbar": self.toolbar,
-                }
-                # Using SimpleTemplateResponse avoids running global context processors.
-                response = SimpleTemplateResponse(
-                    "debug_toolbar/redirect.html", context
-                )
-                response.cookies = cookies
+            if redirect_to := response.get("Location"):
+                response = self.get_interception_response(response, redirect_to)
                 response.render()
         return response
 
@@ -53,3 +41,22 @@ class RedirectsPanel(Panel):
         if iscoroutine(response):
             return self.aprocess_request(request, response)
         return self._process_response(response)
+
+    def get_interception_response(self, response, redirect_to):
+        """
+        Hook method to allow subclasses to customize the interception response.
+        """
+        status_line = f"{response.status_code} {response.reason_phrase}"
+        cookies = response.cookies
+        original_response = response
+        context = {
+            "redirect_to": redirect_to,
+            "status_line": status_line,
+            "toolbar": self.toolbar,
+            "original_response": original_response,
+        }
+        # Using SimpleTemplateResponse avoids running global context processors.
+        response = SimpleTemplateResponse("debug_toolbar/redirect.html", context)
+        response.cookies = cookies
+        response.original_response = original_response
+        return response

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/debug_toolbar/panels/request.py

@@ -3,7 +3,7 @@ from django.urls import resolve
 from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
-from debug_toolbar.utils import get_name_from_obj, get_sorted_request_variable
+from debug_toolbar.utils import get_name_from_obj, sanitize_and_sort_request_vars
 
 
 class RequestPanel(Panel):
@@ -26,9 +26,9 @@ class RequestPanel(Panel):
     def generate_stats(self, request, response):
         self.record_stats(
             {
-                "get": get_sorted_request_variable(request.GET),
-                "post": get_sorted_request_variable(request.POST),
-                "cookies": get_sorted_request_variable(request.COOKIES),
+                "get": sanitize_and_sort_request_vars(request.GET),
+                "post": sanitize_and_sort_request_vars(request.POST),
+                "cookies": sanitize_and_sort_request_vars(request.COOKIES),
             }
         )
 
@@ -59,13 +59,5 @@ class RequestPanel(Panel):
         self.record_stats(view_info)
 
         if hasattr(request, "session"):
-            try:
-                session_list = [
-                    (k, request.session.get(k)) for k in sorted(request.session.keys())
-                ]
-            except TypeError:
-                session_list = [
-                    (k, request.session.get(k))
-                    for k in request.session.keys()  # (it's not a dict)
-                ]
-            self.record_stats({"session": {"list": session_list}})
+            session_data = dict(request.session)
+            self.record_stats({"session": sanitize_and_sort_request_vars(session_data)})

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/debug_toolbar/panels/templates/views.py

@@ -27,15 +27,18 @@ def template_source(request):
     template_name = request.GET.get("template", template_origin_name)
 
     final_loaders = []
-    loaders = Engine.get_default().template_loaders
+    loaders = list(Engine.get_default().template_loaders)
+
+    while loaders:
+        loader = loaders.pop(0)
 
-    for loader in loaders:
         if loader is not None:
-            # When the loader has loaders associated with it,
-            # append those loaders to the list. This occurs with
-            # django.template.loaders.cached.Loader
+            # Recursively unwrap loaders until we get to loaders which do not
+            # themselves wrap other loaders. This adds support for
+            # django.template.loaders.cached.Loader and the
+            # django-template-partials loader (possibly among others)
             if hasattr(loader, "loaders"):
-                final_loaders += loader.loaders
+                loaders.extend(loader.loaders)
             else:
                 final_loaders.append(loader)
 

{django_debug_toolbar-5.1.0 → django_debug_toolbar-5.2.0}/debug_toolbar/settings.py

@@ -45,7 +45,6 @@ CONFIG_DEFAULTS = {
     "TOOLBAR_LANGUAGE": None,
     "IS_RUNNING_TESTS": "test" in sys.argv,
     "UPDATE_ON_FETCH": False,
-    "DEFAULT_THEME": "auto",
 }