Fixing template integration test for python 2.6 versions

No longer immediately fallback to to_json if simplejson is not installed
This commit is contained in:
James Cammarata 2015-12-16 18:21:47 -05:00
commit 857456ea5f
2 changed files with 3 additions and 8 deletions

View file

@ -100,9 +100,11 @@ def to_nice_json(a, *args, **kw):
else:
if major >= 2:
return simplejson.dumps(a, indent=4, sort_keys=True, *args, **kw)
try:
return json.dumps(a, indent=4, sort_keys=True, cls=AnsibleJSONEncoder, *args, **kw)
except:
# Fallback to the to_json filter
return to_json(a, *args, **kw)
return json.dumps(a, indent=4, sort_keys=True, cls=AnsibleJSONEncoder, *args, **kw)
def bool(a):
''' return a bool for the arg '''