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_file.py b/Lib/test/test_file.py
index c3c0def..dffa4b5 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -30,7 +30,7 @@
# verify weak references
p = proxy(self.f)
p.write(b'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')
@@ -49,7 +49,7 @@
a = array('b', b'x'*10)
self.f = self.open(TESTFN, 'rb')
n = self.f.readinto(a)
- self.assertEquals(b'12', a.tostring()[:n])
+ self.assertEqual(b'12', a.tostring()[:n])
def testReadinto_text(self):
# verify readinto refuses text files
@@ -66,7 +66,7 @@
self.f.close()
self.f = self.open(TESTFN, 'rb')
buf = self.f.read()
- self.assertEquals(buf, b'12')
+ self.assertEqual(buf, b'12')
def testWritelinesIntegers(self):
# verify writelines with integers
@@ -87,7 +87,7 @@
def testErrors(self):
f = self.f
- self.assertEquals(f.name, TESTFN)
+ self.assertEqual(f.name, TESTFN)
self.assertTrue(not f.isatty())
self.assertTrue(not f.closed)
@@ -124,12 +124,12 @@
self.assertRaises(ValueError, method, *args)
# 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)
@@ -195,7 +195,7 @@
f.close()
except IOError as msg:
self.fail('error setting buffer size %d: %s' % (s, str(msg)))
- self.assertEquals(d, s)
+ self.assertEqual(d, s)
def testTruncateOnWindows(self):
# SF bug <http://www.python.org/sf/801631>