From 69074f7512b4ed62c6fcf2baf2de6aa23fd48c30 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Fri, 25 Apr 2014 16:23:15 -0700 Subject: [PATCH] Fix many typos Change-Id: I2c4b04945dd44cec6d3b245ac00345da7e9ba1bf --- contrib/docker/docker/resources/docker_container.py | 2 +- contrib/extraroute/extraroute/resources/extraroute.py | 2 +- doc/source/pluginguide.rst | 4 ++-- doc/source/template_guide/functions.rst | 4 ++-- heat/api/aws/exception.py | 2 +- heat/common/exception.py | 2 +- heat/common/heat_keystoneclient.py | 4 ++-- heat/engine/api.py | 2 +- heat/engine/cfn/functions.py | 2 +- heat/engine/parameters.py | 2 +- heat/engine/resource.py | 5 +++-- heat/engine/resources/volume.py | 2 +- heat/engine/service.py | 2 +- heat/tests/test_api_cloudwatch.py | 2 +- heat/tests/test_hot.py | 2 +- heat/tests/test_nova_keypair.py | 2 +- heat/tests/test_parameters.py | 2 +- 17 files changed, 22 insertions(+), 21 deletions(-) diff --git a/contrib/docker/docker/resources/docker_container.py b/contrib/docker/docker/resources/docker_container.py index 0166287557..6057ef6ac2 100644 --- a/contrib/docker/docker/resources/docker_container.py +++ b/contrib/docker/docker/resources/docker_container.py @@ -69,7 +69,7 @@ class DockerContainer(resource.Resource): ), ATTACH_STDIN: properties.Schema( properties.Schema.BOOLEAN, - _('Attach to the the process\' standard input'), + _('Attach to the process\' standard input'), default=False ), ATTACH_STDOUT: properties.Schema( diff --git a/contrib/extraroute/extraroute/resources/extraroute.py b/contrib/extraroute/extraroute/resources/extraroute.py index f45ec53d41..a8435463d7 100644 --- a/contrib/extraroute/extraroute/resources/extraroute.py +++ b/contrib/extraroute/extraroute/resources/extraroute.py @@ -40,7 +40,7 @@ class ExtraRoute(neutron.NeutronResource): required=True), NEXTHOP: properties.Schema( properties.Schema.STRING, - description=_('Nexthop IP adddress.'), + description=_('Nexthop IP address.'), required=True) } diff --git a/doc/source/pluginguide.rst b/doc/source/pluginguide.rst index 89d0ed0d29..3cb97d0f8b 100644 --- a/doc/source/pluginguide.rst +++ b/doc/source/pluginguide.rst @@ -135,8 +135,8 @@ plug-in. } As shown above, some properties may themselves be complex and -reference nested schema definitions. Following are the parameters to -to the ``Schema`` constructor; all but the first have defaults. +reference nested schema definitions. Following are the parameters to the +``Schema`` constructor; all but the first have defaults. *data_type*: diff --git a/doc/source/template_guide/functions.rst b/doc/source/template_guide/functions.rst index 6eac051f43..e98c3d12d8 100644 --- a/doc/source/template_guide/functions.rst +++ b/doc/source/template_guide/functions.rst @@ -214,8 +214,8 @@ Find an replace one string with another. Parameters ~~~~~~~~~~ -subsitutions : map - A map of subsitutions. +substitutions : map + A map of substitutions. string: String The string to do the substitutions in. diff --git a/heat/api/aws/exception.py b/heat/api/aws/exception.py index 444f5a4b32..c943b66d03 100644 --- a/heat/api/aws/exception.py +++ b/heat/api/aws/exception.py @@ -28,7 +28,7 @@ class HeatAPIException(webob.exc.HTTPError): ''' Subclass webob HTTPError so we can correctly serialize the wsgi response into the http response body, using the format specified by the request. - Note this should not be used directly, instead use of of the subclasses + Note this should not be used directly, instead use the subclasses defined below which map to AWS API errors ''' code = 400 diff --git a/heat/common/exception.py b/heat/common/exception.py index e0c6c0eba3..9dd512b261 100644 --- a/heat/common/exception.py +++ b/heat/common/exception.py @@ -158,7 +158,7 @@ class Forbidden(HeatException): msg_fmt = _("You are not authorized to complete this action.") -#NOTE(bcwaldon): here for backwards-compatability, need to deprecate. +#NOTE(bcwaldon): here for backwards-compatibility, need to deprecate. class NotAuthorized(Forbidden): msg_fmt = _("You are not authorized to complete this action.") diff --git a/heat/common/heat_keystoneclient.py b/heat/common/heat_keystoneclient.py index 39b0e37aa6..1f042cfbf9 100644 --- a/heat/common/heat_keystoneclient.py +++ b/heat/common/heat_keystoneclient.py @@ -422,8 +422,8 @@ class KeystoneClientV3(object): # Note v3/credentials does not support filtering by access # because it's stored in the credential blob, so we expect # all resources to pass credential_id except where backwards - # compatibility is required (resource only has acccess stored) - # then we'll have to to a brute-force lookup locally + # compatibility is required (resource only has access stored) + # then we'll have to do a brute-force lookup locally if credential_id: cred = self.client.credentials.get(credential_id) ec2_creds = json.loads(cred.blob) diff --git a/heat/engine/api.py b/heat/engine/api.py index 7b7505a8b3..a03fa64451 100644 --- a/heat/engine/api.py +++ b/heat/engine/api.py @@ -173,7 +173,7 @@ def format_event(event): def format_notification_body(stack): - # some other posibilities here are: + # some other possibilities here are: # - template name # - template size # - resource count diff --git a/heat/engine/cfn/functions.py b/heat/engine/cfn/functions.py index 09c5c89845..558b172529 100644 --- a/heat/engine/cfn/functions.py +++ b/heat/engine/cfn/functions.py @@ -342,7 +342,7 @@ class Split(function.Function): class Replace(function.Function): ''' - A function for performing string subsitutions. + A function for performing string substitutions. Takes the form:: diff --git a/heat/engine/parameters.py b/heat/engine/parameters.py index 04b4a22394..910bacc29a 100644 --- a/heat/engine/parameters.py +++ b/heat/engine/parameters.py @@ -65,7 +65,7 @@ class Schema(constr.Schema): self.context = context # Schema class validates default value for lists assuming list type. For - # comma delimited list string supported in paramaters Schema class, the + # comma delimited list string supported in parameters Schema class, the # default value has to be parsed into a list if necessary so that # validation works. def _validate_default(self): diff --git a/heat/engine/resource.py b/heat/engine/resource.py index 24eaa02629..f203e43445 100644 --- a/heat/engine/resource.py +++ b/heat/engine/resource.py @@ -429,7 +429,8 @@ class Resource(object): ''' Default implementation of Resource.preview. - This method should be overriden by child classes for specific behavior. + This method should be overridden by child classes for specific + behavior. ''' return self @@ -781,7 +782,7 @@ class Resource(object): logger.error(_('DB error %s') % ex) # store resource in DB on transition to CREATE_IN_PROGRESS - # all other transistions (other than to DELETE_COMPLETE) + # all other transitions (other than to DELETE_COMPLETE) # should be handled by the update_and_save above.. elif (action, status) in [(self.CREATE, self.IN_PROGRESS), (self.ADOPT, self.IN_PROGRESS)]: diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py index 89d27cd1bd..ad251f778d 100644 --- a/heat/engine/resources/volume.py +++ b/heat/engine/resources/volume.py @@ -294,7 +294,7 @@ class VolumeDetachTask(object): # The next check is needed for immediate reattachment when updating: # there might be some time between cinder marking volume as 'available' - # and nova removing attachment from it's own objects, so we + # and nova removing attachment from its own objects, so we # check that nova already knows that the volume is detached server_api = self.clients.nova().volumes diff --git a/heat/engine/service.py b/heat/engine/service.py index d175bed0a4..2003ba8d2e 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -1095,7 +1095,7 @@ class EngineService(service.Service): for action in actions: self.thread_group_mgr.start(wr.stack_id, action) - # Return the watch with the state overriden to indicate success + # Return the watch with the state overridden to indicate success # We do not update the timestamps as we are not modifying the DB result = api.format_watch(wr) result[rpc_api.WATCH_STATE_VALUE] = state diff --git a/heat/tests/test_api_cloudwatch.py b/heat/tests/test_api_cloudwatch.py index 9da8c2b0d6..d1d56efbc6 100644 --- a/heat/tests/test_api_cloudwatch.py +++ b/heat/tests/test_api_cloudwatch.py @@ -339,7 +339,7 @@ class WatchControllerTest(HeatTestCase): def test_list_metrics_filter_namespace(self): # Add a Namespace filter and change the engine response so - # we should get two reponses + # we should get two responses params = {'Action': 'ListMetrics', 'Namespace': 'atestnamespace/foo'} dummy_req = self._dummy_GET_request(params) diff --git a/heat/tests/test_hot.py b/heat/tests/test_hot.py index 49f76d4343..d3d046cf3c 100644 --- a/heat/tests/test_hot.py +++ b/heat/tests/test_hot.py @@ -448,7 +448,7 @@ class HOTemplateTest(HeatTestCase): def test_prevent_parameters_access(self): """ - Test that the parameters section can't be accesed using the template + Test that the parameters section can't be accessed using the template as a dictionary. """ expected_description = "This can be accessed" diff --git a/heat/tests/test_nova_keypair.py b/heat/tests/test_nova_keypair.py index 9be009bae4..8fed0f5064 100644 --- a/heat/tests/test_nova_keypair.py +++ b/heat/tests/test_nova_keypair.py @@ -106,7 +106,7 @@ class NovaKeyPairTest(HeatTestCase): self.m.VerifyAll() def test_delete_key_not_found(self): - """Test delete non-existant key.""" + """Test delete non-existent key.""" test_res = self._get_test_resource(self.kp_template) test_res.resource_id = "key_name" test_res.state_set(test_res.CREATE, test_res.COMPLETE) diff --git a/heat/tests/test_parameters.py b/heat/tests/test_parameters.py index a6bb2a2bbd..6ab0a9cb17 100644 --- a/heat/tests/test_parameters.py +++ b/heat/tests/test_parameters.py @@ -237,7 +237,7 @@ class ParameterTest(testtools.TestCase): self.assertIn('wibble', str(err)) def test_map_value(self): - '''Happy path for value thats already a map.''' + '''Happy path for value that's already a map.''' schema = {'Type': 'Json'} val = {"foo": "bar", "items": [1, 2, 3]} p = self.new_parameter('p', schema, val)