cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

When using jsonify in modules, try several unicode encoding for dumps()

Browse source 
Fixes #4821
This commit is contained in:
James Cammarata 2014-02-11 14:19:00 -06:00
parent ce0b1a8a96
commit a023cbce14
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/module_utils/basic.py
View file

@ -840,7 +840,12 @@ class AnsibleModule(object):
self.fail_json(msg='Boolean %s not in either boolean list' % arg)
def jsonify(self, data):
return json.dumps(data)
for encoding in ("utf-8", "latin-1", "unicode_escape"):
try:
return json.dumps(data, encoding=encoding)
except UnicodeDecodeError, e:
continue
self.fail_json(msg='Invalid unicode encoding encountered')
def from_json(self, data):
return json.loads(data)