diff --git a/cinder/consistencygroup/api.py b/cinder/consistencygroup/api.py index c13868700..6cba8000c 100644 --- a/cinder/consistencygroup/api.py +++ b/cinder/consistencygroup/api.py @@ -453,7 +453,7 @@ class API(base.Base): fields = {'updated_at': now} # Update name and description in db now. No need to - # to send them over thru an RPC call. + # to send them over through an RPC call. if name: fields['name'] = name if description: diff --git a/cinder/objects/base.py b/cinder/objects/base.py index 23d66322b..946f10c8e 100644 --- a/cinder/objects/base.py +++ b/cinder/objects/base.py @@ -613,7 +613,7 @@ class CinderObjectDictCompat(object): if key not in self.obj_fields: # NOTE(jdg): There are a number of places where we rely on the # old dictionary version and do a get(xxx, None). - # The following preserves that compatability but in + # The following preserves that compatibility but in # the future we'll remove this shim altogether so don't # rely on it. LOG.debug('Cinder object %(object_name)s has no ' diff --git a/cinder/tests/unit/targets/test_tgt_driver.py b/cinder/tests/unit/targets/test_tgt_driver.py index 1f6286baa..28e243151 100644 --- a/cinder/tests/unit/targets/test_tgt_driver.py +++ b/cinder/tests/unit/targets/test_tgt_driver.py @@ -328,7 +328,7 @@ class TestTgtAdmDriver(test.TestCase): raise putils.ProcessExecutionError( exit_code=1, stdout='', - stderr='this isnt the error your looking for', + stderr='this is not the error you are looking for', cmd='tgt-admin --force --delete') mock_exec.side_effect = _fake_execute @@ -373,7 +373,7 @@ class TestTgtAdmDriver(test.TestCase): raise putils.ProcessExecutionError( exit_code=1, stdout='', - stderr='this isnt the error your looking for', + stderr='this is not the error you are looking for', cmd='tgt-admin --force --delete') mock_exec.side_effect = _fake_execute diff --git a/cinder/tests/unit/test_srb.py b/cinder/tests/unit/test_srb.py index 594a1e181..84934b45c 100644 --- a/cinder/tests/unit/test_srb.py +++ b/cinder/tests/unit/test_srb.py @@ -585,7 +585,7 @@ class SRBDriverTestCase(test.TestCase): lvname = cmd[4].split('/')[1] snapname = cmd[2] if lvname not in self._volumes[vgname]['vgs'][vgname]['lvs']: - raise AssertionError('snap creation attempted on non-existant ' + raise AssertionError('snap creation attempted on non-existent ' 'thin-lv: %s' % cmd_string) if snapname[1:] in self._volumes[vgname]['vgs'][vgname]['snaps']: raise AssertionError('snap creation attempted on existing ' diff --git a/cinder/volume/drivers/emc/emc_vmax_utils.py b/cinder/volume/drivers/emc/emc_vmax_utils.py index 4c2d10648..fbe134991 100644 --- a/cinder/volume/drivers/emc/emc_vmax_utils.py +++ b/cinder/volume/drivers/emc/emc_vmax_utils.py @@ -1533,7 +1533,7 @@ class EMCVMAXUtils(object): if six.text_type(poolName) == six.text_type(poolnameStr): try: - # Check that pool hasnt suddently been deleted. + # Check that pool hasn't suddenly been deleted. srpPoolInstance = conn.GetInstance(srpPoolInstanceName) propertiesList = srpPoolInstance.properties.items() for properties in propertiesList: @@ -1591,7 +1591,7 @@ class EMCVMAXUtils(object): poolInstanceId) if poolnameStr is not None and systemNameStr is not None: if six.text_type(poolNameInStr) == six.text_type(poolnameStr): - # check that the pool hasnt recently been deleted. + # check that the pool hasn't recently been deleted. try: conn.GetInstance(vpoolInstanceName) foundPoolInstanceName = vpoolInstanceName diff --git a/cinder/volume/drivers/ibm/storwize_svc/helpers.py b/cinder/volume/drivers/ibm/storwize_svc/helpers.py index 4d65376ab..663c71cf5 100644 --- a/cinder/volume/drivers/ibm/storwize_svc/helpers.py +++ b/cinder/volume/drivers/ibm/storwize_svc/helpers.py @@ -946,7 +946,7 @@ class StorwizeHelpers(object): """Ensures that vdisk is not part of FC mapping and deletes it.""" LOG.debug('enter: delete_vdisk: vdisk %s' % vdisk) if not self.is_vdisk_defined(vdisk): - LOG.info(_LI('Tried to delete non-existant vdisk %s.') % vdisk) + LOG.info(_LI('Tried to delete non-existent vdisk %s.') % vdisk) return self.ensure_vdisk_no_fc_mappings(vdisk) self.ssh.rmvdisk(vdisk, force=force) diff --git a/pylintrc b/pylintrc index b8ffa2ab3..eb795980d 100644 --- a/pylintrc +++ b/pylintrc @@ -16,7 +16,7 @@ variable-rgx=[a-z_][a-z0-9_]{0,30}$ argument-rgx=[a-z_][a-z0-9_]{1,30}$ # Method names should be at least 3 characters long -# and be lowecased with underscores +# and be lowercased with underscores method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$ # Module names matching cinder-* are ok (files in bin/)