Merge pull request #6679 from renard/fix-simplejson-module
Fix TypeError when using old simplejson lib.
This commit is contained in:
commit
9be732d8f2
1 changed files with 3 additions and 0 deletions
|
@ -884,6 +884,9 @@ class AnsibleModule(object):
|
||||||
for encoding in ("utf-8", "latin-1", "unicode_escape"):
|
for encoding in ("utf-8", "latin-1", "unicode_escape"):
|
||||||
try:
|
try:
|
||||||
return json.dumps(data, encoding=encoding)
|
return json.dumps(data, encoding=encoding)
|
||||||
|
# Old systems using simplejson module does not support encoding keyword.
|
||||||
|
except TypeError, e:
|
||||||
|
return json.dumps(data)
|
||||||
except UnicodeDecodeError, e:
|
except UnicodeDecodeError, e:
|
||||||
continue
|
continue
|
||||||
self.fail_json(msg='Invalid unicode encoding encountered')
|
self.fail_json(msg='Invalid unicode encoding encountered')
|
||||||
|
|
Loading…
Reference in a new issue