marcus/scour
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removeNamespacedAttributes: Avoid calling it twice as it is indempotent

Browse source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2020-05-19 21:56:15 +00:00
parent 528ad91418
commit 29a7474f74
No known key found for this signature in database
GPG key ID: A65B78DBE67C7AAC
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scour/scour.py
View file

@ -955,7 +955,6 @@ def removeUnreferencedIDs(referencedIDs, identifiedElements):
def removeNamespacedAttributes(node, namespaces): def removeNamespacedAttributes(node, namespaces):
global _num_attributes_removed
num = 0 num = 0
if node.nodeType == Node.ELEMENT_NODE: if node.nodeType == Node.ELEMENT_NODE:
# remove all namespace'd attributes from this element # remove all namespace'd attributes from this element
@ -966,9 +965,8 @@ def removeNamespacedAttributes(node, namespaces):
if attr is not None and attr.namespaceURI in namespaces: if attr is not None and attr.namespaceURI in namespaces:
attrsToRemove.append(attr.nodeName) attrsToRemove.append(attr.nodeName)
for attrName in attrsToRemove: for attrName in attrsToRemove:
num += 1
_num_attributes_removed += 1
node.removeAttribute(attrName) node.removeAttribute(attrName)
num += len(attrsToRemove)
# now recurse for children # now recurse for children
for child in node.childNodes: for child in node.childNodes:
@ -3656,8 +3654,8 @@ def scourString(in_string, options=None):
if options.keep_editor_data is False: if options.keep_editor_data is False:
while removeNamespacedElements(doc.documentElement, unwanted_ns) > 0: while removeNamespacedElements(doc.documentElement, unwanted_ns) > 0:
pass pass
while removeNamespacedAttributes(doc.documentElement, unwanted_ns) > 0: _num_attributes_removed += removeNamespacedAttributes(doc.documentElement,
pass unwanted_ns)
# remove the xmlns: declarations now # remove the xmlns: declarations now
xmlnsDeclsToRemove = [] xmlnsDeclsToRemove = []