summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_ftplib.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-02-08 12:50:08 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-02-08 12:50:08 (GMT)
commit25d8aeac7c1e24df79c18f6391b7e42b873d66d8 (patch)
tree3171eaac6be60dd8623e5d0ccab67adf38a44215 /Lib/test/test_ftplib.py
parent3a20a5deade014a4559a71962600b23ee9f608f4 (diff)
downloadcpython-25d8aeac7c1e24df79c18f6391b7e42b873d66d8.zip
cpython-25d8aeac7c1e24df79c18f6391b7e42b873d66d8.tar.gz
cpython-25d8aeac7c1e24df79c18f6391b7e42b873d66d8.tar.bz2
Issue #20555: Use specific asserts in urllib, httplib, ftplib, cgi, wsgiref tests.
Diffstat (limited to 'Lib/test/test_ftplib.py')
-rw-r--r--Lib/test/test_ftplib.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 64cd80bc..6c95c49 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -965,7 +965,7 @@ class TestTimeouts(TestCase):
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)
@@ -977,13 +977,13 @@ class TestTimeouts(TestCase):
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()