From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sat, 16 Nov 2013 00:41:57 +0000 (-0500)
Subject: Update more usage of assertEqual
X-Git-Tag: v3.4.0b1~246
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f87a08aa70887026f92694ab1bfb9bccf0d7504;p=python

Update more usage of assertEqual
---

diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py
index 581c0cc841..caa0db20b7 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 7d704cf166..9a2265eeb8 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 78604c665a..61215a15ba 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__':