[Python-checkins] cpython (merge 3.3 -> default): Issue #20555: Use specific asserts in urllib, httplib, ftplib, cgi, wsgiref

Sat Feb 8 14:08:05 CET 2014

http://hg.python.org/cpython/rev/868675190b34
changeset: 89039:868675190b34
parent: 89036:79ddfbea25d7
parent: 89038:b6f8d5148a05
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sat Feb 08 14:51:10 2014 +0200
summary:
 Issue #20555: Use specific asserts in urllib, httplib, ftplib, cgi, wsgiref tests.
files:
 Lib/test/test_cgi.py | 2 +-
 Lib/test/test_ftplib.py | 6 +++---
 Lib/test/test_httplib.py | 6 +++---
 Lib/test/test_httpservers.py | 2 +-
 Lib/test/test_urllib.py | 4 ++--
 Lib/test/test_urllib2.py | 7 ++++---
 Lib/test/test_urllib2net.py | 22 +++++++++++-----------
 Lib/test/test_wsgiref.py | 4 ++--
 8 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -227,7 +227,7 @@
 # if we're not chunking properly, readline is only called twice
 # (by read_binary); if we are chunking properly, it will be called 5 times
 # as long as the chunksize is 1 << 16.
- self.assertTrue(f.numcalls > 2)
+ self.assertGreater(f.numcalls, 2)
 f.close()
 
 def test_fieldstorage_multipart(self):
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -1001,7 +1001,7 @@
 
 def testTimeoutDefault(self):
 # default -- use global socket timeout
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 socket.setdefaulttimeout(30)
 try:
 ftp = ftplib.FTP(HOST)
@@ -1013,13 +1013,13 @@
 
 def testTimeoutNone(self):
 # no timeout -- do not use global socket timeout
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 socket.setdefaulttimeout(30)
 try:
 ftp = ftplib.FTP(HOST, timeout=None)
 finally:
 socket.setdefaulttimeout(None)
- self.assertTrue(ftp.sock.gettimeout() is None)
+ self.assertIsNone(ftp.sock.gettimeout())
 self.evt.wait()
 ftp.close()
 
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -134,7 +134,7 @@
 conn.sock = FakeSocket(None)
 conn.putrequest('GET','/')
 conn.putheader('Content-length', 42)
- self.assertTrue(b'Content-length: 42' in conn._buffer)
+ self.assertIn(b'Content-length: 42', conn._buffer)
 
 def test_ipv6host_header(self):
 # Default host header on IPv6 transaction should wrapped by [] if
@@ -723,7 +723,7 @@
 # and into the socket.
 
 # default -- use global socket timeout
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 socket.setdefaulttimeout(30)
 try:
 httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT)
