You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2016/06/27 18:11:05 UTC
[2/6] libcloud git commit: Fix Style by request
Fix Style by request
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/151a9756
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/151a9756
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/151a9756
Branch: refs/heads/trunk
Commit: 151a9756704b6bfad415dbd4da07306591cc0f04
Parents: c715b78
Author: lochiiconnectivity <lc...@convergence.cx>
Authored: Sun Jun 26 19:03:27 2016 +0000
Committer: lochiiconnectivity <lc...@convergence.cx>
Committed: Sun Jun 26 19:21:42 2016 +0000
----------------------------------------------------------------------
libcloud/httplib_ssl.py | 9 +++------
libcloud/test/test_httplib_ssl.py | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/151a9756/libcloud/httplib_ssl.py
----------------------------------------------------------------------
diff --git a/libcloud/httplib_ssl.py b/libcloud/httplib_ssl.py
index a809c16..cc927fe 100644
--- a/libcloud/httplib_ssl.py
+++ b/libcloud/httplib_ssl.py
@@ -292,9 +292,10 @@ class LibcloudHTTPSConnection(httplib.HTTPSConnection, LibcloudBaseConnection):
ssl_version = libcloud.security.SSL_VERSION
- # Connect, using contexts and SNI if we can
+ # If we support SNI, use SSLContext and tls_context.wrap_socket()
+ # else revert to older behaviour with ssl.wrap_socket()
- try:
+ if getattr(ssl, 'HAS_SNI', False):
self.tls_context = ssl.SSLContext(ssl_version)
self.tls_context.verify_mode = ssl.CERT_REQUIRED
if self.cert_file and self.key_file:
@@ -302,10 +303,6 @@ class LibcloudHTTPSConnection(httplib.HTTPSConnection, LibcloudBaseConnection):
self.cert_file, self.key_file, None)
if self.ca_cert:
self.tls_context.load_verify_locations(self.ca_cert)
- except AttributeError:
- self.tls_context = None
-
- if self.tls_context and ssl.HAS_SNI:
try:
self.sock = self.tls_context.wrap_socket(
sock,
http://git-wip-us.apache.org/repos/asf/libcloud/blob/151a9756/libcloud/test/test_httplib_ssl.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_httplib_ssl.py b/libcloud/test/test_httplib_ssl.py
index 02e64ed..38f6ac8 100644
--- a/libcloud/test/test_httplib_ssl.py
+++ b/libcloud/test/test_httplib_ssl.py
@@ -114,7 +114,7 @@ class TestHttpLibSSLTests(unittest.TestCase):
mock_wrap_socket = None
- if getattr(ssl, 'SSLContext', None):
+ if getattr(ssl, 'HAS_SNI', False):
ssl.SSLContext.wrap_socket = mock.MagicMock()
mock_wrap_socket = ssl.SSLContext.wrap_socket
else: