Mercurial > hatta

changeset 2460:490966f6a530

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
drop default value for templates dir; use it only when manually set
author Vlad Glagolev <scm@vaygr.net>
date Tue, 23 Dec 2014 18:25:20 +0300
parents 614423797e10
children c4b8828458b3
files hatta/wiki.py
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hatta/wiki.py	Tue Dec 23 13:44:34 2014 +0300
+++ b/hatta/wiki.py	Tue Dec 23 18:25:20 2014 +0300
@@ -53,12 +53,14 @@
 
 
 def init_template(translation, template_path):
+    loaders = [ jinja2.PackageLoader('hatta', 'templates') ]
+
+    if template_path is not None:
+        loaders.insert(0, jinja2.FileSystemLoader(os.path.abspath(template_path)))
+
     template_env = jinja2.Environment(
         extensions=['jinja2.ext.i18n'],
-        loader=jinja2.ChoiceLoader([
-            jinja2.FileSystemLoader(template_path),
-            jinja2.PackageLoader('hatta', 'templates')
-        ]),
+        loader=jinja2.ChoiceLoader(loaders),
     )
     template_env.autoescape = True
     template_env.install_gettext_translations(translation, True)
@@ -85,8 +87,7 @@
         self.language = config.get('language')
         translation = init_gettext(self.language)
         self.gettext = translation.ugettext
-        self.template_path = os.path.abspath(config.get('template_path',
-                                                        'templates'))
+        self.template_path = config.get('template_path')
         self.template_env = init_template(translation, self.template_path)
         self.path = os.path.abspath(config.get('pages_path', 'docs'))
         self.repo_path = config.get('repo_path')