Merge pull request #1412 from folt/fix-1406

fix for #1406

Author: folt

debug_toolbar/panels/request.py

@@ -3,7 +3,7 @@
 from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
-from debug_toolbar.utils import get_name_from_obj
+from debug_toolbar.utils import get_name_from_obj, get_sorted_request_variable
 
 
 class RequestPanel(Panel):
@@ -26,13 +26,12 @@ def nav_subtitle(self):
     def generate_stats(self, request, response):
         self.record_stats(
             {
-                "get": [(k, request.GET.getlist(k)) for k in sorted(request.GET)],
-                "post": [(k, request.POST.getlist(k)) for k in sorted(request.POST)],
-                "cookies": [
-                    (k, request.COOKIES.get(k)) for k in sorted(request.COOKIES)
-                ],
+                "get": get_sorted_request_variable(request.GET),
+                "post": get_sorted_request_variable(request.POST),
+                "cookies": get_sorted_request_variable(request.COOKIES),
             }
         )
+
         view_info = {
             "view_func": _("<no view>"),
             "view_args": "None",

debug_toolbar/utils.py

@@ -210,6 +210,16 @@ def getframeinfo(frame, context=1):
         return (filename, lineno, frame.f_code.co_name, lines, index)
 
 
+def get_sorted_request_variable(variable):
+    """
+    Get a sorted list of variables from the request data.
+    """
+    if isinstance(variable, dict):
+        return [(k, variable.get(k)) for k in sorted(variable)]
+    else:
+        return [(k, variable.getlist(k)) for k in sorted(variable)]
+
+
 def get_stack(context=1):
     """
     Get a list of records for a frame and all higher (calling) frames.

tests/panels/test_request.py

@@ -1,3 +1,5 @@
+from django.http import QueryDict
+
 from ..base import BaseTestCase
 
 
@@ -30,3 +32,55 @@ def test_insert_content(self):
         content = self.panel.content
         self.assertIn("nôt åscíì", content)
         self.assertValidHTML(content)
+
+    def test_query_dict_for_request_in_method_get(self):
+        """
+        Test verifies the correctness of the statistics generation method
+        in the case when the GET request is class QueryDict
+        """
+        self.request.GET = QueryDict("foo=bar")
+        response = self.panel.process_request(self.request)
+        self.panel.generate_stats(self.request, response)
+        # ensure the panel GET request data is processed correctly.
+        content = self.panel.content
+        self.assertIn("foo", content)
+        self.assertIn("bar", content)
+
+    def test_dict_for_request_in_method_get(self):
+        """
+        Test verifies the correctness of the statistics generation method
+        in the case when the GET request is class Dict
+        """
+        self.request.GET = {"foo": "bar"}
+        response = self.panel.process_request(self.request)
+        self.panel.generate_stats(self.request, response)
+        # ensure the panel GET request data is processed correctly.
+        content = self.panel.content
+        self.assertIn("foo", content)
+        self.assertIn("bar", content)
+
+    def test_query_dict_for_request_in_method_post(self):
+        """
+        Test verifies the correctness of the statistics generation method
+        in the case when the POST request is class QueryDict
+        """
+        self.request.GET = QueryDict("foo=bar")
+        response = self.panel.process_request(self.request)
+        self.panel.generate_stats(self.request, response)
+        # ensure the panel POST request data is processed correctly.
+        content = self.panel.content
+        self.assertIn("foo", content)
+        self.assertIn("bar", content)
+
+    def test_dict_for_request_in_method_post(self):
+        """
+        Test verifies the correctness of the statistics generation method
+        in the case when the POST request is class Dict
+        """
+        self.request.GET = {"foo": "bar"}
+        response = self.panel.process_request(self.request)
+        self.panel.generate_stats(self.request, response)
+        # ensure the panel POST request data is processed correctly.
+        content = self.panel.content
+        self.assertIn("foo", content)
+        self.assertIn("bar", content)