summaryrefslogtreecommitdiff
path: root/keystoneclient/contrib
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2014-10-12 19:11:39 -0500
committerBrant Knudson <bknudson@us.ibm.com>2014-10-15 12:24:52 -0500
commit3f1ba9f007528a7ddad7cb53ef75f7bb1026a4d1 (patch)
treee0f520f36ec6312e0cf3b3f417fcb197ebb1e490 /keystoneclient/contrib
parent8b267842a701970d4e1aae2f115afe4d73bc5ee6 (diff)
downloadpython-keystoneclient-3f1ba9f007528a7ddad7cb53ef75f7bb1026a4d1.tar.gz
Docstring cleanup for return type
The :returns: directive doesn't take an argument. To specify the return type, use the :rtype: directive. Change-Id: I3aaab824792333b3f75a10af92f5b712cc9b4ff6
Diffstat (limited to 'keystoneclient/contrib')
-rw-r--r--keystoneclient/contrib/auth/v3/saml2.py7
-rw-r--r--keystoneclient/contrib/revoke/model.py4
2 files changed, 6 insertions, 5 deletions
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py
index 4ff0ef7..bb32c15 100644
--- a/keystoneclient/contrib/auth/v3/saml2.py
+++ b/keystoneclient/contrib/auth/v3/saml2.py
@@ -426,8 +426,9 @@ class Saml2UnscopedToken(_BaseSAMLPlugin):
:param session : a session object to send out HTTP requests.
:type session: keystoneclient.session.Session
- :return access.AccessInfoV3: an object with scoped token's id and
- unscoped token json included.
+ :return: an object with scoped token's id and unscoped token json
+ included.
+ :rtype: :py:class:`keystoneclient.access.AccessInfoV3`
"""
token, token_json = self._get_unscoped_token(session)
@@ -841,7 +842,7 @@ class ADFSUnscopedToken(_BaseSAMLPlugin):
:param session : a session object to send out HTTP requests.
:type session: keystoneclient.session.Session
- :returns (Unscoped federated token, token JSON body)
+ :returns: (Unscoped federated token, token JSON body)
"""
self._prepare_adfs_request()
diff --git a/keystoneclient/contrib/revoke/model.py b/keystoneclient/contrib/revoke/model.py
index 2fc405c..18d5034 100644
--- a/keystoneclient/contrib/revoke/model.py
+++ b/keystoneclient/contrib/revoke/model.py
@@ -110,9 +110,9 @@ class RevokeTree(object):
fields of the revocation event. The leaf node will always be set to
the latest 'issued_before' for events that are otherwise identical.
- :param: Event to add to the tree
+ :param: Event to add to the tree
- :returns: the event that was passed in.
+ :returns: the event that was passed in.
"""
revoke_map = self.revoke_map