diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-24 16:58:36 +0000 |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-24 16:58:36 +0000 |
commit | b0f5adc3f4e098b1744eeac65fc830fb1df2b8ab (patch) | |
tree | e2936db9f8e1194464aeb7e9546d5a892f7239c7 /Lib/test/test_ftplib.py | |
parent | f14c7fc33da8ba3aa28bbb7b0305ea12ab30be09 (diff) | |
download | cpython-git-b0f5adc3f4e098b1744eeac65fc830fb1df2b8ab.tar.gz |
use assert[Not]IsInstance where appropriate
Diffstat (limited to 'Lib/test/test_ftplib.py')
-rw-r--r-- | Lib/test/test_ftplib.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index fb9d55b2ee..eb2324c316 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -582,36 +582,36 @@ class TestTLS_FTPClass(TestCase): self.server.stop() def test_control_connection(self): - self.assertFalse(isinstance(self.client.sock, ssl.SSLSocket)) + self.assertNotIsInstance(self.client.sock, ssl.SSLSocket) self.client.auth() - self.assertTrue(isinstance(self.client.sock, ssl.SSLSocket)) + self.assertIsInstance(self.client.sock, ssl.SSLSocket) def test_data_connection(self): # clear text sock = self.client.transfercmd('list') - self.assertFalse(isinstance(sock, ssl.SSLSocket)) + self.assertNotIsInstance(sock, ssl.SSLSocket) sock.close() self.client.voidresp() # secured, after PROT P self.client.prot_p() sock = self.client.transfercmd('list') - self.assertTrue(isinstance(sock, ssl.SSLSocket)) + self.assertIsInstance(sock, ssl.SSLSocket) sock.close() self.client.voidresp() # PROT C is issued, the connection must be in cleartext again self.client.prot_c() sock = self.client.transfercmd('list') - self.assertFalse(isinstance(sock, ssl.SSLSocket)) + self.assertNotIsInstance(sock, ssl.SSLSocket) sock.close() self.client.voidresp() def test_login(self): # login() is supposed to implicitly secure the control connection - self.assertFalse(isinstance(self.client.sock, ssl.SSLSocket)) + self.assertNotIsInstance(self.client.sock, ssl.SSLSocket) self.client.login() - self.assertTrue(isinstance(self.client.sock, ssl.SSLSocket)) + self.assertIsInstance(self.client.sock, ssl.SSLSocket) # make sure that AUTH TLS doesn't get issued again self.client.login() |