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

Refactor function to avoid double negative

Browse source 
Signed-off-by: Niels Thykier <niels@thykier.net>
This commit is contained in:
Niels Thykier 2021-02-23 16:19:52 +00:00
parent 50005a4200
commit 371d627875
No known key found for this signature in database
GPG key ID: A65B78DBE67C7AAC
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
scour/scour.py
View file

@ -1016,13 +1016,18 @@ def remove_descriptive_elements(doc, options):
return len(elementsToRemove) return len(elementsToRemove)
def g_tag_is_unmergeable(node): def g_tag_is_mergeable(node):
"""Check if a <g> tag can be merged or not """Check if a <g> tag can be merged or not
<g> tags with a title or descriptions should generally be left alone. <g> tags with a title or descriptions should generally be left alone.
""" """
return any(True for n in node.childNodes if n.nodeType == Node.ELEMENT_NODE if any(
and n.nodeName in ('title', 'desc') and n.namespaceURI == NS['SVG']) True for n in node.childNodes
if n.nodeType == Node.ELEMENT_NODE and n.nodeName in ('title', 'desc')
and n.namespaceURI == NS['SVG']
):
return False
return True
def remove_nested_groups(node, stats): def remove_nested_groups(node, stats):
@ -1040,7 +1045,7 @@ def remove_nested_groups(node, stats):
for child in node.childNodes: for child in node.childNodes:
if child.nodeName == 'g' and child.namespaceURI == NS['SVG'] and len(child.attributes) == 0: if child.nodeName == 'g' and child.namespaceURI == NS['SVG'] and len(child.attributes) == 0:
# only collapse group if it does not have a title or desc as a direct descendant, # only collapse group if it does not have a title or desc as a direct descendant,
if not g_tag_is_unmergeable(child): if g_tag_is_mergeable(child):
groupsToRemove.append(child) groupsToRemove.append(child)
for g in groupsToRemove: for g in groupsToRemove:
@ -1168,7 +1173,7 @@ def mergeSiblingGroupsWithCommonAttributes(elem):
if nextNode.nodeName != 'g' or nextNode.namespaceURI != NS['SVG']: if nextNode.nodeName != 'g' or nextNode.namespaceURI != NS['SVG']:
break break
nextAttributes = {a.nodeName: a.nodeValue for a in nextNode.attributes.values()} nextAttributes = {a.nodeName: a.nodeValue for a in nextNode.attributes.values()}
if attributes != nextAttributes or g_tag_is_unmergeable(nextNode): if attributes != nextAttributes or not g_tag_is_mergeable(nextNode):
break break
else: else:
runElements += 1 runElements += 1