Issue #20555: Use specific asserts in urllib, httplib, ftplib, cgi, wsgiref tests.
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
index d4c8945..3559b1b 100644
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -594,8 +594,8 @@
self.assertIsInstance(args[0], Request)
# response from opener.open is None, because there's no
# handler that defines http_open to handle it
- self.assertTrue(args[1] is None or
- isinstance(args[1], MockResponse))
+ if args[1] is not None:
+ self.assertIsInstance(args[1], MockResponse)
def test_method_deprecations(self):
req = Request("http://www.example.com")
@@ -1000,7 +1000,8 @@
MockHeaders({"location": to_url}))
except urllib.error.HTTPError:
# 307 in response to POST requires user OK
- self.assertTrue(code == 307 and data is not None)
+ self.assertEqual(code, 307)
+ self.assertIsNotNone(data)
self.assertEqual(o.req.get_full_url(), to_url)
try:
self.assertEqual(o.req.get_method(), "GET")