From f709d2e2bbd47efa0e4ac7eb519e1ba0e4d4b0ee Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 10 Jun 2019 10:11:32 -0400 Subject: [PATCH] Make netconf_get python3 compat (#57578) This uses to_text to ensure tostring() from lxml is decoded properly. Depends-On: https://github.com/ansible/ansible/pull/57309 Signed-off-by: Paul Belanger --- lib/ansible/modules/network/netconf/netconf_get.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/network/netconf/netconf_get.py b/lib/ansible/modules/network/netconf/netconf_get.py index debed8c91a..68bf1b3aeb 100644 --- a/lib/ansible/modules/network/netconf/netconf_get.py +++ b/lib/ansible/modules/network/netconf/netconf_get.py @@ -159,6 +159,7 @@ except ImportError: from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.network.netconf.netconf import get_capabilities, locked_config, get_config, get from ansible.module_utils.network.common.netconf import remove_namespaces +from ansible.module_utils._text import to_text try: import jxmlease @@ -235,7 +236,7 @@ def main(): else: response = get(module, filter_spec, execute_lock) - xml_resp = tostring(response) + xml_resp = to_text(tostring(response)) output = None if display == 'xml': @@ -246,7 +247,7 @@ def main(): except Exception: raise ValueError(xml_resp) elif display == 'pretty': - output = tostring(response, pretty_print=True) + output = to_text(tostring(response, pretty_print=True)) result = { 'stdout': xml_resp,