Ref #23643 -- Added plain text report of exception chain.

tricoder42 · timgraham · commit 59383f1e3a8a · 2015-06-01T08:23:54.000-04:00
diff --git a/django/views/debug.py b/django/views/debug.py
@@ -889,10 +889,15 @@ def default_urlconf(request):
 {% else %}
    {{ source_line.0 }} : {{ source_line.1 }}
 {% endifequal %}{% endfor %}{% endif %}
-Traceback:
-{% for frame in frames %}File "{{ frame.filename|escape }}" in {{ frame.function|escape }}
-{% if frame.context_line %}  {{ frame.lineno }}. {{ frame.context_line|escape }}{% endif %}
-{% endfor %}
+Traceback:{% 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 %}{% endif %}{% endifchanged %}
+File "{{ frame.filename|escape }}" in {{ frame.function|escape }}
+{% if frame.context_line %}  {{ frame.lineno }}. {{ frame.context_line|escape }}{% endif %}{% endfor %}
+
 Exception Type: {{ exception_type|escape }}{% if request %} at {{ request.path_info|escape }}{% endif %}
 Exception Value: {{ exception_value|force_escape }}
 </textarea>
diff --git a/tests/view_tests/tests/py3_test_debug.py b/tests/view_tests/tests/py3_test_debug.py
@@ -32,10 +32,13 @@ def test_reporting_of_nested_exceptions(self):
 
         explicit_exc = 'The above exception ({0}) was the direct cause of the following exception:'
         implicit_exc = 'During handling of the above exception ({0}), another exception occurred:'
+
         reporter = ExceptionReporter(request, exc_type, exc_value, tb)
         html = reporter.get_traceback_html()
-        self.assertIn(explicit_exc.format("Top level"), html)
-        self.assertIn(implicit_exc.format("Second exception"), html)
+        # Both messages are twice on page -- one rendered as html,
+        # one as plain text (for pastebin)
+        self.assertEqual(2, html.count(explicit_exc.format("Top level")))
+        self.assertEqual(2, html.count(implicit_exc.format("Second exception")))
 
         text = reporter.get_traceback_text()
         self.assertIn(explicit_exc.format("Top level"), text)
