Merge "Fix docstrings in keystoneclient"

This commit is contained in:
Jenkins
2014-05-03 00:25:59 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 1 deletions

View File

@@ -205,7 +205,7 @@ class ServiceCatalog(object):
:param string endpoint_type: Type of endpoint.
:param string region_name: Region of the endpoint.
:param string service_name: The assigned name of the service.
:
"""
if not self.get_data():
raise exceptions.EmptyCatalog('The service catalog is empty.')

View File

@@ -39,6 +39,7 @@ class TrustManager(base.CrudManager):
project=None, impersonation=False, expires_at=None,
remaining_uses=None, **kwargs):
"""Create a Trust.
:param string trustee_user: user who is capable of consuming the trust
:param string trustor_user: user who's authorization is being delegated
:param string role_names: subset of trustor's roles to be granted
@@ -48,6 +49,7 @@ class TrustManager(base.CrudManager):
:param integer remaining_uses: how many times this trust can be used
to generate a token. None means
unlimited tokens.
"""
# Convert role_names list into list-of-dict API format
if role_names: