summaryrefslogtreecommitdiff
path: root/keystoneclient/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-18 19:18:13 +0000
committerGerrit Code Review <review@openstack.org>2014-11-18 19:18:13 +0000
commit2e900a9347fdbcf9f656aaf57cce31b0e2cf1eed (patch)
treede458e0595e5e007f6f79e660004aa483efaa31b /keystoneclient/common
parent7780758f1130f3195ac4145ebc2aea792e55b7d6 (diff)
parent14a6d80116c5d9410d1c52bee833beb10837df28 (diff)
downloadpython-keystoneclient-2e900a9347fdbcf9f656aaf57cce31b0e2cf1eed.tar.gz
Merge "Cleanup docs - raises class"
Diffstat (limited to 'keystoneclient/common')
-rw-r--r--keystoneclient/common/cms.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/keystoneclient/common/cms.py b/keystoneclient/common/cms.py
index 6e40b18..ca632f8 100644
--- a/keystoneclient/common/cms.py
+++ b/keystoneclient/common/cms.py
@@ -135,8 +135,10 @@ def cms_verify(formatted, signing_cert_file_name, ca_file_name,
inform=PKI_ASN1_FORM):
"""Verifies the signature of the contents IAW CMS syntax.
- :raises: subprocess.CalledProcessError
- :raises: CertificateConfigError if certificate is not configured properly.
+ :raises subprocess.CalledProcessError:
+ :raises keystoneclient.exceptions.CertificateConfigError: if certificate
+ is not configured
+ properly.
"""
_ensure_subprocess()
if isinstance(formatted, six.string_types):