From 320bdda6e979e340fe159f3565b0f6fd977f9022 Mon Sep 17 00:00:00 2001
From: Eduard Braun <Eduard.Braun2@gmx.de>
Date: Sun, 6 Dec 2015 21:20:05 +0100
Subject: [PATCH] Unittests: Run python-modernize

---
 testcss.py   |  4 ++++
 testscour.py | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/testcss.py b/testcss.py
index 70601e0..a46144e 100755
--- a/testcss.py
+++ b/testcss.py
@@ -19,9 +19,13 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+from __future__ import absolute_import
+
 import unittest
+
 from scour.yocto_css import parseCssString
 
+
 class Blank(unittest.TestCase):
 	def runTest(self):
 		r = parseCssString('')
diff --git a/testscour.py b/testscour.py
index 9f7a5b3..4fbdef3 100755
--- a/testscour.py
+++ b/testscour.py
@@ -20,11 +20,18 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
+from __future__ import absolute_import
+
+import six
+from six.moves import map, range
+
 import unittest
 import xml.dom.minidom
+
 from scour.svg_regex import svg_parser
 from scour.scour import scourXmlFile, scourString, parse_args, makeWellFormed
 
+
 SVGNS = 'http://www.w3.org/2000/svg'
 
 # I couldn't figure out how to get ElementTree to work with the following XPath 
@@ -591,7 +598,7 @@ class ChangeQuadToShorthandInPath(unittest.TestCase):
 class HandleNonAsciiUtf8(unittest.TestCase):
 	def runTest(self):
 		doc = scour.scourXmlFile('unittests/utf8.svg')
-		desc = unicode(doc.getElementsByTagNameNS(SVGNS, 'desc')[0].firstChild.wholeText).strip()
+		desc = six.text_type(doc.getElementsByTagNameNS(SVGNS, 'desc')[0].firstChild.wholeText).strip()
 		self.assertEquals( desc, u'ú',
 			'Did not handle non-ASCII characters' )
 
@@ -1066,7 +1073,7 @@ class RemoveMetadataOption(unittest.TestCase):
 
 class EnableCommentStrippingOption(unittest.TestCase):
 	def runTest(self):
-		docStr = file('unittests/comment-beside-xml-decl.svg').read()
+		docStr = open('unittests/comment-beside-xml-decl.svg').read()
 		docStr = scour.scourString(docStr,
 			scour.parse_args(['--enable-comment-stripping'])[0])
 		self.assertEquals(docStr.find('<!--'), -1,
@@ -1074,7 +1081,7 @@ class EnableCommentStrippingOption(unittest.TestCase):
 
 class StripXmlPrologOption(unittest.TestCase):
 	def runTest(self):
-		docStr = file('unittests/comment-beside-xml-decl.svg').read()
+		docStr = open('unittests/comment-beside-xml-decl.svg').read()
 		docStr = scour.scourString(docStr,
 			scour.parse_args(['--strip-xml-prolog'])[0])
 		self.assertEquals(docStr.find('<?xml'), -1,
@@ -1157,7 +1164,7 @@ class GradientReferencedByStyleCDATA(unittest.TestCase):
 
 class ShortenIDsInStyleCDATA(unittest.TestCase):
 	def runTest(self):
-		docStr = file('unittests/style-cdata.svg').read()
+		docStr = open('unittests/style-cdata.svg').read()
 		docStr = scour.scourString(docStr,
 			scour.parse_args(['--shorten-ids'])[0])
 		self.assertEquals(docStr.find('somethingreallylong'), -1,
@@ -1366,5 +1373,5 @@ class DuplicateGradientsUpdateStyle(unittest.TestCase):
 if __name__ == '__main__':
 	testcss = __import__('testcss')
 	scour = __import__('__main__')
-	suite = unittest.TestSuite( map(unittest.defaultTestLoader.loadTestsFromModule, [testcss, scour]) )
+	suite = unittest.TestSuite( list(map(unittest.defaultTestLoader.loadTestsFromModule, [testcss, scour])) )
 	unittest.main(defaultTest="suite")