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_file2k.py b/Lib/test/test_file2k.py
index ab09f21..399f119 100644
--- a/Lib/test/test_file2k.py
+++ b/Lib/test/test_file2k.py
@@ -29,7 +29,7 @@
# verify weak references
p = proxy(self.f)
p.write('teststring')
- self.assertEquals(self.f.tell(), p.tell())
+ self.assertEqual(self.f.tell(), p.tell())
self.f.close()
self.f = None
self.assertRaises(ReferenceError, getattr, p, 'tell')
@@ -58,7 +58,7 @@
a = array('c', 'x'*10)
self.f = open(TESTFN, 'rb')
n = self.f.readinto(a)
- self.assertEquals('12', a.tostring()[:n])
+ self.assertEqual('12', a.tostring()[:n])
def testWritelinesUserList(self):
# verify writelines with instance sequence
@@ -67,7 +67,7 @@
self.f.close()
self.f = open(TESTFN, 'rb')
buf = self.f.read()
- self.assertEquals(buf, '12')
+ self.assertEqual(buf, '12')
def testWritelinesIntegers(self):
# verify writelines with integers
@@ -94,7 +94,7 @@
self.f.close()
self.f = open(TESTFN, 'rb')
f = self.f
- self.assertEquals(f.name, TESTFN)
+ self.assertEqual(f.name, TESTFN)
self.assertTrue(not f.isatty())
self.assertTrue(not f.closed)
@@ -125,12 +125,12 @@
self.assertRaises(ValueError, self.f.writelines, [])
# file is closed, __exit__ shouldn't do anything
- self.assertEquals(self.f.__exit__(None, None, None), None)
+ self.assertEqual(self.f.__exit__(None, None, None), None)
# it must also return None if an exception was given
try:
1 // 0
except:
- self.assertEquals(self.f.__exit__(*sys.exc_info()), None)
+ self.assertEqual(self.f.__exit__(*sys.exc_info()), None)
def testReadWhenWriting(self):
self.assertRaises(IOError, self.f.read)
@@ -261,7 +261,7 @@
f.close()
except IOError, msg:
self.fail('error setting buffer size %d: %s' % (s, str(msg)))
- self.assertEquals(d, s)
+ self.assertEqual(d, s)
def testTruncateOnWindows(self):
os.unlink(TESTFN)
@@ -621,7 +621,7 @@
try:
print
except RuntimeError as e:
- self.assertEquals(str(e), "lost sys.stdout")
+ self.assertEqual(str(e), "lost sys.stdout")
else:
self.fail("Expected RuntimeError")
finally: