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.
........

1 files changed, 7 insertions, 7 deletions

diff --git a/Lib/test/test_fpformat.py b/Lib/test/test_fpformat.py
index a951cd0..e6de3b0 100644
--- a/Lib/test/test_fpformat.py
+++ b/Lib/test/test_fpformat.py
@@ -26,7 +26,7 @@ class FpformatTest(unittest.TestCase):
             n = repr(n)
         expected = "%.*f" % (digits, float(n))
 
-        self.assertEquals(result, expected)
+        self.assertEqual(result, expected)
 
     def checkSci(self, n, digits):
         result = sci(n, digits)
@@ -39,11 +39,11 @@ class FpformatTest(unittest.TestCase):
             exp = exp[0] + "0" + exp[1:]
         expected = "%se%s" % (num, exp)
 
-        self.assertEquals(result, expected)
+        self.assertEqual(result, expected)
 
     def test_basic_cases(self):
-        self.assertEquals(fix(100.0/3, 3), '33.333')
-        self.assertEquals(sci(100.0/3, 3), '3.333e+001')
+        self.assertEqual(fix(100.0/3, 3), '33.333')
+        self.assertEqual(sci(100.0/3, 3), '3.333e+001')
 
     def test_reasonable_values(self):
         for d in range(7):
@@ -54,12 +54,12 @@ class FpformatTest(unittest.TestCase):
 
     def test_failing_values(self):
         # Now for 'unreasonable n and d'
-        self.assertEquals(fix(1.0, 1000), '1.'+('0'*1000))
-        self.assertEquals(sci("1"+('0'*1000), 0), '1e+1000')
+        self.assertEqual(fix(1.0, 1000), '1.'+('0'*1000))
+        self.assertEqual(sci("1"+('0'*1000), 0), '1e+1000')
 
         # This behavior is inconsistent.  sci raises an exception; fix doesn't.
         yacht = "Throatwobbler Mangrove"
-        self.assertEquals(fix(yacht, 10), yacht)
+        self.assertEqual(fix(yacht, 10), yacht)
         try:
             sci(yacht, 10)
         except NotANumber: