diff options
Diffstat (limited to 'nikola/plugins/template')
| -rw-r--r-- | nikola/plugins/template/__init__.py | 2 | ||||
| -rw-r--r-- | nikola/plugins/template/jinja.plugin | 2 | ||||
| -rw-r--r-- | nikola/plugins/template/jinja.py | 5 | ||||
| -rw-r--r-- | nikola/plugins/template/mako.plugin | 2 | ||||
| -rw-r--r-- | nikola/plugins/template/mako.py | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/nikola/plugins/template/__init__.py b/nikola/plugins/template/__init__.py index 6ad8bac..a1d17a6 100644 --- a/nikola/plugins/template/__init__.py +++ b/nikola/plugins/template/__init__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright © 2012-2014 Roberto Alsina and others. +# Copyright © 2012-2015 Roberto Alsina and others. # Permission is hereby granted, free of charge, to any # person obtaining a copy of this software and associated diff --git a/nikola/plugins/template/jinja.plugin b/nikola/plugins/template/jinja.plugin index 53b0fec..0bdcb94 100644 --- a/nikola/plugins/template/jinja.plugin +++ b/nikola/plugins/template/jinja.plugin @@ -4,6 +4,6 @@ Module = jinja [Documentation] Author = Roberto Alsina -Version = 0.1 +Version = 1.0 Website = http://getnikola.com Description = Support for Jinja2 templates. diff --git a/nikola/plugins/template/jinja.py b/nikola/plugins/template/jinja.py index 5156f38..82e8397 100644 --- a/nikola/plugins/template/jinja.py +++ b/nikola/plugins/template/jinja.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright © 2012-2014 Roberto Alsina and others. +# Copyright © 2012-2015 Roberto Alsina and others. # Permission is hereby granted, free of charge, to any # person obtaining a copy of this software and associated @@ -114,8 +114,7 @@ class JinjaTemplates(TemplateSystem): ast = self.lookup.parse(source) dep_names = meta.find_referenced_templates(ast) for dep_name in dep_names: - if (dep_name not in visited_templates - and dep_name is not None): + if (dep_name not in visited_templates and dep_name is not None): visited_templates.add(dep_name) queue.append(dep_name) self.dependency_cache[template_name] = deps diff --git a/nikola/plugins/template/mako.plugin b/nikola/plugins/template/mako.plugin index 71f2c71..2fe6d98 100644 --- a/nikola/plugins/template/mako.plugin +++ b/nikola/plugins/template/mako.plugin @@ -4,6 +4,6 @@ Module = mako [Documentation] Author = Roberto Alsina -Version = 0.1 +Version = 1.0 Website = http://getnikola.com Description = Support for Mako templates. diff --git a/nikola/plugins/template/mako.py b/nikola/plugins/template/mako.py index b9d856e..e5545f6 100644 --- a/nikola/plugins/template/mako.py +++ b/nikola/plugins/template/mako.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright © 2012-2014 Roberto Alsina and others. +# Copyright © 2012-2015 Roberto Alsina and others. # Permission is hereby granted, free of charge, to any # person obtaining a copy of this software and associated @@ -115,7 +115,7 @@ class MakoTemplates(TemplateSystem): def render_template_to_string(self, template, context): """ Render template to a string using context. """ - context = context.update(self.filters) + context.update(self.filters) return Template(template).render(**context) |