Merge branch 'main' into serializable

docs/changes.rst

@@ -6,6 +6,8 @@ Pending
 
 * Added support for checking if pytest as the test runner when determining
   if tests are running.
+* Added ``show_toolbar_with_docker`` function to check Docker host IP address
+  when running inside Docker containers.
 * Defines the ``BaseStore`` interface for request storage mechanisms.
 * Added the setting ``TOOLBAR_STORE_CLASS`` to configure the request
   storage mechanism. Defaults to ``debug_toolbar.store.MemoryStore``.

tests/test_csp_rendering.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from django.conf import settings
-from django.http.response import HttpResponse
 from django.test.utils import override_settings
 from html5lib.constants import E
 from html5lib.html5parser import HTMLParser
@@ -122,7 +121,8 @@ def test_redirects_exists(self):
                 self.assertContains(response, "djDebug")
 
                 namespaces = get_namespaces(element=html_root)
-                nonce = response.context["request"].csp_nonce
+                context = response.context
+                nonce = str(context["toolbar"].csp_nonce)
                 self._fail_if_missing(
                     root=html_root, path=".//link", namespaces=namespaces, nonce=nonce
                 )