mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge 3.4 (#22921)

Browse source
This commit is contained in:
Benjamin Peterson 2014-11-23 17:06:39 -06:00
commit f9284ae8ed
16 changed files with 24 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_imaplib.py
View file

@ -19,9 +19,6 @@ try:
import ssl
except ImportError:
ssl = None
HAS_SNI = False
else:
from ssl import HAS_SNI
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")
@ -387,7 +384,6 @@ class ThreadedNetworkedTestsSSL(ThreadedNetworkedTests):
imap_class = IMAP4_SSL
@reap_threads
@unittest.skipUnless(HAS_SNI, 'No SNI support in ssl module')
def test_ssl_verified(self):
ssl_context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
ssl_context.verify_mode = ssl.CERT_REQUIRED