summaryrefslogtreecommitdiff
path: root/keystoneclient/contrib
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/contrib
parent7780758f1130f3195ac4145ebc2aea792e55b7d6 (diff)
parent14a6d80116c5d9410d1c52bee833beb10837df28 (diff)
downloadpython-keystoneclient-2e900a9347fdbcf9f656aaf57cce31b0e2cf1eed.tar.gz
Merge "Cleanup docs - raises class"
Diffstat (limited to 'keystoneclient/contrib')
-rw-r--r--keystoneclient/contrib/auth/v3/saml2.py17
1 files changed, 9 insertions, 8 deletions
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py
index 47a74e5..304fd41 100644
--- a/keystoneclient/contrib/auth/v3/saml2.py
+++ b/keystoneclient/contrib/auth/v3/saml2.py
@@ -520,7 +520,7 @@ class ADFSUnscopedToken(_BaseSAMLPlugin):
:param session
:returns: True if cookie jar is nonempty, False otherwise
- :raises: AttributeError in case cookies are not find anywhere
+ :raises AttributeError: in case cookies are not find anywhere
"""
try:
@@ -705,11 +705,12 @@ class ADFSUnscopedToken(_BaseSAMLPlugin):
:param session : a session object to send out HTTP requests.
:type session: keystoneclient.session.Session
- :raises: exceptions.AuthorizationFailure when HTTP response from the
- ADFS server is not a valid XML ADFS security token.
- :raises: exceptions.InternalServerError: If response status code is
- HTTP 500 and the response XML cannot be recognized.
-
+ :raises keystoneclient.exceptions.AuthorizationFailure: when HTTP
+ response from the ADFS server is not a valid XML ADFS security
+ token.
+ :raises keystoneclient.exceptions.InternalServerError: If response
+ status code is HTTP 500 and the response XML cannot be
+ recognized.
"""
def _get_failure(e):
@@ -798,8 +799,8 @@ class ADFSUnscopedToken(_BaseSAMLPlugin):
:param session : a session object to send out HTTP requests.
:type session: keystoneclient.session.Session
- :raises: exceptions.AuthorizationFailure: in case session object
- has empty cookie jar.
+ :raises keystoneclient.exceptions.AuthorizationFailure: in case session
+ object has empty cookie jar.
"""
if self._cookies(session) is False: