From 98e7e991db1f9803e9395e691b34f62f7799ce50 Mon Sep 17 00:00:00 2001 From: hgangwx Date: Sat, 26 Dec 2015 20:45:17 +0800 Subject: [PATCH] Wrong usage of "a" Wrong usage of "a" in the mesages: "Convert list of dicts to a indexted dict" "Attempt to create a initiatorGroup" "Return a empty" "Return a object containing the parsed output" "where volume is either a dict or a oslo_versionedobject" "this is a update from legacy driver" Should be: "Convert list of dicts to an indexted dict" "Attempt to create an initiatorGroup" "Return an empty" "Return an object containing the parsed output" "where volume is either a dict or an oslo_versionedobject" "this is an update from legacy driver" Totally 6 occasions in Cinder base code. Change-Id: I209fa7817f531107ae15a980f81c02fe63dd557e --- cinder/image/image_utils.py | 2 +- cinder/scheduler/host_manager.py | 2 +- cinder/utils.py | 2 +- cinder/volume/api.py | 2 +- cinder/volume/drivers/emc/emc_vmax_masking.py | 2 +- cinder/volume/drivers/hitachi/hnas_backend.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cinder/image/image_utils.py b/cinder/image/image_utils.py index e9ed86f58..cb637b995 100644 --- a/cinder/image/image_utils.py +++ b/cinder/image/image_utils.py @@ -56,7 +56,7 @@ CONF.register_opts(image_helper_opts) def qemu_img_info(path, run_as_root=True): - """Return a object containing the parsed output from qemu-img info.""" + """Return an object containing the parsed output from qemu-img info.""" cmd = ('env', 'LC_ALL=C', 'qemu-img', 'info', path) if os.name == 'nt': cmd = cmd[2:] diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py index d4c1135ea..3568202a5 100644 --- a/cinder/scheduler/host_manager.py +++ b/cinder/scheduler/host_manager.py @@ -221,7 +221,7 @@ class HostState(object): self._append_backend_info(capability) self.pools[pool_name] = single_pool else: - # this is a update from legacy driver + # this is an update from legacy driver try: single_pool = self.pools[pool_name] except KeyError: diff --git a/cinder/utils.py b/cinder/utils.py index dfb14fe8a..8a7237792 100644 --- a/cinder/utils.py +++ b/cinder/utils.py @@ -282,7 +282,7 @@ def last_completed_audit_period(unit=None): def list_of_dicts_to_dict(seq, key): - """Convert list of dicts to a indexted dict. + """Convert list of dicts to an indexted dict. Takes a list of dicts, and converts it a nested dict indexed by diff --git a/cinder/volume/api.py b/cinder/volume/api.py index 8f7e62cac..f7c625b09 100644 --- a/cinder/volume/api.py +++ b/cinder/volume/api.py @@ -461,7 +461,7 @@ class API(base.Base): # NOTE(thangp): Update is called by various APIs, some of which are # not yet using oslo_versionedobjects. We need to handle the case - # where volume is either a dict or a oslo_versionedobject. + # where volume is either a dict or an oslo_versionedobject. if isinstance(volume, objects_base.CinderObject): volume.update(fields) volume.save() diff --git a/cinder/volume/drivers/emc/emc_vmax_masking.py b/cinder/volume/drivers/emc/emc_vmax_masking.py index b3b2b98b7..f0627f0ae 100644 --- a/cinder/volume/drivers/emc/emc_vmax_masking.py +++ b/cinder/volume/drivers/emc/emc_vmax_masking.py @@ -786,7 +786,7 @@ class EMCVMAXMasking(object): def _create_or_get_initiator_group( self, conn, controllerConfigService, igGroupName, connector, storageSystemName, extraSpecs): - """Attempt to create a initiatorGroup. + """Attempt to create an initiatorGroup. If one already exists with the same Initiator/wwns then get it. Check to see if an initiatorGroup already exists, that matches the diff --git a/cinder/volume/drivers/hitachi/hnas_backend.py b/cinder/volume/drivers/hitachi/hnas_backend.py index 0e4688e21..61877aa2f 100644 --- a/cinder/volume/drivers/hitachi/hnas_backend.py +++ b/cinder/volume/drivers/hitachi/hnas_backend.py @@ -356,7 +356,7 @@ class HnasBackend(object): tgt_list.append(tgt) if tgtalias is not None: - # We tried to find 'tgtalias' but didn't find. Return a empty + # We tried to find 'tgtalias' but didn't find. Return an empty # list. LOG.debug("There's no target %(alias)s in EVS %(evsid)s.", {'alias': tgtalias, 'evsid': evsid}) -- 2.45.2