innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #7697 -- Removed unnecessary force_escape of technical 500 debug view "unicode hint". 

The test passes before and after the removal. unicode_hint will never
be SafeText, so normal autoescaping is sufficient.
This commit is contained in:
Tim Graham 2017-08-02 15:15:49 -04:00
parent 74b7a20fe6
commit 293608a2e0
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/views/templates/technical_500.html
View File

@ -162,7 +162,7 @@
{% if unicode_hint %} {% if unicode_hint %}
<div id="unicode-hint"> <div id="unicode-hint">
<h2>Unicode error hint</h2> <h2>Unicode error hint</h2>
<p>The string that could not be encoded/decoded was: <strong>{{ unicode_hint|force_escape }}</strong></p> <p>The string that could not be encoded/decoded was: <strong>{{ unicode_hint }}</strong></p>
</div> </div>
{% endif %} {% endif %}
{% if template_does_not_exist %} {% if template_does_not_exist %}

10
tests/view_tests/tests/test_debug.py
View File

@ -18,6 +18,7 @@ from django.test.utils import LoggingCaptureMixin, patch_logger
from django.urls import reverse from django.urls import reverse
from django.utils.encoding import force_bytes from django.utils.encoding import force_bytes
from django.utils.functional import SimpleLazyObject from django.utils.functional import SimpleLazyObject
from django.utils.safestring import mark_safe
from django.views.debug import ( from django.views.debug import (
CLEANSED_SUBSTITUTE, CallableSettingWrapper, ExceptionReporter, CLEANSED_SUBSTITUTE, CallableSettingWrapper, ExceptionReporter,
cleanse_setting, technical_500_response, cleanse_setting, technical_500_response,
@ -447,16 +448,19 @@ class ExceptionReporterTests(SimpleTestCase):
self.assertIn('&lt;trimmed %d bytes string&gt;' % (large + repr_of_str_adds,), html) self.assertIn('&lt;trimmed %d bytes string&gt;' % (large + repr_of_str_adds,), html)
def test_encoding_error(self): def test_encoding_error(self):
"""A UnicodeError displays a portion of the problematic string.""" """
A UnicodeError displays a portion of the problematic string. HTML in
safe strings is escaped.
"""
try: try:
'abcdefghijklmnὀpqrstuwxyz'.encode('ascii') mark_safe('abcdefghijkl<p>mnὀp</p>qrstuwxyz').encode('ascii')
except Exception: except Exception:
exc_type, exc_value, tb = sys.exc_info() exc_type, exc_value, tb = sys.exc_info()
reporter = ExceptionReporter(None, exc_type, exc_value, tb) reporter = ExceptionReporter(None, exc_type, exc_value, tb)
html = reporter.get_traceback_html() html = reporter.get_traceback_html()
self.assertIn('<h2>Unicode error hint</h2>', html) self.assertIn('<h2>Unicode error hint</h2>', html)
self.assertIn('The string that could not be encoded/decoded was: ', html) self.assertIn('The string that could not be encoded/decoded was: ', html)
self.assertIn('<strong>jklmnὀpqrst</strong>', html) self.assertIn('<strong>&lt;p&gt;mnὀp&lt;/p&gt;</strong>', html)
def test_unfrozen_importlib(self): def test_unfrozen_importlib(self):
""" """