libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From quent...@apache.org
Subject libcloud git commit: Remove final mentions of CA_CERTS_PATHS as list
Date Mon, 02 Oct 2017 04:28:47 GMT
Repository: libcloud
Updated Branches:
  refs/heads/trunk b491c2db3 -> f8049c49a


Remove final mentions of CA_CERTS_PATHS as list

Since libcloud 2.0, CA_CERTS_PATHS is no longer a list, but there were a
few mentions left in the code, which was confusing.

Closes #1114


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f8049c49
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f8049c49
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f8049c49

Branch: refs/heads/trunk
Commit: f8049c49ab81fff7b4b746869d473e4a0e0c52a8
Parents: b491c2d
Author: Quentin Pradet <quentin@clustree.com>
Authored: Wed Sep 20 09:36:38 2017 +0400
Committer: Quentin Pradet <quentinp@apache.org>
Committed: Mon Oct 2 08:27:58 2017 +0400

----------------------------------------------------------------------
 libcloud/security.py       | 4 ++--
 libcloud/test/test_http.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/f8049c49/libcloud/security.py
----------------------------------------------------------------------
diff --git a/libcloud/security.py b/libcloud/security.py
index afd9a93..c0a5936 100644
--- a/libcloud/security.py
+++ b/libcloud/security.py
@@ -20,7 +20,7 @@ Usage:
     libcloud.security.VERIFY_SSL_CERT = True
 
     # Optional.
-    libcloud.security.CA_CERTS_PATH.append('/path/to/cacert.txt')
+    libcloud.security.CA_CERTS_PATH = '/path/to/certfile'
 """
 
 import os
@@ -71,7 +71,7 @@ if environment_cert_file is not None:
 
     # If a provided file exists we ignore other common paths because we
     # don't want to fall-back to a potentially less restrictive bundle
-    CA_CERTS_PATH = [environment_cert_file]
+    CA_CERTS_PATH = environment_cert_file
 
 CA_CERTS_UNAVAILABLE_ERROR_MSG = (
     'No CA Certificates were found in CA_CERTS_PATH. For information on '

http://git-wip-us.apache.org/repos/asf/libcloud/blob/f8049c49/libcloud/test/test_http.py
----------------------------------------------------------------------
diff --git a/libcloud/test/test_http.py b/libcloud/test/test_http.py
index a64cad9..4da6454 100644
--- a/libcloud/test/test_http.py
+++ b/libcloud/test/test_http.py
@@ -64,7 +64,7 @@ class TestHttpLibSSLTests(unittest.TestCase):
 
         reload(libcloud.security)
 
-        self.assertEqual(libcloud.security.CA_CERTS_PATH, [file_path])
+        self.assertEqual(libcloud.security.CA_CERTS_PATH, file_path)
 
     @patch('warnings.warn')
     def test_setup_ca_cert(self, _):
@@ -78,7 +78,7 @@ class TestHttpLibSSLTests(unittest.TestCase):
         # a valid path
         self.httplib_object.verify = True
 
-        libcloud.security.CA_CERTS_PATH = [os.path.abspath(__file__)]
+        libcloud.security.CA_CERTS_PATH = os.path.abspath(__file__)
         self.httplib_object._setup_ca_cert()
 
         self.assertTrue(self.httplib_object.ca_cert is not None)


Mime
View raw message