diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-07-08 18:39:56 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-07-08 18:39:56 (GMT) |
| commit | 910789f10fb314fe7149be84aa57d6ec12ad4a7b (patch) | |
| tree | a658027493df6d758e5d0b802ffa72e66594ad1e /Lib/ssl.py | |
| parent | ae10c0653e5469e7f41f12cee35bfe653a389cbc (diff) | |
| parent | 4a183b47f353a25b76aaaf1b7043458dbcab8890 (diff) | |
| download | cpython-910789f10fb314fe7149be84aa57d6ec12ad4a7b.zip cpython-910789f10fb314fe7149be84aa57d6ec12ad4a7b.tar.gz cpython-910789f10fb314fe7149be84aa57d6ec12ad4a7b.tar.bz2 | |
merge heads
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -78,6 +78,8 @@ from _ssl import ( from _ssl import HAS_SNI from _ssl import (PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1) +from _ssl import _OPENSSL_API_VERSION + _PROTOCOL_NAMES = { PROTOCOL_TLSv1: "TLSv1", PROTOCOL_SSLv23: "SSLv23", |