Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 36a25c3..4793707 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -68,7 +68,7 @@
self.assertRaises(SyntaxError, eval, '\'\\Uffffffff\'')
self.assertRaises(SyntaxError, eval, '\'\\U%08x\'' % 0x110000)
# raw strings should not have unicode escapes
- self.assertNotEquals(r"\u0020", " ")
+ self.assertNotEqual(r"\u0020", " ")
def test_ascii(self):
if not sys.platform.startswith('java'):
@@ -1379,8 +1379,8 @@
def __str__(self):
return '__str__ overridden'
s = S('xxx')
- self.assertEquals("%s" % s, '__str__ overridden')
- self.assertEquals("{}".format(s), '__str__ overridden')
+ self.assertEqual("%s" % s, '__str__ overridden')
+ self.assertEqual("{}".format(s), '__str__ overridden')
def test_main():