diff options
| author | David Stanek <dstanek@dstanek.com> | 2015-11-25 00:23:17 +0000 |
|---|---|---|
| committer | David Stanek <dstanek@dstanek.com> | 2015-11-25 00:23:17 +0000 |
| commit | f4e6f12a714080a1e0391d4891d3bcf0eecfbaaf (patch) | |
| tree | 87bf93e009c1c76ca70c100d248537f6259818c8 /keystoneclient/common | |
| parent | e5be447f3d206af594aa8520c1e651bcb2b46844 (diff) | |
| download | python-keystoneclient-f4e6f12a714080a1e0391d4891d3bcf0eecfbaaf.tar.gz | |
Removes py26 support
We are removing Python 2.6 support from the Keystone libraries.
Change-Id: I1c7a79edd41a73946c9d77bfb8cd2075e2500760
Closes-Bug: 1519449
Diffstat (limited to 'keystoneclient/common')
| -rw-r--r-- | keystoneclient/common/cms.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/keystoneclient/common/cms.py b/keystoneclient/common/cms.py index 21cd394..c1260d3 100644 --- a/keystoneclient/common/cms.py +++ b/keystoneclient/common/cms.py @@ -101,7 +101,7 @@ def _process_communicate_handle_oserror(process, data, files): except OSError as e: if e.errno != errno.EPIPE: raise - # OSError with EPIPE only occurs with Python 2.6.x/old 2.7.x + # OSError with EPIPE only occurs with old Python 2.7.x versions # http://bugs.python.org/issue10963 # The quick exit is typically caused by the openssl command not being @@ -191,11 +191,7 @@ def cms_verify(formatted, signing_cert_file_name, ca_file_name, else: raise exceptions.CertificateConfigError(err) elif retcode != OpensslCmsExitStatus.SUCCESS: - # NOTE(dmllr): Python 2.6 compatibility: - # CalledProcessError did not have output keyword argument - e = subprocess.CalledProcessError(retcode, 'openssl') - e.output = err - raise e + raise subprocess.CalledProcessError(retcode, 'openssl', output=err) return output |