openstack
/
deb-python-coffin
Code Issues Proposed changes

Merge pull request #41 from midiotthimble/master 

closes #40 -- fix jinja_loader_from_django_loader
This commit is contained in:
Michael Elsdörfer 2012-11-02 15:39:51 +01:00
parent acd0c583e3 43bc309608
commit 8c62cc2260
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coffin/template/loaders.py
View File

@ -1,5 +1,8 @@
import re
from jinja2 import loaders
match_loader = re.compile(r'^(django|coffin)\.')
def jinja_loader_from_django_loader(django_loader, args=None):
"""Attempts to make a conversion from the given Django loader to an
@ -9,7 +12,7 @@ def jinja_loader_from_django_loader(django_loader, args=None):
:return: The similarly-behaving Jinja loader, or None if a similar loader
could not be found.
"""
if not django_loader.startswith('django.'):
if not match_loader.match(django_loader):
return None
for substr, func in _JINJA_LOADER_BY_DJANGO_SUBSTR.iteritems():
if substr in django_loader:
@ -46,6 +49,8 @@ _JINJA_LOADER_BY_DJANGO_SUBSTR = { # {substr: callable, ...}
'app_directories': _make_jinja_app_loader,
'filesystem': _make_jinja_filesystem_loader,
'cached': _make_jinja_cached_loader,
'AppLoader': _make_jinja_app_loader,
'FileSystemLoader': _make_jinja_filesystem_loader,
}