summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToshio Kuratomi <toshio@fedoraproject.org>2015-01-26 22:04:51 -0800
committerJames Cammarata <jimi@sngx.net>2015-02-17 14:03:11 -0600
commit71934a118c4642a3ca49d3aac85f68cb625573e5 (patch)
tree3407ea1ed585fd41272521c4441e014328444135
parent1771413c23dfe79c87d4387018cfff64233d8dad (diff)
downloadansible-71934a118c4642a3ca49d3aac85f68cb625573e5.tar.gz
Another place that needs to be json_dict_bytes_to_unicode
Conflicts: v2/ansible/inventory/script.py
-rw-r--r--lib/ansible/inventory/script.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/inventory/script.py b/lib/ansible/inventory/script.py
index c599791e7d..6301d31879 100644
--- a/lib/ansible/inventory/script.py
+++ b/lib/ansible/inventory/script.py
@@ -144,7 +144,7 @@ class InventoryScript(object):
if out.strip() == '':
return dict()
try:
- return json_dict_unicode_to_bytes(utils.parse_json(out))
+ return json_dict_bytes_to_unicode(utils.parse_json(out))
except ValueError:
raise errors.AnsibleError("could not parse post variable response: %s, %s" % (cmd, out))