Replace calls to obsolete unittest.assertEquals()

Since Python 2.7, unittest.assertEquals() has been deprecated.
https://docs.python.org/2.7/library/unittest.html#deprecated-aliases
This commit is contained in:
Sascha Brawer 2015-06-25 10:08:10 +02:00
parent 27ade7643b
commit 3cb5c9ca7c
2 changed files with 14 additions and 14 deletions

View File

@ -11,7 +11,7 @@ class PointInsidePenTest(unittest.TestCase):
pen.moveTo((9,1)); pen.lineTo((4,1)); pen.lineTo((9,4)) pen.moveTo((9,1)); pen.lineTo((4,1)); pen.lineTo((9,4))
pen.closePath() pen.closePath()
self.assertEquals( self.assertEqual(
" *********" " *********"
" ** *" " ** *"
" ** *" " ** *"
@ -19,7 +19,7 @@ class PointInsidePenTest(unittest.TestCase):
" *", " *",
self.render(draw_triangles, even_odd=True)) self.render(draw_triangles, even_odd=True))
self.assertEquals( self.assertEqual(
" *********" " *********"
" *******" " *******"
" *****" " *****"
@ -33,7 +33,7 @@ class PointInsidePenTest(unittest.TestCase):
pen.moveTo((10,5)); pen.curveTo((1,4), (1,1), (10,0)) pen.moveTo((10,5)); pen.curveTo((1,4), (1,1), (10,0))
pen.closePath() pen.closePath()
self.assertEquals( self.assertEqual(
"*** ***" "*** ***"
"**** ****" "**** ****"
"*** ***" "*** ***"
@ -41,7 +41,7 @@ class PointInsidePenTest(unittest.TestCase):
"*** ***", "*** ***",
self.render(draw_curves, even_odd=True)) self.render(draw_curves, even_odd=True))
self.assertEquals( self.assertEqual(
"*** ***" "*** ***"
"**********" "**********"
"**********" "**********"
@ -55,7 +55,7 @@ class PointInsidePenTest(unittest.TestCase):
pen.moveTo((10,5)); pen.qCurveTo((-5,3), (10,0)) pen.moveTo((10,5)); pen.qCurveTo((-5,3), (10,0))
pen.closePath() pen.closePath()
self.assertEquals( self.assertEqual(
"*** **" "*** **"
"**** ***" "**** ***"
"*** ***" "*** ***"
@ -63,7 +63,7 @@ class PointInsidePenTest(unittest.TestCase):
"** ***", "** ***",
self.render(draw_qCurves, even_odd=True)) self.render(draw_qCurves, even_odd=True))
self.assertEquals( self.assertEqual(
"*** **" "*** **"
"**********" "**********"
"**********" "**********"

View File

@ -14,10 +14,10 @@ class Test_l_t_a_g(unittest.TestCase):
def test_decompile_compile(self): def test_decompile_compile(self):
table = table__l_t_a_g() table = table__l_t_a_g()
table.decompile(self.DATA_, ttFont=None) table.decompile(self.DATA_, ttFont=None)
self.assertEquals(1, table.version) self.assertEqual(1, table.version)
self.assertEquals(0, table.flags) self.assertEqual(0, table.flags)
self.assertEquals(self.TAGS_, table.tags) self.assertEqual(self.TAGS_, table.tags)
self.assertEquals(self.DATA_, table.compile(ttFont=None)) self.assertEqual(self.DATA_, table.compile(ttFont=None))
def test_fromXML(self): def test_fromXML(self):
table = table__l_t_a_g() table = table__l_t_a_g()
@ -25,9 +25,9 @@ class Test_l_t_a_g(unittest.TestCase):
table.fromXML("flags", {"value": "777"}, content=None, ttFont=None) table.fromXML("flags", {"value": "777"}, content=None, ttFont=None)
table.fromXML("LanguageTag", {"tag": "sr-Latn"}, content=None, ttFont=None) table.fromXML("LanguageTag", {"tag": "sr-Latn"}, content=None, ttFont=None)
table.fromXML("LanguageTag", {"tag": "fa"}, content=None, ttFont=None) table.fromXML("LanguageTag", {"tag": "fa"}, content=None, ttFont=None)
self.assertEquals(1, table.version) self.assertEqual(1, table.version)
self.assertEquals(777, table.flags) self.assertEqual(777, table.flags)
self.assertEquals(["sr-Latn", "fa"], table.tags) self.assertEqual(["sr-Latn", "fa"], table.tags)
def test_toXML(self): def test_toXML(self):
writer = XMLWriter(StringIO()) writer = XMLWriter(StringIO())
@ -42,7 +42,7 @@ class Test_l_t_a_g(unittest.TestCase):
'<LanguageTag tag="zh-Hant"/>', '<LanguageTag tag="zh-Hant"/>',
'<LanguageTag tag="zh"/>' '<LanguageTag tag="zh"/>'
]) + os.linesep ]) + os.linesep
self.assertEquals(expected.encode("utf_8"), writer.file.getvalue()) self.assertEqual(expected.encode("utf_8"), writer.file.getvalue())
if __name__ == '__main__': if __name__ == '__main__':