Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #10216. Only try to gather template exception info if the excep…

…tion is a Django TemplateSyntaxError. Thanks, Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12586 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 83e52e316225650467ebbee2d86eff7bd5b566e7 1 parent dc1ad69
@jkocherhans jkocherhans authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 django/views/debug.py
View
11 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 @@ def get_traceback_html(self):
'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()
Please sign in to comment.
Something went wrong with that request. Please try again.