changed import reference of force_str to sanitize.py

Author: James Gutu

debug_toolbar/forms.py

@@ -3,7 +3,7 @@
 from django import forms
 from django.core import signing
 from django.core.exceptions import ValidationError
-from django.utils.encoding import force_str
+from debug_toolbar.sanitize import force_str
 
 
 class SignedDataForm(forms.Form):

debug_toolbar/panels/settings.py

@@ -1,8 +1,8 @@
-from django.utils.encoding import DjangoUnicodeDecodeError, force_str
 from django.utils.translation import gettext_lazy as _
 from django.views.debug import get_default_exception_reporter_filter
 
 from debug_toolbar.panels import Panel
+from debug_toolbar.sanitize import force_str
 
 get_safe_settings = get_default_exception_reporter_filter().get_safe_settings
 
@@ -24,17 +24,12 @@ def title(self):
         )
 
     def generate_stats(self, request, response):
-        def catch_force_errors(force_function, value):
-            try:
-                return force_function(value)
-            except DjangoUnicodeDecodeError:
-                return "Django Debug Toolbar was unable to parse value."
-
         self.record_stats(
             {
                 "settings": {
-                    key: catch_force_errors(force_str, value)
+                    key: force_str(value)
                     for key, value in sorted(get_safe_settings().items())
                 }
             }
         )
+

debug_toolbar/panels/sql/tracking.py

@@ -5,7 +5,7 @@
 from time import perf_counter
 
 import django.test.testcases
-from django.utils.encoding import force_str
+from debug_toolbar.sanitize import force_str
 
 from debug_toolbar.utils import get_stack_trace, get_template_info
 

debug_toolbar/panels/templates/panel.py

@@ -10,10 +10,10 @@
 from django.test.signals import template_rendered
 from django.test.utils import instrumented_test_render
 from django.urls import path
-from django.utils.encoding import force_str
 from django.utils.translation import gettext_lazy as _
 
 from debug_toolbar.panels import Panel
+from debug_toolbar.sanitize import force_str
 from debug_toolbar.panels.sql.tracking import SQLQueryTriggered, allow_sql
 from debug_toolbar.panels.templates import views
 

debug_toolbar/sanitize.py

@@ -0,0 +1,8 @@
+from django.utils.encoding import DjangoUnicodeDecodeError, force_str as force_string
+
+
+def force_str(force_function, value):
+    try:
+        return force_string(value)
+    except DjangoUnicodeDecodeError:
+        return "Django Debug Toolbar was unable to parse value."

debug_toolbar/store.py

@@ -6,9 +6,10 @@
 
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import transaction
-from django.utils.encoding import force_str
+
 from django.utils.module_loading import import_string
 
+from debug_toolbar.sanitize import force_str
 from debug_toolbar import settings as dt_settings
 from debug_toolbar.models import HistoryEntry