diff options
| author | Tim Graham <timograham@gmail.com> | 2013-05-30 09:53:07 -0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-05-30 09:53:07 -0700 |
| commit | 7902fd74f1fbc5c47f2feb95e447bb307b37e0c9 (patch) | |
| tree | bfa59c0c23df8d1df05bf94f2a396748bd17d291 | |
| parent | 5074c75a37f88726f3ae057999144545881d3cfc (diff) | |
| parent | 172b50b72224dea985cd665accab2ff3110f6674 (diff) | |
Merge pull request #1027 from intgr/debug_no_exc_message
Clearer explanation when exception has no message
| -rw-r--r-- | django/views/debug.py | 4 | ||||
| -rw-r--r-- | tests/view_tests/tests/test_debug.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/django/views/debug.py b/django/views/debug.py index 4ecd936771..0458580221 100644 --- a/django/views/debug.py +++ b/django/views/debug.py @@ -595,7 +595,7 @@ TECHNICAL_500_TEMPLATE = """ <body> <div id="summary"> <h1>{% if exception_type %}{{ exception_type }}{% else %}Report{% endif %}{% if request %} at {{ request.path_info|escape }}{% endif %}</h1> - <pre class="exception_value">{% if exception_value %}{{ exception_value|force_escape }}{% else %}No exception supplied{% endif %}</pre> + <pre class="exception_value">{% if exception_value %}{{ exception_value|force_escape }}{% else %}No exception message supplied{% endif %}</pre> <table class="meta"> {% if request %} <tr> @@ -940,7 +940,7 @@ Exception Value: {{ exception_value|force_escape }} """ TECHNICAL_500_TEXT_TEMPLATE = """{% load firstof from future %}{% firstof exception_type 'Report' %}{% if request %} at {{ request.path_info }}{% endif %} -{% firstof exception_value 'No exception supplied' %} +{% firstof exception_value 'No exception message supplied' %} {% if request %} Request Method: {{ request.META.REQUEST_METHOD }} Request URL: {{ request.build_absolute_uri }}{% endif %} diff --git a/tests/view_tests/tests/test_debug.py b/tests/view_tests/tests/test_debug.py index 5f48d7a2b8..f686eee0e0 100644 --- a/tests/view_tests/tests/test_debug.py +++ b/tests/view_tests/tests/test_debug.py @@ -178,7 +178,7 @@ class ExceptionReporterTests(TestCase): reporter = ExceptionReporter(request, None, None, None) html = reporter.get_traceback_html() self.assertIn('<h1>Report at /test_view/</h1>', html) - self.assertIn('<pre class="exception_value">No exception supplied</pre>', html) + self.assertIn('<pre class="exception_value">No exception message supplied</pre>', html) self.assertIn('<th>Request Method:</th>', html) self.assertIn('<th>Request URL:</th>', html) self.assertNotIn('<th>Exception Type:</th>', html) |