diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-19 17:58:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-19 17:58:58 +0000 |
| commit | 72f0bc3579043b2f6ebb3fcf06a96e43406e5664 (patch) | |
| tree | 757eeac42fadb0ea2733f85066eb010d73cc6221 | |
| parent | a3eaafefbdcec0231db33c44cca718526f9c96cc (diff) | |
| parent | b96f6130265797489e684a4bc123a7a1f5118d2c (diff) | |
| download | python-glanceclient-72f0bc3579043b2f6ebb3fcf06a96e43406e5664.tar.gz | |
Merge "Update HTTPS certificate handling for pep-0476"
| -rw-r--r-- | glanceclient/common/https.py | 6 | ||||
| -rw-r--r-- | tests/test_ssl.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/glanceclient/common/https.py b/glanceclient/common/https.py index 0635dd4..b81f7ac 100644 --- a/glanceclient/common/https.py +++ b/glanceclient/common/https.py @@ -149,7 +149,11 @@ class VerifiedHTTPSConnection(HTTPSConnection): if six.PY3: excp_lst = (TypeError, FileNotFoundError, ssl.SSLError) else: - excp_lst = () + # NOTE(jamespage) + # Accomodate changes in behaviour for pep-0467, introduced + # in python 2.7.9. + # https://github.com/python/peps/blob/master/pep-0476.txt + excp_lst = (TypeError, IOError, ssl.SSLError) try: HTTPSConnection.__init__(self, host, port, key_file=key_file, diff --git a/tests/test_ssl.py b/tests/test_ssl.py index 013d18f..23eee16 100644 --- a/tests/test_ssl.py +++ b/tests/test_ssl.py @@ -109,8 +109,10 @@ class TestVerifiedHTTPSConnection(testtools.TestCase): """ cert_file = os.path.join(TEST_VAR_DIR, 'certificate.crt') cacert = os.path.join(TEST_VAR_DIR, 'ca.crt') + key_file = os.path.join(TEST_VAR_DIR, 'badkey.key') try: https.VerifiedHTTPSConnection('127.0.0.1', 0, + key_file=key_file, cert_file=cert_file, cacert=cacert) self.fail('Failed to raise assertion.') |