added functionality to keep unsort the session dict

debug_toolbar/panels/request.py

@@ -59,13 +59,16 @@ def generate_stats(self, request, response):
         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()]
             self.record_stats(
                 {
                     "session": {
-                        "list": [
-                            (k, request.session.get(k))
-                            for k in sorted(request.session.keys())
-                        ]
+                        "list": session_list
                     }
                 }
             )

tests/panels/test_request.py

@@ -104,3 +104,21 @@ def test_namespaced_url(self):
         self.panel.generate_stats(self.request, response)
         panel_stats = self.panel.get_stats()
         self.assertEqual(panel_stats["view_urlname"], "admin:login")
+
+    def test_session_list_sorted_or_not(self):
+        """
+        Verify the session is sorted when all keys are strings.
+
+        See  https://github.com/jazzband/django-debug-toolbar/issues/1668
+        """
+        self.request.session = {
+                1: "value",
+                'data': ['foo', 'bar', 1],
+                (2, 3): "tuple_key",
+            }
+        data = {'list': [(1, 'value'), ('data', ['foo', 'bar', 1]), ((2, 3), 'tuple_key')]}
+        response = self.panel.process_request(self.request)
+        self.panel.generate_stats(self.request, response)
+        panel_stats = self.panel.get_stats()
+        self.assertEqual(panel_stats['session'], data)
+