diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-12-21 17:22:02 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-12-21 17:22:02 (GMT) |
| commit | 059226b8ec3b94255b356e770c47e4311195af91 (patch) | |
| tree | 33a2b80e2e34314859fb93401c42076e7055ed26 /Lib/ssl.py | |
| parent | c0b95d18fae5c0786dee1dc28f86249f9d2a190b (diff) | |
| parent | 6b15c90fd8892846444d175f60f59456a79d9848 (diff) | |
| download | cpython-059226b8ec3b94255b356e770c47e4311195af91.zip cpython-059226b8ec3b94255b356e770c47e4311195af91.tar.gz cpython-059226b8ec3b94255b356e770c47e4311195af91.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -86,7 +86,7 @@ from _ssl import ( SSL_ERROR_EOF, SSL_ERROR_INVALID_ERROR_CODE, ) -from _ssl import HAS_SNI +from _ssl import HAS_SNI, HAS_ECDH from _ssl import (PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1) from _ssl import _OPENSSL_API_VERSION |