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

Handle unicode characters. Specify utf-8 encoding on python scripts. Added unit test for non-ASCII characters.

Browse source
This commit is contained in:
JSCHILL1 2009-04-28 08:57:40 -05:00
parent 321f16c46d
commit d242407701
5 changed files with 703 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

685
fulltests/OperaMarketShareEEhover.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 547 KiB

2
package.sh
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
SCOURVER="0.10" SCOURVER="0.11"
cd .. cd ..
tar cvf scour/tarballs/scour-$SCOURVER.tar scour/scour.py scour/svg_regex.py scour/LICENSE scour/NOTICE scour/README.txt scour/release-notes.html tar cvf scour/tarballs/scour-$SCOURVER.tar scour/scour.py scour/svg_regex.py scour/LICENSE scour/NOTICE scour/README.txt scour/release-notes.html
gzip scour/tarballs/scour-$SCOURVER.tar gzip scour/tarballs/scour-$SCOURVER.tar

7
scour.py
View file

@ -1,4 +1,5 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*-
# Scour # Scour
# #
@ -71,7 +72,7 @@ from decimal import *
getcontext().prec = 6 getcontext().prec = 6
APP = 'scour' APP = 'scour'
VER = '0.10' VER = '0.11'
COPYRIGHT = 'Copyright Jeff Schiller, 2009' COPYRIGHT = 'Copyright Jeff Schiller, 2009'
NS = { 'SVG': 'http://www.w3.org/2000/svg', NS = { 'SVG': 'http://www.w3.org/2000/svg',
@ -1046,7 +1047,7 @@ def scourXmlFile(filename, options=[]):
# print 'IN=',in_string # print 'IN=',in_string
out_string = scourString(in_string, options) out_string = scourString(in_string, options)
# print 'OUT=',out_string # print 'OUT=',out_string
return xml.dom.minidom.parseString(out_string) return xml.dom.minidom.parseString(out_string.encode('utf-8'))
def printHeader(): def printHeader():
print APP , VER print APP , VER
@ -1119,7 +1120,7 @@ if __name__ == '__main__':
# do the work # do the work
in_string = input.read() in_string = input.read()
out_string = scourString(in_string, options) out_string = scourString(in_string, options)
output.write(out_string) output.write(out_string.encode("utf-8"))
# Close input and output files # Close input and output files
input.close() input.close()

10
testscour.py
View file

@ -1,4 +1,6 @@
#!/usr/local/bin/python #!/usr/bin/env python
# -*- coding: utf-8 -*-
# Test Harness for Scour # Test Harness for Scour
# #
# Copyright 2009 Jeff Schiller # Copyright 2009 Jeff Schiller
@ -492,6 +494,12 @@ class ChangeLineToVerticalLineSegmentInPath(unittest.TestCase):
self.assertEquals(path[2][1][0], 100.0, self.assertEquals(path[2][1][0], 100.0,
'Did not calculate vertical line segment in path correctly' ) 'Did not calculate vertical line segment in path correctly' )
class HandleNonAsciiUtf8(unittest.TestCase):
def runTest(self):
doc = scour.scourXmlFile('unittests/utf8.svg')
desc = unicode(doc.getElementsByTagNameNS(SVGNS, 'desc')[0].firstChild.wholeText).strip()
self.assertEquals( desc, u'ú',
'Did not handle non-ASCII characters' )
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

4
unittests/utf8.svg Normal file
View file

@ -0,0 +1,4 @@
<svg xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg">
<desc>ú</desc>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 112 B