Commit 9be732d8 by Michael DeHaan

Merge pull request #6679 from renard/fix-simplejson-module

Fix TypeError when using old simplejson lib.
parents ebd1f70c ef6b437d
......@@ -884,6 +884,9 @@ class AnsibleModule(object):
for encoding in ("utf-8", "latin-1", "unicode_escape"):
try:
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:
continue
self.fail_json(msg='Invalid unicode encoding encountered')
......
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