internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 05:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing template integration test for python 2.6 versions

Browse Source 
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
parent fd4ad2c8f2
commit 857456ea5f
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/ansible/plugins/filter/core.py
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 '''