From: Jason R. Coombs <jaraco@jaraco.com>
Date: Sat, 16 Nov 2013 15:35:46 +0000 (-0500)
Subject: Issue #19586: Update remaining deprecated assertions to their preferred usage.
X-Git-Tag: v3.4.0b1~240
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d78e416f58a09f01c4bb4f0a97d8cd51b9c098c;p=thirdparty%2FPython%2Fcpython.git

Issue #19586: Update remaining deprecated assertions to their preferred usage.
---

diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
index 9a2265eeb880..8e8ff720aee6 100644
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -114,11 +114,11 @@ class uploadTestCase(PyPIRCCommandTestCase):
          # what did we send ?
         headers = dict(self.last_open.req.headers)
         self.assertEqual(headers['Content-length'], '2087')
-        self.assert_(headers['Content-type'].startswith('multipart/form-data'))
+        self.assertTrue(headers['Content-type'].startswith('multipart/form-data'))
         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)
+        self.assertTrue(b'xxx' in self.last_open.req.data)
 
 def test_suite():
     return unittest.makeSuite(uploadTestCase)