test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #30411 -- Improved formatting of text tracebacks in technical 500 templates. 

Co-Authored-By: Daniel Hahler <git@thequod.de>
This commit is contained in:
Jerrod Martin 2019-07-25 21:44:27 -04:00 committed by Mariusz Felisiak
parent 68aeb90160
commit c7bef16a74
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,14 +313,13 @@ In template {{ template_info.name }}, error at line {{ template_info.line }}
{{ template_info.message }} {{ template_info.message }}
{% for source_line in template_info.source_lines %}{% if source_line.0 == template_info.line %} {{ source_line.0 }} : {{ template_info.before }} {{ template_info.during }} {{ template_info.after }}{% else %} {{ source_line.0 }} : {{ source_line.1 }}{% endif %}{% endfor %}{% endif %} {% for source_line in template_info.source_lines %}{% if source_line.0 == template_info.line %} {{ source_line.0 }} : {{ template_info.before }} {{ template_info.during }} {{ template_info.after }}{% else %} {{ source_line.0 }} : {{ source_line.1 }}{% endif %}{% endfor %}{% endif %}
Traceback:{% for frame in frames %} Traceback (most recent call last):{% for frame in frames %}
{% ifchanged frame.exc_cause %}{% if frame.exc_cause %}{% if frame.exc_cause_explicit %} {% ifchanged frame.exc_cause %}{% if frame.exc_cause %}{% if frame.exc_cause_explicit %}
The above exception ({{ frame.exc_cause|force_escape }}) was the direct cause of the following exception: The above exception ({{ frame.exc_cause|force_escape }}) was the direct cause of the following exception:
{% else %} {% else %}
During handling of the above exception ({{ frame.exc_cause|force_escape }}), another exception occurred: During handling of the above exception ({{ frame.exc_cause|force_escape }}), another exception occurred:
{% endif %}{% endif %}{% endifchanged %} {% endif %}{% endif %}{% endifchanged %} File "{{ frame.filename }}"{% if frame.context_line %}, line {{ frame.lineno }}{% endif %}, in {{ frame.function }}
File "{{ frame.filename }}" in {{ frame.function }} {% if frame.context_line %} {% spaceless %}{{ frame.context_line }}{% endspaceless %}{% endif %}{% endfor %}
{% if frame.context_line %} {{ frame.lineno }}. {{ frame.context_line }}{% endif %}{% endfor %}
Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %} Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %}
Exception Value: {{ exception_value|force_escape }} Exception Value: {{ exception_value|force_escape }}

7
django/views/templates/technical_500.txt
View File

@ -27,12 +27,11 @@ In template {{ template_info.name }}, error at line {{ template_info.line }}
{{ template_info.message }} {{ template_info.message }}
{% for source_line in template_info.source_lines %}{% if source_line.0 == template_info.line %} {{ source_line.0 }} : {{ template_info.before }} {{ template_info.during }} {{ template_info.after }}{% else %} {{ source_line.0 }} : {{ source_line.1 }}{% endif %}{% endfor %}{% endif %}{% if frames %} {% for source_line in template_info.source_lines %}{% if source_line.0 == template_info.line %} {{ source_line.0 }} : {{ template_info.before }} {{ template_info.during }} {{ template_info.after }}{% else %} {{ source_line.0 }} : {{ source_line.1 }}{% endif %}{% endfor %}{% endif %}{% if frames %}
Traceback: Traceback (most recent call last):
{% for frame in frames %}{% ifchanged frame.exc_cause %}{% if frame.exc_cause %} {% for frame in frames %}{% ifchanged frame.exc_cause %}{% if frame.exc_cause %}
{% if frame.exc_cause_explicit %}The above exception ({{ frame.exc_cause }}) was the direct cause of the following exception:{% else %}During handling of the above exception ({{ frame.exc_cause }}), another exception occurred:{% endif %} {% if frame.exc_cause_explicit %}The above exception ({{ frame.exc_cause }}) was the direct cause of the following exception:{% else %}During handling of the above exception ({{ frame.exc_cause }}), another exception occurred:{% endif %}
{% endif %}{% endifchanged %} {% endif %}{% endifchanged %} File "{{ frame.filename }}"{% if frame.context_line %}, line {{ frame.lineno }}{% endif %}, in {{ frame.function }}
File "{{ frame.filename }}" in {{ frame.function }} {% if frame.context_line %} {% spaceless %}{{ frame.context_line }}{% endspaceless %}{% endif %}
{% if frame.context_line %} {{ frame.lineno }}. {{ frame.context_line }}{% endif %}
{% endfor %} {% endfor %}
{% if exception_type %}Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %} {% if exception_type %}Exception Type: {{ exception_type }}{% if request %} at {{ request.path_info }}{% endif %}
{% if exception_value %}Exception Value: {{ exception_value }}{% endif %}{% endif %}{% endif %} {% if exception_value %}Exception Value: {{ exception_value }}{% endif %}{% endif %}{% endif %}

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

@ -415,9 +415,18 @@ class ExceptionReporterTests(SimpleTestCase):
self.assertEqual(last_frame['function'], 'funcName') self.assertEqual(last_frame['function'], 'funcName')
self.assertEqual(last_frame['lineno'], 2) self.assertEqual(last_frame['lineno'], 2)
html = reporter.get_traceback_html() html = reporter.get_traceback_html()
self.assertIn('generated in funcName', html) self.assertIn('generated in funcName, line 2', html)
self.assertIn(
'"generated", line 2, in funcName\n'
' &lt;source code not available&gt;',
html,
)
text = reporter.get_traceback_text() text = reporter.get_traceback_text()
self.assertIn('"generated" in funcName', text) self.assertIn(
'"generated", line 2, in funcName\n'
' <source code not available>',
text,
)
def test_reporting_frames_for_cyclic_reference(self): def test_reporting_frames_for_cyclic_reference(self):
try: try:
@ -698,7 +707,7 @@ class PlainTextReportTests(SimpleTestCase):
self.assertIn('USER: jacob', text) self.assertIn('USER: jacob', text)
self.assertIn('Exception Type:', text) self.assertIn('Exception Type:', text)
self.assertIn('Exception Value:', text) self.assertIn('Exception Value:', text)
self.assertIn('Traceback:', text) self.assertIn('Traceback (most recent call last):', text)
self.assertIn('Request information:', text) self.assertIn('Request information:', text)
self.assertNotIn('Request data not supplied', text) self.assertNotIn('Request data not supplied', text)
@ -717,7 +726,7 @@ class PlainTextReportTests(SimpleTestCase):
self.assertNotIn('USER:', text) self.assertNotIn('USER:', text)
self.assertIn('Exception Type:', text) self.assertIn('Exception Type:', text)
self.assertIn('Exception Value:', text) self.assertIn('Exception Value:', text)
self.assertIn('Traceback:', text) self.assertIn('Traceback (most recent call last):', text)
self.assertIn('Request data not supplied', text) self.assertIn('Request data not supplied', text)
def test_no_exception(self): def test_no_exception(self):