summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/views/debug.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/django/views/debug.py b/django/views/debug.py
index 6312d01c07..e4e23f2563 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -1,15 +1,17 @@
+import datetime
import os
import re
import sys
-import datetime
from django.conf import settings
-from django.template import Template, Context, TemplateDoesNotExist
+from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound
+from django.template import (Template, Context, TemplateDoesNotExist,
+ TemplateSyntaxError)
from django.utils.html import escape
from django.utils.importlib import import_module
-from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound
from django.utils.encoding import smart_unicode, smart_str
+
HIDDEN_SETTINGS = re.compile('SECRET|PASSWORD|PROFANITIES_LIST')
def linebreak_iter(template_source):
@@ -100,7 +102,8 @@ class ExceptionReporter:
'loader': loader_name,
'templates': template_list,
})
- if settings.TEMPLATE_DEBUG and hasattr(self.exc_value, 'source'):
+ if (settings.TEMPLATE_DEBUG and hasattr(self.exc_value, 'source') and
+ isinstance(self.exc_value, TemplateSyntaxError)):
self.get_template_exception_info()
frames = self.get_traceback_frames()