Merge pull request #437 from sparkprime/jinja_imports

Expandybird: Fix Jinja file imports

Merge pull request #437 from sparkprime/jinja_imports
Expandybird: Fix Jinja file imports
ca854af5 · Dave Cunningham · 873a8af4 · 148129d9 · ca854af5
Commit ca854af5 authored Mar 23, 2016 by Dave Cunningham
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

expansion.py expansion/expansion.py +3 -1

No files found.
--- a/expansion/expansion.py
+++ b/expansion/expansion.py
@@ -282,7 +282,9 @@ def ExpandJinja(file_name, source_template, resource, imports):
    """

    try:
-        env = jinja2.Environment(loader=jinja2.DictLoader(imports))
+        jinja_imports = (
+            {i['path']: i['content'] for _, i in imports.iteritems()})
+        env = jinja2.Environment(loader=jinja2.DictLoader(jinja_imports))

        template = env.from_string(source_template)