changeset:   93844:773e55c95703
branch:      3.4
parent:      93842:7f2cf63cf95a
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Fri Dec 12 12:23:09 2014 +0100
files:       Lib/ssl.py
description:
Issue #22935: Fix ssl module when SSLv3 protocol is not supported


diff -r 7f2cf63cf95a -r 773e55c95703 Lib/ssl.py
--- a/Lib/ssl.py	Thu Dec 11 23:56:32 2014 -0800
+++ b/Lib/ssl.py	Fri Dec 12 12:23:09 2014 +0100
@@ -116,18 +116,14 @@
 _import_symbols('OP_')
 _import_symbols('ALERT_DESCRIPTION_')
 _import_symbols('SSL_ERROR_')
+_import_symbols('PROTOCOL_')
 
 from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN
 
-from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
 from _ssl import _OPENSSL_API_VERSION
 
 
-_PROTOCOL_NAMES = {
-    PROTOCOL_TLSv1: "TLSv1",
-    PROTOCOL_SSLv23: "SSLv23",
-    PROTOCOL_SSLv3: "SSLv3",
-}
+_PROTOCOL_NAMES = {value: name for name, value in globals().items() if name.startswith('PROTOCOL_')}
 try:
     from _ssl import PROTOCOL_SSLv2
     _SSLv2_IF_EXISTS = PROTOCOL_SSLv2