ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

xml: make module work with lxml 5.1.1 (#8169)

Browse source 
Make module work with lxml 5.1.1.
This commit is contained in:
Felix Fontein 2024-03-30 22:32:51 +01:00 committed by GitHub
parent b463571902
commit b444e8739c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelogs/fragments/8169-lxml.yml Normal file
View file

@ -0,0 +1,2 @@
bugfixes:
- "xml - make module work with lxml 5.1.1, which removed some internals that the module was relying on (https://github.com/ansible-collections/community.general/pull/8169)."

9
plugins/modules/xml.py
View file

@ -436,11 +436,16 @@ def is_attribute(tree, xpath, namespaces):
""" Test if a given xpath matches and that match is an attribute """ Test if a given xpath matches and that match is an attribute
An xpath attribute search will only match one item""" An xpath attribute search will only match one item"""
# lxml 5.1.1 removed etree._ElementStringResult, so we can no longer simply assume it's there
# (https://github.com/lxml/lxml/commit/eba79343d0e7ad1ce40169f60460cdd4caa29eb3)
ElementStringResult = getattr(etree, '_ElementStringResult', None)
if xpath_matches(tree, xpath, namespaces): if xpath_matches(tree, xpath, namespaces):
match = tree.xpath(xpath, namespaces=namespaces) match = tree.xpath(xpath, namespaces=namespaces)
if isinstance(match[0], etree._ElementStringResult): if isinstance(match[0], etree._ElementUnicodeResult):
return True return True
elif isinstance(match[0], etree._ElementUnicodeResult): elif ElementStringResult is not None and isinstance(match[0], ElementStringResult):
return True return True
return False return False