diff --git a/meteos/api/middleware/fault.py b/meteos/api/middleware/fault.py index 056cbcd..5a15bd8 100644 --- a/meteos/api/middleware/fault.py +++ b/meteos/api/middleware/fault.py @@ -55,8 +55,8 @@ class FaultWrapper(base_wsgi.Middleware): if headers: outer.headers = headers # NOTE(johannes): We leave the explanation empty here on - # purpose. It could possibly have sensitive information - # that should not be returned back to the user. See + # purpose. It could have sensitive information + # that should not be return back to the user. See # bugs 868360 and 874472 # NOTE(eglynn): However, it would be over-conservative and # inconsistent with the EC2 API to hide every exception, diff --git a/meteos/api/openstack/api_version_request.py b/meteos/api/openstack/api_version_request.py index f0ce3d1..3e79954 100644 --- a/meteos/api/openstack/api_version_request.py +++ b/meteos/api/openstack/api_version_request.py @@ -21,20 +21,20 @@ from meteos import exception from meteos.i18n import _ from meteos import utils -# Define the minimum and maximum version of the API across all of the +# Define the minimum and maximum version of the API across all the # REST API. The format of the version is: # X.Y where: # # - X will only be changed if a significant backwards incompatible API # change is made which affects the API as whole. That is, something -# that is only very very rarely incremented. +# that is only very rarely incremented. # # - Y when you make any change to the API. Note that this includes # semantic changes which may not affect the input or output formats or # even originate in the API code layer. We are not distinguishing # between backwards compatible and backwards incompatible changes in # the versioning system. It must be made clear in the documentation as -# to what is a backwards compatible change and what is a backwards +# to what is a backward compatible change and what is a backward # incompatible one. # @@ -49,7 +49,7 @@ REST_API_VERSION_HISTORY = """ # The minimum and maximum versions of the API supported # The default api version request is defined to be the -# the minimum version of the API supported. +# minimum version of the API supported. _MIN_API_VERSION = "1.0" _MAX_API_VERSION = "1.0" DEFAULT_API_VERSION = _MIN_API_VERSION diff --git a/meteos/api/openstack/wsgi.py b/meteos/api/openstack/wsgi.py index de1a001..3598219 100644 --- a/meteos/api/openstack/wsgi.py +++ b/meteos/api/openstack/wsgi.py @@ -716,7 +716,7 @@ class Resource(wsgi.Application): **action_args) except exception.VersionNotFoundForAPIMethod: # If an attached extension (@wsgi.extends) for the - # method has no version match its not an error. We + # method has no version match it is not an error. We # just don't run the extends code continue except Fault as ex: diff --git a/meteos/tests/fake_notifier.py b/meteos/tests/fake_notifier.py index f7fa509..831cb8a 100644 --- a/meteos/tests/fake_notifier.py +++ b/meteos/tests/fake_notifier.py @@ -51,7 +51,7 @@ class FakeNotifier(object): def _notify(self, priority, ctxt, event_type, payload): payload = self._serializer.serialize_entity(ctxt, payload) # NOTE(sileht): simulate the kombu serializer - # this permit to raise an exception if something have not + # this permit to raising an exception if something have not # been serialized correctly jsonutils.to_primitive(payload) msg = dict(publisher_id=self.publisher_id, diff --git a/meteos/utils.py b/meteos/utils.py index dd7d456..4e6132f 100644 --- a/meteos/utils.py +++ b/meteos/utils.py @@ -97,10 +97,10 @@ class SSHPool(pools.Pool): timeout=self.conn_timeout) # Paramiko by default sets the socket timeout to 0.1 seconds, # ignoring what we set through the sshclient. This doesn't help for - # keeping long lived connections. Hence we have to bypass it, by + # keeping long lived connections. Hence, we have to bypass it, by # overriding it after the transport is initialized. We are setting # the sockettimeout to None and setting a keepalive packet so that, - # the server will keep the connection open. All that does is send + # the server will keep the connection open. All that does is sent # a keepalive packet every ssh_conn_timeout seconds. if self.conn_timeout: transport = ssh.get_transport() @@ -273,7 +273,7 @@ def walk_class_hierarchy(clazz, encountered=None): for subclass in clazz.__subclasses__(): if subclass not in encountered: encountered.append(subclass) - # drill down to leaves first + # drill down to leave first for subsubclass in walk_class_hierarchy(subclass, encountered): yield subsubclass yield subclass