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/57638
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
(cherry picked from commit f709d2e2bb)
This commit is contained in:
Paul Belanger 2019-06-10 10:11:32 -04:00 committed by Toshio Kuratomi
parent ce3e358587
commit d419a2777c
2 changed files with 5 additions and 2 deletions

View file

@ -0,0 +1,2 @@
bugfixes:
- netconf - Make netconf_get python3 compatible.

View file

@ -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,