diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-16 00:41:57 (GMT) |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-16 00:41:57 (GMT) |
| commit | 6f87a08aa70887026f92694ab1bfb9bccf0d7504 (patch) | |
| tree | 2b2fbca8b5cf2263487c51c1cf9e6d9179444d92 | |
| parent | e9f0311a0fdfb93a0a1b18426a9d7a7903a5ce38 (diff) | |
| download | cpython-6f87a08aa70887026f92694ab1bfb9bccf0d7504.zip cpython-6f87a08aa70887026f92694ab1bfb9bccf0d7504.tar.gz cpython-6f87a08aa70887026f92694ab1bfb9bccf0d7504.tar.bz2 | |
Update more usage of assertEqual
| -rw-r--r-- | Lib/distutils/tests/test_archive_util.py | 4 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_upload.py | 6 | ||||
| -rw-r--r-- | Lib/test/test_strftime.py | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py index 581c0cc..caa0db2 100644 --- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -329,8 +329,8 @@ class ArchiveUtilTestCase(support.TempdirManager, archive = tarfile.open(archive_name) try: for member in archive.getmembers(): - self.assertEquals(member.uid, 0) - self.assertEquals(member.gid, 0) + self.assertEqual(member.uid, 0) + self.assertEqual(member.gid, 0) finally: archive.close() diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py index 7d704cf..9a2265e 100644 --- a/Lib/distutils/tests/test_upload.py +++ b/Lib/distutils/tests/test_upload.py @@ -115,9 +115,9 @@ class uploadTestCase(PyPIRCCommandTestCase): headers = dict(self.last_open.req.headers) self.assertEqual(headers['Content-length'], '2087') self.assert_(headers['Content-type'].startswith('multipart/form-data')) - self.assertEquals(self.last_open.req.get_method(), 'POST') - self.assertEquals(self.last_open.req.get_full_url(), - 'https://pypi.python.org/pypi') + self.assertEqual(self.last_open.req.get_method(), 'POST') + expected_url = 'https://pypi.python.org/pypi' + self.assertEqual(self.last_open.req.get_full_url(), expected_url) self.assert_(b'xxx' in self.last_open.req.data) def test_suite(): diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py index 78604c6..61215a1 100644 --- a/Lib/test/test_strftime.py +++ b/Lib/test/test_strftime.py @@ -189,15 +189,15 @@ class Y1900Tests(unittest.TestCase): @unittest.skipIf(sys.platform == "win32", "Doesn't apply on Windows") def test_y_before_1900_nonwin(self): - self.assertEquals( + self.assertEqual( time.strftime("%y", (1899, 1, 1, 0, 0, 0, 0, 0, 0)), "99") def test_y_1900(self): - self.assertEquals( + self.assertEqual( time.strftime("%y", (1900, 1, 1, 0, 0, 0, 0, 0, 0)), "00") def test_y_after_1900(self): - self.assertEquals( + self.assertEqual( time.strftime("%y", (2013, 1, 1, 0, 0, 0, 0, 0, 0)), "13") if __name__ == '__main__': |