diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-03-04 23:20:23 -0500 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-03-04 23:20:23 -0500 |
| commit | 3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5 (patch) | |
| tree | 7ed3155843aca44c727ae3105735108326af1718 /Lib/ssl.py | |
| parent | de8eca46385842a2d5c75ee5a9a8c596735f9c68 (diff) | |
| parent | 7bcf9a558817a4fce48b81cd9696aff9b961d978 (diff) | |
| download | cpython-git-3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5.tar.gz | |
merge 3.4
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/ssl.py b/Lib/ssl.py index 37a484a0c2..18730cb2e9 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -104,8 +104,6 @@ from _ssl import ( SSLSyscallError, SSLEOFError, ) from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED -from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF, VERIFY_CRL_CHECK_CHAIN, - VERIFY_X509_STRICT) from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes try: @@ -122,6 +120,7 @@ def _import_symbols(prefix): _import_symbols('OP_') _import_symbols('ALERT_DESCRIPTION_') _import_symbols('SSL_ERROR_') +_import_symbols('VERIFY_') from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN |