From f4e6f12a714080a1e0391d4891d3bcf0eecfbaaf Mon Sep 17 00:00:00 2001 From: David Stanek Date: Wed, 25 Nov 2015 00:23:17 +0000 Subject: Removes py26 support We are removing Python 2.6 support from the Keystone libraries. Change-Id: I1c7a79edd41a73946c9d77bfb8cd2075e2500760 Closes-Bug: 1519449 --- keystoneclient/common/cms.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'keystoneclient/common') 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 -- cgit v1.2.1