Merge pull request #1027 from intgr/debug_no_exc_message

Clearer explanation when exception has no message
django · May 30, 2013 · 7902fd7 · 7902fd7
2 parents 5074c75 + 172b50b
commit 7902fd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/django/views/debug.py b/django/views/debug.py
@@ -595,7 +595,7 @@ def default_urlconf(request):
 <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 @@ def default_urlconf(request):
 """
 
 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
@@ -178,7 +178,7 @@ def test_no_exception(self):
         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)