Unittests: Fix warnings

- Replace deprecated assertion-aliases
- Make sure opened files are properly closed after usage

scour/scour.py

@@ -3095,7 +3095,8 @@ def scourString(in_string, options=None):
 # input is a filename
 # returns the minidom doc representation of the SVG
 def scourXmlFile(filename, options=None):
-   in_string = open(filename).read()
+   with open(filename) as f:
+      in_string = f.read()
    out_string = scourString(in_string, options)
    return xml.dom.minidom.parseString(out_string.encode('utf-8'))
 

testcss.py

@@ -29,23 +29,23 @@ from scour.yocto_css import parseCssString
 class Blank(unittest.TestCase):
 	def runTest(self):
 		r = parseCssString('')
-		self.assertEquals( len(r), 0, 'Blank string returned non-empty list')
+		self.assertEqual( len(r), 0, 'Blank string returned non-empty list')
-		self.assertEquals( type(r), type([]), 'Blank string returned non list')
+		self.assertEqual( type(r), type([]), 'Blank string returned non list')
 
 class ElementSelector(unittest.TestCase):
 	def runTest(self):
 		r = parseCssString('foo {}')
-		self.assertEquals( len(r), 1, 'Element selector not returned')
+		self.assertEqual( len(r), 1, 'Element selector not returned')
-		self.assertEquals( r[0]['selector'], 'foo', 'Selector for foo not returned')
+		self.assertEqual( r[0]['selector'], 'foo', 'Selector for foo not returned')
-		self.assertEquals( len(r[0]['properties']), 0, 'Property list for foo not empty')
+		self.assertEqual( len(r[0]['properties']), 0, 'Property list for foo not empty')
 
 class ElementSelectorWithProperty(unittest.TestCase):
 	def runTest(self):
 		r = parseCssString('foo { bar: baz}')
-		self.assertEquals( len(r), 1, 'Element selector not returned')
+		self.assertEqual( len(r), 1, 'Element selector not returned')
-		self.assertEquals( r[0]['selector'], 'foo', 'Selector for foo not returned')
+		self.assertEqual( r[0]['selector'], 'foo', 'Selector for foo not returned')
-		self.assertEquals( len(r[0]['properties']), 1, 'Property list for foo did not have 1')
+		self.assertEqual( len(r[0]['properties']), 1, 'Property list for foo did not have 1')
-		self.assertEquals( r[0]['properties']['bar'], 'baz', 'Property bar did not have baz value')
+		self.assertEqual( r[0]['properties']['bar'], 'baz', 'Property bar did not have baz value')
 
 if __name__ == '__main__':
     unittest.main()