From 3453dace8546af7de048b7d7e03593d16fb0365d Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Fri, 12 Oct 2018 10:04:37 -0400 Subject: [PATCH] use to_text instead of str in async_status (#45990) * use to_text instead of str in async_status * used to_native instead as per feedback --- changelogs/fragments/async_statys_pyx_compat_fix.yml | 2 ++ lib/ansible/modules/utilities/logic/async_status.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 changelogs/fragments/async_statys_pyx_compat_fix.yml diff --git a/changelogs/fragments/async_statys_pyx_compat_fix.yml b/changelogs/fragments/async_statys_pyx_compat_fix.yml new file mode 100644 index 0000000000..0e6b2b9196 --- /dev/null +++ b/changelogs/fragments/async_statys_pyx_compat_fix.yml @@ -0,0 +1,2 @@ +bugfixes: + - use to_text (py2/3 safe) instead of str for 'textualizing' intput in async_status diff --git a/lib/ansible/modules/utilities/logic/async_status.py b/lib/ansible/modules/utilities/logic/async_status.py index a22e3d2055..32dcdb2388 100644 --- a/lib/ansible/modules/utilities/logic/async_status.py +++ b/lib/ansible/modules/utilities/logic/async_status.py @@ -42,6 +42,7 @@ author: import json import os +from ansible.module_utils._text import to_native from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.six import iteritems @@ -93,7 +94,7 @@ def main(): data['finished'] = 0 # Fix error: TypeError: exit_json() keywords must be strings - data = dict([(str(k), v) for k, v in iteritems(data)]) + data = dict([(to_native(k), v) for k, v in iteritems(data)]) module.exit_json(**data)