From: Benjamin Peterson <benjamin@python.org>
Date: Thu, 5 Mar 2015 04:20:23 +0000 (-0500)
Subject: merge 3.4
X-Git-Tag: v3.5.0a2~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5;p=thirdparty%2FPython%2Fcpython.git

merge 3.4
---

3e2500d6db07b7b0e0a8ee7adb684d3f147e52b5
diff --cc Lib/ssl.py
index 37a484a0c284,ec42e38d0863..18730cb2e989
--- a/Lib/ssl.py
+++ b/Lib/ssl.py
@@@ -122,8 -119,10 +120,9 @@@ def _import_symbols(prefix)
  _import_symbols('OP_')
  _import_symbols('ALERT_DESCRIPTION_')
  _import_symbols('SSL_ERROR_')
 -_import_symbols('PROTOCOL_')
+ _import_symbols('VERIFY_')
  
 -from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN
 +from _ssl import HAS_SNI, HAS_ECDH, HAS_NPN, HAS_ALPN
  
  from _ssl import _OPENSSL_API_VERSION