Merge "Docstring cleanup for return type"

1 files changed, 14 insertions, 9 deletions

diff --git a/keystoneclient/auth/base.py b/keystoneclient/auth/base.py
index 68d7b48..1f4ce29 100644
--- a/keystoneclient/auth/base.py
+++ b/keystoneclient/auth/base.py
@@ -67,7 +67,8 @@ class BaseAuthPlugin(object):
         Returning None will indicate that no token was able to be retrieved.
 
         :param session: A session object so the plugin can make HTTP calls.
-        :return string: A token to use.
+        :return: A token to use.
+        :rtype: string
         """
 
     def get_endpoint(self, session, **kwargs):
@@ -86,8 +87,9 @@ class BaseAuthPlugin(object):
         :param Session session: The session object that the auth_plugin
                                 belongs to.
 
-        :returns string: The base URL that will be used to talk to the
-                         required service or None if not available.
+        :returns: The base URL that will be used to talk to the required
+                  service or None if not available.
+        :rtype: string
         """
 
     def invalidate(self):
@@ -99,9 +101,10 @@ class BaseAuthPlugin(object):
         returned to indicate that the token may have been revoked or is
         otherwise now invalid.
 
-        :returns bool: True if there was something that the plugin did to
-                       invalidate. This means that it makes sense to try again.
-                       If nothing happens returns False to indicate give up.
+        :returns: True if there was something that the plugin did to
+                  invalidate. This means that it makes sense to try again. If
+                  nothing happens returns False to indicate give up.
+        :rtype: bool
         """
         return False
 
@@ -111,8 +114,9 @@ class BaseAuthPlugin(object):
 
         This list may be used to generate CLI or config arguments.
 
-        :returns list: A list of Param objects describing available plugin
-                       parameters.
+        :returns: A list of Param objects describing available plugin
+                  parameters.
+        :rtype: list
         """
         return []
 
@@ -201,7 +205,8 @@ class BaseAuthPlugin(object):
         :param conf: An oslo.config conf object.
         :param string group: The group name that options should be read from.
 
-        :returns plugin: An authentication Plugin.
+        :returns: An authentication Plugin.
+        :rtype: plugin:
         """
         plugin_opts = cls.get_options()