aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/views.py
diff options
context:
space:
mode:
authorRob Hudson2010-11-08 15:41:25 -0800
committerRob Hudson2010-11-08 15:41:25 -0800
commit8cb8abae8cec44909947dbe54e1ed644deeecbd6 (patch)
tree4b5ed43a7a262b9e5f7434a26ee3c5e453941692 /debug_toolbar/views.py
parentee1811238e91ae0ad33413b0d40d2f8482101951 (diff)
parentecfff96d5894aa9ad505149b9c26c9647d5af4e0 (diff)
downloaddjango-debug-toolbar-8cb8abae8cec44909947dbe54e1ed644deeecbd6.tar.bz2
Merge branch 'release/0.8.4'0.8.4
Diffstat (limited to 'debug_toolbar/views.py')
-rw-r--r--debug_toolbar/views.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/debug_toolbar/views.py b/debug_toolbar/views.py
index 9828c44..bc6cdb3 100644
--- a/debug_toolbar/views.py
+++ b/debug_toolbar/views.py
@@ -165,9 +165,10 @@ def template_source(request):
try:
source, display_name = loader.load_template_source(template_name)
origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
+ break
except TemplateDoesNotExist:
source = "Template Does Not Exist: %s" % (template_name,)
- except ImportError: # Django 1.1 ...
+ except (ImportError, AttributeError): # Django 1.1 ...
from django.template.loader import find_template_source
source, origin = find_template_source(template_name)