maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Fixed a template lookup error

Browse source
This commit is contained in:
Armin Ronacher 2010-07-06 19:24:50 +02:00
parent 596ae0ced5
commit 0a93c552cc
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
flask/templating.py
View file

@ -34,21 +34,23 @@ class _DispatchingJinjaLoader(BaseLoader):
self.app = app
def get_source(self, environment, template):
name = template
loader = None
try:
module, name = template.split('/', 1)
loader = self.app.modules[module].jinja_loader
if loader is None:
raise ValueError()
except (ValueError, KeyError):
pass
if loader is None:
loader = self.app.jinja_loader
try:
return loader.get_source(environment, name)
except TemplateNotFound:
# re-raise the exception with the correct fileame here.
# (the one that includes the prefix)
raise TemplateNotFound(template)
if loader is not None:
return loader.get_source(environment, template)
else:
try:
return loader.get_source(environment, name)
except TemplateNotFound:
pass
# raise the exception with the correct fileame here.
# (the one that includes the prefix)
raise TemplateNotFound(template)
def list_templates(self):
result = self.app.jinja_loader.list_templates()