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

Fix counting issue in statistics due to collidng variable names

Browse source
This commit is contained in:
Eduard Braun 2016-08-26 23:44:14 +02:00
parent 386d5d8656
commit 90910eaa6f
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
scour/scour.py
View file

@ -940,8 +940,8 @@ def moveCommonAttributesToParentGroup(elem, referencedElements):
# its fill attribute is not what we want to look at, we should look for the first # its fill attribute is not what we want to look at, we should look for the first
# non-animate/set element # non-animate/set element
attrList = childElements[0].attributes attrList = childElements[0].attributes
for num in range(attrList.length): for index in range(attrList.length):
attr = attrList.item(num) attr = attrList.item(index)
# this is most of the inheritable properties from http://www.w3.org/TR/SVG11/propidx.html # this is most of the inheritable properties from http://www.w3.org/TR/SVG11/propidx.html
# and http://www.w3.org/TR/SVGTiny12/attributeTable.html # and http://www.w3.org/TR/SVGTiny12/attributeTable.html
if attr.nodeName in ['clip-rule', if attr.nodeName in ['clip-rule',
@ -1113,8 +1113,8 @@ def removeUnusedAttributesOnParent(elem):
# get all attribute values on this parent # get all attribute values on this parent
attrList = elem.attributes attrList = elem.attributes
unusedAttrs = {} unusedAttrs = {}
for num in range(attrList.length): for index in range(attrList.length):
attr = attrList.item(num) attr = attrList.item(index)
if attr.nodeName in ['clip-rule', if attr.nodeName in ['clip-rule',
'display-align', 'display-align',
'fill', 'fill-opacity', 'fill-rule', 'fill', 'fill-opacity', 'fill-rule',
@ -2804,8 +2804,8 @@ def serializeXML(element, options, ind = 0, preserveWhitespace = False):
if options.order_attributes : if options.order_attributes :
attrName2Index = dict([(attrList.item(i).nodeName, i) for i in attrIndices]) attrName2Index = dict([(attrList.item(i).nodeName, i) for i in attrIndices])
attrIndices = [attrName2Index[name] for name in sorted(attrName2Index.keys())] attrIndices = [attrName2Index[name] for name in sorted(attrName2Index.keys())]
for num in attrIndices : for index in attrIndices :
attr = attrList.item(num) attr = attrList.item(index)
if attr.nodeName == 'id' or attr.nodeName == 'xml:id': continue if attr.nodeName == 'id' or attr.nodeName == 'xml:id': continue
# if the attribute value contains a double-quote, use single-quotes # if the attribute value contains a double-quote, use single-quotes
quot = '"' quot = '"'
@ -2918,9 +2918,9 @@ def scourString(in_string, options=None):
# remove the xmlns: declarations now # remove the xmlns: declarations now
xmlnsDeclsToRemove = [] xmlnsDeclsToRemove = []
attrList = doc.documentElement.attributes attrList = doc.documentElement.attributes
for num in range(attrList.length) : for index in range(attrList.length) :
if attrList.item(num).nodeValue in unwanted_ns : if attrList.item(index).nodeValue in unwanted_ns :
xmlnsDeclsToRemove.append(attrList.item(num).nodeName) xmlnsDeclsToRemove.append(attrList.item(index).nodeName)
for attr in xmlnsDeclsToRemove : for attr in xmlnsDeclsToRemove :
doc.documentElement.removeAttribute(attr) doc.documentElement.removeAttribute(attr)