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_float.py b/Lib/test/test_float.py
index de5ca46..9d68da7 100644
--- a/Lib/test/test_float.py
+++ b/Lib/test/test_float.py
@@ -473,15 +473,15 @@
return -0.0, math.atan2(0.0, -1)
def neg_neg():
return -0.0, math.atan2(-0.0, -1)
- self.assertEquals(pos_pos(), neg_pos())
- self.assertEquals(pos_neg(), neg_neg())
+ self.assertEqual(pos_pos(), neg_pos())
+ self.assertEqual(pos_neg(), neg_neg())
@requires_IEEE_754
def test_underflow_sign(self):
# check that -1e-1000 gives -0.0, not 0.0
- self.assertEquals(math.atan2(-1e-1000, -1), math.atan2(-0.0, -1))
- self.assertEquals(math.atan2(float('-1e-1000'), -1),
- math.atan2(-0.0, -1))
+ self.assertEqual(math.atan2(-1e-1000, -1), math.atan2(-0.0, -1))
+ self.assertEqual(math.atan2(float('-1e-1000'), -1),
+ math.atan2(-0.0, -1))
def test_format(self):
# these should be rewritten to use both format(x, spec) and
@@ -556,9 +556,9 @@
self.assertEqual(fmt % -arg, '-' + rhs)
def test_issue5864(self):
- self.assertEquals(format(123.456, '.4'), '123.5')
- self.assertEquals(format(1234.56, '.4'), '1.235e+03')
- self.assertEquals(format(12345.6, '.4'), '1.235e+04')
+ self.assertEqual(format(123.456, '.4'), '123.5')
+ self.assertEqual(format(1234.56, '.4'), '1.235e+03')
+ self.assertEqual(format(12345.6, '.4'), '1.235e+04')
class ReprTestCase(unittest.TestCase):
def test_repr(self):