diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-12-02 01:46:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-12-02 01:46:24 +0000 |
| commit | 41afe3c963fa01f61b67c44e572eee34b0972382 (patch) | |
| tree | 0b01d3b087879c6a1135420df4040d7f67e3a9f1 /keystoneclient/contrib | |
| parent | 4a49d970b06068b1ef26e7cc1f7dab3984da2ed4 (diff) | |
| parent | 3f1ba9f007528a7ddad7cb53ef75f7bb1026a4d1 (diff) | |
| download | python-keystoneclient-41afe3c963fa01f61b67c44e572eee34b0972382.tar.gz | |
Merge "Docstring cleanup for return type"
Diffstat (limited to 'keystoneclient/contrib')
| -rw-r--r-- | keystoneclient/contrib/auth/v3/saml2.py | 7 | ||||
| -rw-r--r-- | keystoneclient/contrib/revoke/model.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/keystoneclient/contrib/auth/v3/saml2.py b/keystoneclient/contrib/auth/v3/saml2.py index cecde02..5458ac1 100644 --- a/keystoneclient/contrib/auth/v3/saml2.py +++ b/keystoneclient/contrib/auth/v3/saml2.py @@ -427,8 +427,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) @@ -840,7 +841,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 60085ba..c3f3864 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 |