Merge "correct typos"

keystone/common/sql/migration_helpers.py

@@ -62,7 +62,7 @@ def get_constraints_names(table, column_name):
 
 #  remove_constraints and add_constraints both accept a list of dictionaries
 #  that contain:
-#  {'table': a sqlalchemy table. The constraint is added to to dropped from
+#  {'table': a sqlalchemy table. The constraint is added to dropped from
 #           this table.
 #  'fk_column': the name of a column on the above table,  The constraint
 #               is added to or dropped from this column

keystone/contrib/oauth1/routers.py

@@ -92,7 +92,7 @@ class OAuth1Extension(wsgi.V3ExtensionRouter):
                 build_parameter_relation(parameter_name='consumer_id'),
             })
 
-        # user accesss token crud
+        # user access token crud
         self._add_resource(
             mapper, access_token_controller,
             path='/users/{user_id}/OS-OAUTH1/access_tokens',

keystone/identity/generator.py

@@ -44,7 +44,7 @@ class IDGenerator(object):
 
         :param dict mapping: The items to be hashed.
 
-        The ID must be reproduceable and no more than 64 chars in length.
+        The ID must be reproducible and no more than 64 chars in length.
         The ID generated should be independent of the order of the items
         in the mapping dict.
 

keystone/tests/test_exception.py

@@ -49,7 +49,7 @@ class ExceptionTestCase(tests.TestCase):
         """
         for cls in [x for x in exception.__dict__.values() if callable(x)]:
             if cls is not exception.Error and isinstance(cls, exception.Error):
-                self.assertValidJsonRendering(cls(message='Overriden.'))
+                self.assertValidJsonRendering(cls(message='Overridden.'))
 
     def test_validation_error(self):
         target = uuid.uuid4().hex

keystone/tests/test_v3_protection.py

@@ -436,7 +436,7 @@ class IdentityTestv3CloudPolicySample(test_v3.RestfulTestCase):
                                          user_id=self.just_a_user['id'],
                                          domain_id=self.domainA['id'])
 
-        # Create a assign roles to the project
+        # Create and assign roles to the project
         self.project = self.new_project_ref(domain_id=self.domainA['id'])
         self.assignment_api.create_project(self.project['id'], self.project)
         self.assignment_api.create_grant(self.admin_role['id'],

keystone/tests/test_validation.py

@@ -30,7 +30,7 @@ the only backend for the create and validate schemas. This is just an
 example to show how a backend can be used to construct a schema. In
 Keystone, schemas are built according to the Identity API and the backends
 available in Keystone. This example does not mean that all schema in
-Keystone were strictly based of the SQL backends.
+Keystone were strictly based on the SQL backends.
 
 class Entity(sql.ModelBase):
     __tablename__ = 'entity'

keystone/token/persistence/backends/sql.py

@@ -236,7 +236,7 @@ class Token(token.persistence.Driver):
     def _expiry_range_strategy(self, dialect):
         """Choose a token range expiration strategy
 
-        Based on the DB dialect, select a expiry range callable that is
+        Based on the DB dialect, select an expiry range callable that is
         appropriate.
         """