cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make netconf_get python3 compat (#57578)

Browse source 
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 <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2019-06-10 10:11:32 -04:00 committed by Daniel Mellado Area
parent a867ced4de
commit f709d2e2bb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/network/netconf/netconf_get.py
View file

@ -159,6 +159,7 @@ except ImportError:
from ansible.module_utils.basic import AnsibleModule 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.netconf.netconf import get_capabilities, locked_config, get_config, get
from ansible.module_utils.network.common.netconf import remove_namespaces from ansible.module_utils.network.common.netconf import remove_namespaces
from ansible.module_utils._text import to_text
try: try:
import jxmlease import jxmlease
@ -235,7 +236,7 @@ def main():
else: else:
response = get(module, filter_spec, execute_lock) response = get(module, filter_spec, execute_lock)
xml_resp = tostring(response) xml_resp = to_text(tostring(response))
output = None output = None
if display == 'xml': if display == 'xml':
@ -246,7 +247,7 @@ def main():
except Exception: except Exception:
raise ValueError(xml_resp) raise ValueError(xml_resp)
elif display == 'pretty': elif display == 'pretty':
output = tostring(response, pretty_print=True) output = to_text(tostring(response, pretty_print=True))
result = { result = {
'stdout': xml_resp, 'stdout': xml_resp,