openstack
/
keystone
Code Issues Proposed changes

Fixed some typos throughout the codebase 

Change-Id: I66e421b1743f7b3e3e7ecd34e64f67b6e0a53f2c
This commit is contained in:
Alex Gaynor 2014-05-01 07:14:13 -07:00
parent 1dde1741f1
commit 6caaddad85
17 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/configuration.rst
View File

@ -776,7 +776,7 @@ The following attributes are available
* Attributes related to API call: Any parameters that are passed into the
API call are available, along with any filters specified in the query
string. Attributes of objects passed can be refererenced using an
string. Attributes of objects passed can be referenced using an
object.attribute syntax (e.g. user.domain_id). The target objects of an
API are also available using a target.object.attribute syntax. For instance:
@ -829,12 +829,12 @@ provider wishes to allow adminsistration of the contents of a domain to
be delegated, it is recommended that the supplied policy.v3cloudsample.json
is used as a basis for creating a suitable production policy file. This
example policy file also shows the use of an admin_domain to allow a cloud
provider to enable cloud adminstrators to have wider access across the APIs.
provider to enable cloud administrators to have wider access across the APIs.
A clean installation would need to perhaps start with the standard policy
file, to allow creation of the admin_domain with the first users within
it. The domain_id of the admin domain would then be obtained and could be
pasted into a modifed version of policy.v3cloudsample.json which could then
pasted into a modified version of policy.v3cloudsample.json which could then
be enabled as the main policy file.
.. _`adding extensions`:

2
doc/source/configuringservices.rst
View File

@ -199,7 +199,7 @@ Here is an example paste config filter that makes use of the 'admin_user' and
admin_password = keystone123
It should be noted that when using this option an admin tenant/role
relationship is required. The admin user is granted access to to the 'Admin'
relationship is required. The admin user is granted access to the 'Admin'
role to the 'admin' tenant.
The auth_token middleware can also be configured in nova.conf

2
doc/source/developing.rst
View File

