From 79057c5aac3bbd0c0cbe5fe06d5fca6ac433117a Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Wed, 9 Nov 2011 13:01:35 -0800 Subject: [PATCH] More spelling fixes inside of nova Change-Id: I79daf7519c99cc363ac7175c85912298f273da8a --- nova/auth/fakeldap.py | 4 ++-- nova/auth/manager.py | 4 ++-- nova/fakerabbit.py | 2 +- nova/log.py | 4 ++-- nova/notifier/list_notifier.py | 2 +- nova/rpc/common.py | 4 ++-- nova/rpc/impl_carrot.py | 2 +- nova/rpc/impl_kombu.py | 4 ++-- nova/scheduler/api.py | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/nova/auth/fakeldap.py b/nova/auth/fakeldap.py index f1e76927..f576da8e 100644 --- a/nova/auth/fakeldap.py +++ b/nova/auth/fakeldap.py @@ -114,7 +114,7 @@ def _match_query(query, attrs): """Match an ldap query to an attribute dictionary. The characters &, |, and ! are supported in the query. No syntax checking - is performed, so malformed querys will not work correctly. + is performed, so malformed queries will not work correctly. """ # cut off the parentheses inner = query[1:-1] @@ -171,7 +171,7 @@ def _match(key, value, attrs): def _subs(value): """Returns a list of subclass strings. - The strings represent the ldap objectclass plus any subclasses that + The strings represent the ldap object class plus any subclasses that inherit from it. Fakeldap doesn't know about the ldap object structure, so subclasses need to be defined manually in the dictionary below. diff --git a/nova/auth/manager.py b/nova/auth/manager.py index e0504464..93b4244a 100644 --- a/nova/auth/manager.py +++ b/nova/auth/manager.py @@ -99,7 +99,7 @@ class AuthBase(object): This method will return the id of the object if the object is of this class, otherwise it will return the original object. - This allows methods to accept objects or ids as paramaters. + This allows methods to accept objects or ids as parameters. """ if isinstance(obj, cls): return obj.id @@ -692,7 +692,7 @@ class AuthManager(object): @type admin: bool @param admin: Whether to set the admin flag. The admin flag gives - superuser status regardless of roles specifed for the user. + superuser status regardless of roles specified for the user. @type create_project: bool @param: Whether to create a project for the user with the same name. diff --git a/nova/fakerabbit.py b/nova/fakerabbit.py index e7e9dab7..2807a76f 100644 --- a/nova/fakerabbit.py +++ b/nova/fakerabbit.py @@ -16,7 +16,7 @@ # License for the specific language governing permissions and limitations # under the License. -"""Based a bit on the carrot.backeds.queue backend... but a lot better.""" +"""Based a bit on the carrot.backends.queue backend... but a lot better.""" import Queue as queue diff --git a/nova/log.py b/nova/log.py index 23b83ab5..0f2153af 100644 --- a/nova/log.py +++ b/nova/log.py @@ -131,7 +131,7 @@ def _get_log_file_path(binary=None): class NovaLogger(logging.Logger): """NovaLogger manages request context and formatting. - This becomes the class that is instanciated by logging.getLogger. + This becomes the class that is instantiated by logging.getLogger. """ @@ -323,7 +323,7 @@ logging.setLoggerClass(NovaLogger) def audit(msg, *args, **kwargs): - """Shortcut for logging to root log with sevrity 'AUDIT'.""" + """Shortcut for logging to root log with severity 'AUDIT'.""" logging.root.log(AUDIT, msg, *args, **kwargs) diff --git a/nova/notifier/list_notifier.py b/nova/notifier/list_notifier.py index 955ae1b5..62847c85 100644 --- a/nova/notifier/list_notifier.py +++ b/nova/notifier/list_notifier.py @@ -53,7 +53,7 @@ def _get_drivers(): def notify(message): - """Passes notification to mulitple notifiers in a list.""" + """Passes notification to multiple notifiers in a list.""" for driver in _get_drivers(): try: driver.notify(message) diff --git a/nova/rpc/common.py b/nova/rpc/common.py index 120d6ad1..a7597d29 100644 --- a/nova/rpc/common.py +++ b/nova/rpc/common.py @@ -13,10 +13,10 @@ flags.DEFINE_integer('rpc_conn_pool_size', 30, class RemoteError(exception.NovaException): """Signifies that a remote class has raised an exception. - Containes a string representation of the type of the original exception, + Contains a string representation of the type of the original exception, the value of the original exception, and the traceback. These are sent to the parent as a joined string so printing the exception - contains all of the relevent info. + contains all of the relevant info. """ message = _("Remote error: %(exc_type)s %(value)s\n%(traceback)s.") diff --git a/nova/rpc/impl_carrot.py b/nova/rpc/impl_carrot.py index 303a4ff8..2a518d7d 100644 --- a/nova/rpc/impl_carrot.py +++ b/nova/rpc/impl_carrot.py @@ -274,7 +274,7 @@ class AdapterConsumer(Consumer): @exception.wrap_exception() def _process_data(self, msg_id, ctxt, method, args): - """Thread that maigcally looks for a method on the proxy + """Thread that magically looks for a method on the proxy object and calls it. """ diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py index e7fc491e..74c8cf41 100644 --- a/nova/rpc/impl_kombu.py +++ b/nova/rpc/impl_kombu.py @@ -319,7 +319,7 @@ class Connection(object): self.reconnect() def reconnect(self): - """Handles reconnecting and re-estblishing queues""" + """Handles reconnecting and re-establishing queues""" if self.connection: try: self.connection.close() @@ -609,7 +609,7 @@ class ProxyCallback(object): @exception.wrap_exception() def _process_data(self, ctxt, method, args): - """Thread that maigcally looks for a method on the proxy + """Thread that magically looks for a method on the proxy object and calls it. """ diff --git a/nova/scheduler/api.py b/nova/scheduler/api.py index 41cdb80a..dae5b1d8 100644 --- a/nova/scheduler/api.py +++ b/nova/scheduler/api.py @@ -60,7 +60,7 @@ def get_host_list(context): def get_zone_list(context): - """Return a list of zones assoicated with this zone.""" + """Return a list of zones associated with this zone.""" items = _call_scheduler('get_zone_list', context) for item in items: item['api_url'] = item['api_url'].replace('\\/', '/')