Skip to content

Commit 98d9191

Browse files
committed
Updated template source call to support Django 1.2
1 parent 922d67f commit 98d9191

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

debug_toolbar/views.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,30 @@ def template_source(request):
146146
Return the source of a template, syntax-highlighted by Pygments if
147147
it's available.
148148
"""
149-
from django.template.loader import find_template_source
149+
from django.template import TemplateDoesNotExist
150150
from django.utils.safestring import mark_safe
151+
from django.conf import settings
151152

152153
template_name = request.GET.get('template', None)
153154
if template_name is None:
154155
return HttpResponseBadRequest('"template" key is required')
155156

156-
source, origin = find_template_source(template_name)
157+
try: # Django 1.2 ...
158+
from django.template.loader import find_template_loader, make_origin
159+
loaders = []
160+
for loader_name in settings.TEMPLATE_LOADERS:
161+
loader = find_template_loader(loader_name)
162+
if loader is not None:
163+
loaders.append(loader)
164+
for loader in loaders:
165+
try:
166+
source, display_name = loader.load_template_source(template_name)
167+
origin = make_origin(display_name, loader, template_name, settings.TEMPLATE_DIRS)
168+
except TemplateDoesNotExist:
169+
source = "Template Does Not Exist: %s" % (template_name,)
170+
except ImportError: # Django 1.1 ...
171+
from django.template.loader import find_template_source
172+
source, origin = find_template_source(template_name)
157173

158174
try:
159175
from pygments import highlight

0 commit comments

Comments
 (0)