diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-11-23 23:06:39 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-11-23 23:06:39 (GMT) |
| commit | f9284ae8ede5b8977248a4259eee0cd81a100c16 (patch) | |
| tree | b3430fd55e6b76ee01dfd6ac4a0baa52de7b7a3a /Lib/test/test_ftplib.py | |
| parent | f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c (diff) | |
| parent | 7243b574e5fc6f9ae68dc5ebd8252047b8e78e3b (diff) | |
| download | cpython-f9284ae8ede5b8977248a4259eee0cd81a100c16.zip cpython-f9284ae8ede5b8977248a4259eee0cd81a100c16.tar.gz cpython-f9284ae8ede5b8977248a4259eee0cd81a100c16.tar.bz2 | |
merge 3.4 (#22921)
Diffstat (limited to 'Lib/test/test_ftplib.py')
| -rw-r--r-- | Lib/test/test_ftplib.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py index b401cf7..5db70c0 100644 --- a/Lib/test/test_ftplib.py +++ b/Lib/test/test_ftplib.py @@ -15,9 +15,6 @@ try: import ssl except ImportError: ssl = None - HAS_SNI = False -else: - from ssl import HAS_SNI from unittest import TestCase, skipUnless from test import support @@ -927,7 +924,6 @@ class TestTLS_FTPClass(TestCase): self.client.ccc() self.assertRaises(ValueError, self.client.sock.unwrap) - @skipUnless(HAS_SNI, 'No SNI support in ssl module') def test_check_hostname(self): self.client.quit() ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) |