Skip to content

A
ansible
Commit 9b6cf8db by Michael DeHaan
Options

Merge pull request #977 from jpmens/fromjson 

Jinja2 filter from_json added, to_json renamed
parents f140332f a37c6ea9
Showing with 2 additions and 1 deletions
lib/ansible/utils.py
...@@ -241,7 +241,8 @@ def template_from_file(basedir, path, vars): ...@@ -241,7 +241,8 @@ def template_from_file(basedir, path, vars):
''' run a file through the templating engine ''' ''' run a file through the templating engine '''
environment = jinja2.Environment(loader=jinja2.FileSystemLoader(basedir), trim_blocks=False) environment = jinja2.Environment(loader=jinja2.FileSystemLoader(basedir), trim_blocks=False)
environment.filters['tojson'] = json.dumps environment.filters['to_json'] = json.dumps
environment.filters['from_json'] = json.loads
data = codecs.open(path_dwim(basedir, path), encoding="utf8").read() data = codecs.open(path_dwim(basedir, path), encoding="utf8").read()
t = environment.from_string(data) t = environment.from_string(data)
vars = vars.copy() vars = vars.copy()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment