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

xml: pylint fixes and docs

Browse source 
This PR includes;
- pylint fixes
- Documentation updates
This commit is contained in:
Dag Wieers 2017-09-21 14:32:10 +02:00
parent b3177383da
commit 5646d9960f
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/files/xml.py
View file

@ -456,7 +456,7 @@ def nsnameToClark(name, namespaces):
(nsname, rawname) = name.split(":") (nsname, rawname) = name.split(":")
# return "{{%s}}%s" % (namespaces[nsname], rawname) # return "{{%s}}%s" % (namespaces[nsname], rawname)
return "{{{0}}}{1}".format(namespaces[nsname], rawname) return "{{{0}}}{1}".format(namespaces[nsname], rawname)
else:
# no namespace name here # no namespace name here
return name return name
@ -548,7 +548,7 @@ def set_target_inner(module, tree, xpath, namespaces, attribute, value):
missing_namespace = "" missing_namespace = ""
# NOTE: This checks only the namespaces defined in root element! # NOTE: This checks only the namespaces defined in root element!
# TODO: Implement a more robust check to check for child namespaces' existance # TODO: Implement a more robust check to check for child namespaces' existance
if len(tree.getroot().nsmap) > 0 and ":" not in xpath: if tree.getroot().nsmap and ":" not in xpath:
missing_namespace = "XML document has namespace(s) defined, but no namespace prefix(es) used in xpath!\n" missing_namespace = "XML document has namespace(s) defined, but no namespace prefix(es) used in xpath!\n"
module.fail_json(msg="%sXpath %s causes a failure: %s\n -- tree is %s" % module.fail_json(msg="%sXpath %s causes a failure: %s\n -- tree is %s" %
(missing_namespace, xpath, e, etree.tostring(tree, pretty_print=True)), exception=traceback.format_exc()) (missing_namespace, xpath, e, etree.tostring(tree, pretty_print=True)), exception=traceback.format_exc())