Merge "fixed typos found by RETF rules"

keystoneclient/auth/identity/v3.py

@@ -249,7 +249,7 @@ class TokenMethod(AuthMethod):
     _method_parameters = ['token']
 
     def __init__(self, **kwargs):
-        """Construct a Auth plugin to fetch a token from a token.
+        """Construct an Auth plugin to fetch a token from a token.
 
         :param string token: Token for authentication.
         """

keystoneclient/service_catalog.py

@@ -30,7 +30,7 @@ class ServiceCatalog(object):
 
     @classmethod
     def factory(cls, resource_dict, token=None, region_name=None):
-        """Create ServiceCatalog object given a auth token."""
+        """Create ServiceCatalog object given an auth token."""
         if ServiceCatalogV3.is_valid(resource_dict):
             return ServiceCatalogV3(token, resource_dict, region_name)
         elif ServiceCatalogV2.is_valid(resource_dict):

keystoneclient/session.py

@@ -129,7 +129,7 @@ class Session(object):
                            provided such that the base URL can be determined.
                            If a fully qualified URL is provided then
                            endpoint_filter will be ignored.
-        :param string method: The http method to use. (eg. 'GET', 'POST')
+        :param string method: The http method to use. (e.g. 'GET', 'POST')
         :param string original_ip: Mark this request as forwarded for this ip.
                                    (optional)
         :param dict headers: Headers to be included in the request. (optional)
@@ -186,7 +186,7 @@ class Session(object):
 
             headers['X-Auth-Token'] = token
 
-        # if we are passed a fully qualified URL and a endpoint_filter we
+        # if we are passed a fully qualified URL and an endpoint_filter we
         # should ignore the filter. This will make it easier for clients who
         # want to overrule the default endpoint_filter data added to all client
         # requests. We check fully qualified here by the presence of a host.

keystoneclient/utils.py

@@ -65,7 +65,7 @@ def print_list(objs, fields, formatters={}, order_by=None):
 
 
 def _word_wrap(string, max_length=0):
-    """wrap long strings to be no longer then max_length."""
+    """wrap long strings to be no longer than max_length."""
     if max_length <= 0:
         return string
     return '\n'.join([string[i:i + max_length] for i in