summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_platform.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-21 01:30:29 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-21 01:30:29 (GMT)
commit19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee (patch)
tree596b5a2c45b058ea3e0cdc49cb7539a21410b98d /Lib/test/test_platform.py
parentb65b4937e20be4a2d3311326909c77bbf2e1c4cd (diff)
downloadcpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.zip
cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.gz
cpython-19f2aeba67b5b4dc4dfd589d02d4a0b0804e22ee.tar.bz2
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. ........
Diffstat (limited to 'Lib/test/test_platform.py')
-rw-r--r--Lib/test/test_platform.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 466cbe3..4fd286a 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -155,17 +155,17 @@ class PlatformTest(unittest.TestCase):
# On Snow Leopard, sw_vers reports 10.6.0 as 10.6
if len_diff > 0:
expect_list.extend(['0'] * len_diff)
- self.assertEquals(result_list, expect_list)
+ self.assertEqual(result_list, expect_list)
# res[1] claims to contain
# (version, dev_stage, non_release_version)
# That information is no longer available
- self.assertEquals(res[1], ('', '', ''))
+ self.assertEqual(res[1], ('', '', ''))
if sys.byteorder == 'little':
- self.assertEquals(res[2], 'i386')
+ self.assertEqual(res[2], 'i386')
else:
- self.assertEquals(res[2], 'PowerPC')
+ self.assertEqual(res[2], 'PowerPC')
@unittest.skipUnless(sys.platform == 'darwin', "OSX only test")
@@ -183,8 +183,8 @@ class PlatformTest(unittest.TestCase):
else:
# parent
cpid, sts = os.waitpid(pid, 0)
- self.assertEquals(cpid, pid)
- self.assertEquals(sts, 0)
+ self.assertEqual(cpid, pid)
+ self.assertEqual(sts, 0)
def test_dist(self):
res = platform.dist()