@ -474,7 +474,7 @@ backend of the KVS system. The implementation allows for the use of any normal `
cache backends to be used as a store. All interfacing to the KVS system happens via the
``KeyValueStore`` object located at ``keystone.common.kvs.KeyValueStore``.
To utilize the KVS system an instantiation of the ``KeyValueStore`` class is needed. To accquire
To utilize the KVS system an instantiation of the ``KeyValueStore`` class is needed. To acquire
a KeyValueStore instantiation use the ``keystone.common.kvs.get_key_value_store`` factory
function. This factory will either create a new ``KeyValueStore`` object or retrieve the
already instantiated ``KeyValueStore`` object by the name passed as an argument. The object must

2
doc/source/extension_development.rst
View File

@ -269,7 +269,7 @@ Example:
def __init__(self):
self.event_callbacks = {
# Here we add the the event_callbacks class attribute that
# Here we add the event_callbacks class attribute that
# calls project_deleted_callback when a project is deleted.
'deleted': {
'project': [

2
doc/source/installing.rst
View File

@ -79,7 +79,7 @@ but all of the core OpenStack projects.
.. _DEVSTACK: http://devstack.org/
The script with the latest examples of intializing data in Keystone is a
The script with the latest examples of initializing data in Keystone is a
bash script called keystone_data.sh_
.. _keystone_data.sh: https://github.com/openstack-dev/devstack/blob/master/files/keystone_data.sh

6
keystone/common/base64utils.py
View File

@ -154,7 +154,7 @@ def base64_to_base64url(text):
trailing pad character(s) for use in URL's it can be added back
using the base64_assure_padding() function.
This function makes no decisions about which padding methodolgy to
This function makes no decisions about which padding methodology to
use. One can either call base64_strip_padding() to remove any pad
characters (restoring later with base64_assure_padding()) or call
base64url_percent_encode() to percent-encode the pad characters.
@ -296,11 +296,11 @@ def base64_assure_padding(text, pad='='):
Base64 text is normally expected to be a multple of 4
characters. Each 4 character base64 sequence produces 3 octets of
binary data. If the binary data is not a multiple of 3 the base64
text is padded at the end with a pad character such that is is
text is padded at the end with a pad character such that it is
always a multple of 4. Padding is ignored and does not alter the
binary data nor it's length.
In some circumstances is is desirable to omit the padding
In some circumstances it is desirable to omit the padding
character due to transport encoding conflicts. Base64 text can
still be correctly decoded if the length of the base64 text
(consisting only of characters in the desired base64 alphabet) is

2
keystone/common/cache/backends/mongo.py vendored
View File

@ -528,7 +528,7 @@ class BaseTransform(AbstractManipulator):
Note: Custom manipulator needs to always override ``transform_incoming``
and ``transform_outgoing`` methods. MongoDB manipulator logic specifically
checks that overriden method in instance and its super are different.
checks that overridden method in instance and its super are different.
"""
def transform_incoming(self, son, collection):

2
keystone/common/controller.py
View File

@ -545,7 +545,7 @@ class V3Controller(wsgi.Application):
raise exception.ValidationError(_('Cannot change Domain ID'))
def _assign_unique_id(self, ref):
"""Generates and assigns a unique identifer to a reference."""
"""Generates and assigns a unique identifier to a reference."""
ref = ref.copy()
ref['id'] = uuid.uuid4().hex
return ref

2
keystone/common/ldap/core.py
View File

@ -160,7 +160,7 @@ class LDAPHandler(object):
provider. Currently we have:
* python-ldap, this is the standard LDAP API for Python, it
requres access to a live LDAP server.
requires access to a live LDAP server.
* Fake LDAP which emulates python-ldap. This is used for
testing without requiring a live LDAP server.

2
keystone/common/pemutils.py
View File

@ -319,7 +319,7 @@ def parse_pem(text, pem_type=None, max_items=None):
"""Scan text for PEM data, return list of PEM items
The input text is scanned for PEM blocks, for each one found a
PEMParseResult is contructed and added to the return list.
PEMParseResult is constructed and added to the return list.
pem_type operates as a filter on the type of PEM desired. If
pem_type is specified only those PEM blocks which match will be

2
keystone/common/wsgi.py
View File

@ -291,7 +291,7 @@ class Application(BaseApplication):
"""Get the trust_id for a call.
Retrieve the trust_id from the token
Returns None if token is is not trust scoped
Returns None if token is not trust scoped
"""
if ('token_id' not in context or
context.get('token_id') == CONF.admin_token):

2
keystone/credential/controllers.py
View File

@ -32,7 +32,7 @@ class CredentialV3(controller.V3Controller):
self.get_member_from_driver = self.credential_api.get_credential
def _assign_unique_id(self, ref, trust_id=None):
# Generates and assigns a unique identifer to
# Generates and assigns a unique identifier to
# a credential reference.
if ref.get('type', '').lower() == 'ec2':
try:

2
keystone/hacking/checks.py
View File

@ -32,7 +32,7 @@ class BaseASTChecker(ast.NodeVisitor):
Subclasses should implement visit_* methods like any other AST visitor
implementation. When they detect an error for a particular node the
method should call ``self.add_error(offending_node)``. Details about
where in the code the error occured will be pulled from the node
where in the code the error occurred will be pulled from the node
object.
Subclasses should also provide a class variable named CHECK_DESC to

2
keystone/tests/test_backend_ldap.py
View File

@ -1647,7 +1647,7 @@ class MultiLDAPandSQLIdentity(BaseLDAPIdentity, tests.SQLDriverOverrides,
# This should now be false, as is the default, since this is not
# set in the standard primary config file
self.assertFalse(conf.identity.domain_specific_drivers_enabled)
# ..and make sure a domain-specifc options is also set
# ..and make sure a domain-specific options is also set
self.assertEqual('fake://memory1', conf.ldap.url)
def test_add_role_grant_to_user_and_project_404(self):

2
keystone/tests/test_notifications.py
View File

@ -142,7 +142,7 @@ class NotificationsTestCase(testtools.TestCase):
operation = CREATED_OPERATION
# NOTE(ldbragst): Even though notifications._send_notification doesn't
# contain logic that creates cases, this is suppose to test that
# contain logic that creates cases, this is supposed to test that
# context is always empty and that we ensure the resource ID of the
# resource in the notification is contained in the payload. It was
# agreed that context should be empty in Keystone's case, which is

4
keystone/tests/test_v3_federation.py
View File

@ -71,7 +71,7 @@ class FederatedIdentityProviderTests(FederationTests):
return (idp_id, idp)
def _get_idp(self, idp_id):
"""Fetch IdP entity based on it's id."""
"""Fetch IdP entity based on its id."""
url = self.base_url(suffix=idp_id)
resp = self.get(url)
return resp
@ -862,7 +862,7 @@ class FederatedTokenTests(FederationTests):
# Remove 'extras' if empty or None,
# as JSON and XML (de)serializers treat
# them differently, making dictionaries
# comparisions fail.
# comparisons fail.
if not token_resp['token'].get('extras'):
token_resp['token'].pop('extras')
self._assertSerializeToXML(token_resp)

4
keystone/tests/test_v3_identity.py
View File

@ -1090,8 +1090,8 @@ class IdentityTestCase(test_v3.RestfulTestCase):
Check the various ways of specifying the 'effective'
query parameter. If the 'effective' query parameter
is included then this should always be treated as
as meaning 'True' unless it is specified as:
is included then this should always be treated as meaning 'True'
unless it is specified as:
{url}?effective=0