@@ -734,7 +734,7 @@
 httpConn.close()
 
 # no timeout -- do not use global socket default
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 socket.setdefaulttimeout(30)
 try:
 httpConn = client.HTTPConnection(HOST, TimeoutTest.PORT,
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -552,7 +552,7 @@
 
 def verify_http_server_response(self, response):
 match = self.HTTPResponseMatch.search(response)
- self.assertTrue(match is not None)
+ self.assertIsNotNone(match)
 
 def test_http_1_1(self):
 result = self.send_typical_request(b'GET / HTTP/1.1\r\n\r\n')
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -1340,7 +1340,7 @@
 # def testTimeoutNone(self):
 # # global default timeout is ignored
 # import socket
-# self.assertTrue(socket.getdefaulttimeout() is None)
+# self.assertIsNone(socket.getdefaulttimeout())
 # socket.setdefaulttimeout(30)
 # try:
 # ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [])
@@ -1352,7 +1352,7 @@
 # def testTimeoutDefault(self):
 # # global default timeout is used
 # import socket
-# self.assertTrue(socket.getdefaulttimeout() is None)
+# self.assertIsNone(socket.getdefaulttimeout())
 # socket.setdefaulttimeout(30)
 # try:
 # ftp = urllib.ftpwrapper("myuser", "mypass", "localhost", 9093, [])
diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py
--- a/Lib/test/test_urllib2.py
+++ b/Lib/test/test_urllib2.py
@@ -603,8 +603,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 sanepathname2url(path):
 try:
@@ -1018,7 +1018,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")
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -87,7 +87,7 @@
 with support.transient_internet(url):
 response = _urlopen_with_retry(url)
 sock = response.fp
- self.assertTrue(not sock.closed)
+ self.assertFalse(sock.closed)
 response.close()
 self.assertTrue(sock.closed)
 
@@ -262,15 +262,15 @@
 
 class TimeoutTest(unittest.TestCase):
 def test_http_basic(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 url = "http://www.python.org"
 with support.transient_internet(url, timeout=None):
 u = _urlopen_with_retry(url)
 self.addCleanup(u.close)
- self.assertTrue(u.fp.raw._sock.gettimeout() is None)
+ self.assertIsNone(u.fp.raw._sock.gettimeout())
 
 def test_http_default_timeout(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 url = "http://www.python.org"
 with support.transient_internet(url):
 socket.setdefaulttimeout(60)
@@ -282,7 +282,7 @@
 self.assertEqual(u.fp.raw._sock.gettimeout(), 60)
 
 def test_http_no_timeout(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 url = "http://www.python.org"
 with support.transient_internet(url):
 socket.setdefaulttimeout(60)
@@ -291,7 +291,7 @@
 self.addCleanup(u.close)
 finally:
 socket.setdefaulttimeout(None)
- self.assertTrue(u.fp.raw._sock.gettimeout() is None)
+ self.assertIsNone(u.fp.raw._sock.gettimeout())
 
 def test_http_timeout(self):
 url = "http://www.python.org"
@@ -303,14 +303,14 @@
 FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/"
 
 def test_ftp_basic(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 with support.transient_internet(self.FTP_HOST, timeout=None):
 u = _urlopen_with_retry(self.FTP_HOST)
 self.addCleanup(u.close)
- self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None)
+ self.assertIsNone(u.fp.fp.raw._sock.gettimeout())
 
 def test_ftp_default_timeout(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 with support.transient_internet(self.FTP_HOST):
 socket.setdefaulttimeout(60)
 try:
@@ -321,7 +321,7 @@
 self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
 
 def test_ftp_no_timeout(self):
- self.assertTrue(socket.getdefaulttimeout() is None)
+ self.assertIsNone(socket.getdefaulttimeout())
 with support.transient_internet(self.FTP_HOST):
 socket.setdefaulttimeout(60)
 try:
@@ -329,7 +329,7 @@
 self.addCleanup(u.close)
 finally:
 socket.setdefaulttimeout(None)
- self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None)
+ self.assertIsNone(u.fp.fp.raw._sock.gettimeout())
 
 def test_ftp_timeout(self):
 with support.transient_internet(self.FTP_HOST):
diff --git a/Lib/test/test_wsgiref.py b/Lib/test/test_wsgiref.py
--- a/Lib/test/test_wsgiref.py
+++ b/Lib/test/test_wsgiref.py
@@ -196,7 +196,7 @@
 # Check existing value
 env = {key:alt}
 util.setup_testing_defaults(env)
- self.assertTrue(env[key] is alt)
+ self.assertIs(env[key], alt)
 
 def checkCrossDefault(self,key,value,**kw):
 util.setup_testing_defaults(kw)
@@ -343,7 +343,7 @@
 self.assertEqual(Headers(test[:]).keys(), ['x'])
 self.assertEqual(Headers(test[:]).values(), ['y'])
 self.assertEqual(Headers(test[:]).items(), test)
- self.assertFalse(Headers(test).items() is test) # must be copy!
+ self.assertIsNot(Headers(test).items(), test) # must be copy!
 
 h=Headers([])
 del h['foo'] # should not raise an error
-- 
Repository URL: http://hg.python.org/cpython
