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

Attempt to handle line endings in a cross-platform manner

Browse source
This commit is contained in:
JSCHILL1 2009-11-13 10:44:18 -06:00
parent de6c2eb924
commit 4198961174
5 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scour.py
View file

@ -2092,7 +2092,7 @@ def serializeXML(element, options, ind = 0, preserveWhitespace = False):
if preserveWhitespace:
outString += serializeXML(child, options, 0, preserveWhitespace)
else:
outString += '\n' + serializeXML(child, options, indent + 1, preserveWhitespace)
outString += os.linesep + serializeXML(child, options, indent + 1, preserveWhitespace)
onNewLine = True
# text node
elif child.nodeType == 3:
@ -2114,10 +2114,10 @@ def serializeXML(element, options, ind = 0, preserveWhitespace = False):
if onNewLine: outString += (I * ind)
outString += '</' + element.nodeName + '>'
if indent > 0: outString += '\n'
if indent > 0: outString += os.linesep
else:
outString += '/>'
if indent > 0: outString += '\n'
if indent > 0: outString += os.linesep
return outString
@ -2273,7 +2273,7 @@ def scourString(in_string, options=None):
# http://ronrothman.com/public/leftbraned/xml-dom-minidom-toprettyxml-and-silly-whitespace/
# rolled our own serialize function here to save on space, put id first, customize indentation, etc
# out_string = doc.documentElement.toprettyxml(' ')
out_string = serializeXML(doc.documentElement, options)
out_string = serializeXML(doc.documentElement, options) + os.linesep
# now strip out empty lines
lines = []
@ -2284,7 +2284,7 @@ def scourString(in_string, options=None):
# return the string stripped of empty lines
if options.strip_xml_prolog == False:
xmlprolog = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n'
xmlprolog = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' + os.linesep
else:
xmlprolog = ""
@ -2385,15 +2385,15 @@ def parse_args(args=None):
return options, [infile, outfile]
def getReport():
return ' Number of elements removed: ' + str(numElemsRemoved) + \
'\n Number of attributes removed: ' + str(numAttrsRemoved) + \
'\n Number of unreferenced id attributes removed: ' + str(numIDsRemoved) + \
'\n Number of style properties fixed: ' + str(numStylePropsFixed) + \
'\n Number of raster images embedded inline: ' + str(numRastersEmbedded) + \
'\n Number of path segments reduced/removed: ' + str(numPathSegmentsReduced) + \
'\n Number of bytes saved in path data: ' + str(numBytesSavedInPathData) + \
'\n Number of bytes saved in colors: ' + str(numBytesSavedInColors) + \
'\n Number of points removed from polygons: ' + str(numPointsRemovedFromPolygon)
return ' Number of elements removed: ' + str(numElemsRemoved) + os.linesep + \
' Number of attributes removed: ' + str(numAttrsRemoved) + os.linesep + \
' Number of unreferenced id attributes removed: ' + str(numIDsRemoved) + os.linesep + \
' Number of style properties fixed: ' + str(numStylePropsFixed) + os.linesep + \
' Number of raster images embedded inline: ' + str(numRastersEmbedded) + os.linesep + \
' Number of path segments reduced/removed: ' + str(numPathSegmentsReduced) + os.linesep + \
' Number of bytes saved in path data: ' + str(numBytesSavedInPathData) + os.linesep + \
' Number of bytes saved in colors: ' + str(numBytesSavedInColors) + os.linesep + \
' Number of points removed from polygons: ' + str(numPointsRemovedFromPolygon)
if __name__ == '__main__':
if sys.platform == "win32":
@ -2423,7 +2423,7 @@ if __name__ == '__main__':
# GZ: unless silenced by -q or something?
# GZ: not using globals would be good too
print >>sys.stderr, ' File:', input.name, \
'\n Time taken:', str(end-start) + 's\n', \
os.linesep + ' Time taken:', str(end-start) + 's' + os.linesep, \
getReport()
oldsize = len(in_string)