ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-26 06:31:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Netconf bytes fixes (#41607)

Browse source 
* Solve some bytes issues on iosxr

* Solve some bytes issues in junos

* Do the correct thing with tostring based on lxml or not
This commit is contained in:
Nathaniel Case 2018-06-22 11:50:44 -04:00 • committed by GitHub
commit 9aa8c652ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 54 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/module_utils/network/iosxr/iosxr.py
View file

@ -260,31 +260,25 @@ def build_xml(container, xmap=None, params=None, opcode=None):
for item in subtree_list:
container_ele.append(item)
return etree.tostring(root)
return etree.tostring(root, encoding='unicode')
def etree_find(root, node):
try:
element = etree.fromstring(root).find('.//' + to_bytes(node, errors='surrogate_then_replace').strip())
except Exception:
element = etree.fromstring(etree.tostring(root)).find('.//' + to_bytes(node, errors='surrogate_then_replace').strip())
root = etree.fromstring(to_bytes(root))
except (ValueError, etree.XMLSyntaxError):
pass
if element is not None:
return element
return None
return root.find('.//%s' % node.strip())
def etree_findall(root, node):
try:
element = etree.fromstring(root).findall('.//' + to_bytes(node, errors='surrogate_then_replace').strip())
except Exception:
element = etree.fromstring(etree.tostring(root)).findall('.//' + to_bytes(node, errors='surrogate_then_replace').strip())
root = etree.fromstring(to_bytes(root))
except (ValueError, etree.XMLSyntaxError):
pass
if element is not None:
return element
return None
return root.findall('.//%s' % node.strip())
def is_cliconf(module):