From 22500e94cdd5253e51ff076392074a1bbb4f4061 Mon Sep 17 00:00:00 2001 From: Martin Kletzander Date: Thu, 19 Mar 2015 17:25:56 +0100 Subject: [PATCH] Fix common misspellings Wikipedia's list of common misspellings [1] has a machine-readable version. This patch fixes those misspellings mentioned in the list which don't have multiple right variants (as e.g. "accension", which can be both "accession" and "ascension"), such misspellings are left untouched. The list of changes was manually re-checked for false positives. [1] https://en.wikipedia.org/wiki/Wikipedia:Lists_of_common_misspellings/For_machines Change-Id: I44d53a807a6d2e9910daab939f4c0b7768c07ad9 Signed-off-by: Martin Kletzander --- cinder/consistencygroup/api.py | 2 +- cinder/objects/base.py | 2 +- cinder/tests/unit/targets/test_tgt_driver.py | 4 ++-- cinder/tests/unit/test_srb.py | 2 +- cinder/volume/drivers/emc/emc_vmax_utils.py | 4 ++-- cinder/volume/drivers/ibm/storwize_svc/helpers.py | 2 +- pylintrc | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cinder/consistencygroup/api.py b/cinder/consistencygroup/api.py index c1386870080..6cba8000cad 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 23d66322b5d..946f10c8e16 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 1f6286baac3..28e243151a7 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 594a1e1813e..84934b45c77 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 4c2d10648d7..fbe13499134 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 4d65376abb4..663c71cf540 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 b8ffa2ab308..eb795980dfc 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/)