[Python-checkins] cpython (3.4): Issue #22935: Fix ssl module when SSLv3 protocol is not supported

[victor.stinner]

https://hg.python.org/cpython/rev/773e55c95703
changeset:   93844:773e55c95703
branch:      3.4
parent:      93842:7f2cf63cf95a
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Fri Dec 12 12:23:09 2014 +0100
summary:
  Issue #22935: Fix ssl module when SSLv3 protocol is not supported

files:
  Lib/ssl.py |  8 ++------
  1 files changed, 2 insertions(+), 6 deletions(-)


diff --git a/Lib/ssl.py b/Lib/ssl.py
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@ -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

-- 
Repository URL: https://hg.python.org/cpython