diff options
Diffstat (limited to 'jinja2/loaders.py')
| -rw-r--r-- | jinja2/loaders.py | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/jinja2/loaders.py b/jinja2/loaders.py index f8e4f99..a9a2625 100644 --- a/jinja2/loaders.py +++ b/jinja2/loaders.py @@ -13,13 +13,10 @@ import sys import weakref from types import ModuleType from os import path -import six -try: - from hashlib import sha1 -except ImportError: - from sha import new as sha1 +from hashlib import sha1 from jinja2.exceptions import TemplateNotFound from jinja2.utils import open_if_exists, internalcode +from jinja2._compat import string_types, iteritems def split_template_path(template): @@ -154,7 +151,7 @@ class FileSystemLoader(BaseLoader): """ def __init__(self, searchpath, encoding='utf-8'): - if isinstance(searchpath, six.string_types): + if isinstance(searchpath, string_types): searchpath = [searchpath] self.searchpath = list(searchpath) self.encoding = encoding @@ -307,7 +304,7 @@ class FunctionLoader(BaseLoader): rv = self.load_func(template) if rv is None: raise TemplateNotFound(template) - elif isinstance(rv, six.string_types): + elif isinstance(rv, string_types): return rv, None, None return rv @@ -360,7 +357,7 @@ class PrefixLoader(BaseLoader): def list_templates(self): result = [] - for prefix, loader in six.iteritems(self.mapping): + for prefix, loader in iteritems(self.mapping): for template in loader.list_templates(): result.append(prefix + self.delimiter + template) return result @@ -432,7 +429,7 @@ class ModuleLoader(BaseLoader): # create a fake module that looks for the templates in the # path given. mod = _TemplateModule(package_name) - if isinstance(path, six.string_types): + if isinstance(path, string_types): path = [path] else: path = list(path) |