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_poplib.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_poplib.py')
| -rw-r--r-- | Lib/test/test_poplib.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py index 8ff6d7f..14a519d 100644 --- a/Lib/test/test_poplib.py +++ b/Lib/test/test_poplib.py @@ -21,13 +21,10 @@ PORT = 0 SUPPORTS_SSL = False if hasattr(poplib, 'POP3_SSL'): import ssl - from ssl import HAS_SNI SUPPORTS_SSL = True CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert3.pem") CAFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "pycacert.pem") -else: - HAS_SNI = False requires_ssl = skipUnless(SUPPORTS_SSL, 'SSL not supported') @@ -334,7 +331,6 @@ class TestPOP3Class(TestCase): self.assertEqual(resp, expected) @requires_ssl - @skipUnless(HAS_SNI, 'No SNI support in ssl module') def test_stls_context(self): expected = b'+OK Begin TLS negotiation' ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) |