Handle non-string template variables in TemplatesPanel

Don't need to sort the context layers are dict objects are comparable.

Fixes #1317

Author: jdufresne

debug_toolbar/panels/templates/panel.py

@@ -88,10 +88,9 @@ def _store_template_info(self, sender, **kwargs):
         for context_layer in context.dicts:
             if hasattr(context_layer, "items") and context_layer:
                 # Check if the layer is in the cache.
-                key_values = sorted(context_layer.items())
                 pformatted = None
-                for _key_values, _pformatted in self.pformat_layers:
-                    if _key_values == key_values:
+                for key_values, _pformatted in self.pformat_layers:
+                    if key_values == context_layer:
                         pformatted = _pformatted
                         break
 
@@ -133,7 +132,7 @@ def _store_template_info(self, sender, **kwargs):
                             finally:
                                 recording(True)
                     pformatted = pformat(temp_layer)
-                    self.pformat_layers.append((key_values, pformatted))
+                    self.pformat_layers.append((context_layer, pformatted))
                 context_list.append(pformatted)
 
         kwargs["context"] = context_list

tests/templates/registration/login.html

@@ -0,0 +1 @@
+{% extends 'base.html' %}

tests/test_integration.py

@@ -2,6 +2,7 @@
 import re
 import unittest
 
+import django
 import html5lib
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
 from django.core import signing
@@ -319,6 +320,25 @@ def test_server_timing_headers(self):
         for expected in expected_partials:
             self.assertTrue(re.compile(expected).search(server_timing))
 
+    def test_auth_login_view_without_redirect(self):
+        response = self.client.get("/login_without_redirect/")
+        self.assertEqual(response.status_code, 200)
+        parser = html5lib.HTMLParser()
+        doc = parser.parse(response.content)
+        el = doc.find(".//*[@id='djDebug']")
+        store_id = el.attrib["data-store-id"]
+        response = self.client.get(
+            "/__debug__/render_panel/",
+            {"store_id": store_id, "panel_id": "TemplatesPanel"},
+        )
+        self.assertEqual(response.status_code, 200)
+        # The key None (without quotes) exists in the list of template
+        # variables.
+        if django.VERSION < (3, 0):
+            self.assertIn("None: &#39;&#39;", response.json()["content"])
+        else:
+            self.assertIn("None: &#x27;&#x27;", response.json()["content"])
+
 
 @unittest.skipIf(webdriver is None, "selenium isn't installed")
 @unittest.skipUnless(

tests/urls.py

@@ -1,3 +1,4 @@
+from django.contrib.auth.views import LoginView
 from django.urls import include, path, re_path
 
 import debug_toolbar
@@ -20,5 +21,6 @@
     path("cached_view/", views.cached_view),
     path("json_view/", views.json_view),
     path("redirect/", views.redirect_view),
+    path("login_without_redirect/", LoginView.as_view(redirect_field_name=None)),
     path("__debug__/", include(debug_toolbar.urls)),
 ]