diff --git a/glance/api/v2/image_data.py b/glance/api/v2/image_data.py index c00f4c123c..722b6fafc7 100644 --- a/glance/api/v2/image_data.py +++ b/glance/api/v2/image_data.py @@ -94,7 +94,7 @@ class ImageDataController(object): if CONF.data_api == 'glance.db.registry.api': # create a trust if backend is registry try: - # request user pluging for current token + # request user plugin for current token user_plugin = req.environ.get('keystone.token_auth') roles = [] # use roles from request environment because they diff --git a/glance/api/v2/images.py b/glance/api/v2/images.py index 1aea8c0687..36a524230f 100644 --- a/glance/api/v2/images.py +++ b/glance/api/v2/images.py @@ -500,13 +500,13 @@ class RequestDeserializer(wsgi.JSONRequestDeserializer): partial_image = {path_root: change['value']} elif ((path_root in get_base_properties().keys()) and (get_base_properties()[path_root].get('type', '') == 'array')): - # NOTE(zhiyan): cient can use PATCH API to adding element to - # the image's existing set property directly. - # Such as: 1. using '/locations/N' path to adding a location - # to the image's 'locations' list at N position. + # NOTE(zhiyan): client can use the PATCH API to add an element + # directly to an existing property + # Such as: 1. using '/locations/N' path to add a location + # to the image's 'locations' list at position N. # (implemented) - # 2. using '/tags/-' path to appending a tag to the - # image's 'tags' list at last. (Not implemented) + # 2. using '/tags/-' path to append a tag to the + # image's 'tags' list at the end. (Not implemented) partial_image = {path_root: [change['value']]} if partial_image: diff --git a/glance/async/flows/ovf_process.py b/glance/async/flows/ovf_process.py index 920fa81063..7b90edabea 100644 --- a/glance/async/flows/ovf_process.py +++ b/glance/async/flows/ovf_process.py @@ -161,7 +161,7 @@ class OVAImageExtractor(object): """Parses the OVF file Parses the OVF file for specified metadata properties. Interested - properties must be specfied in ovf-metadata.json conf file. + properties must be specified in ovf-metadata.json conf file. The OVF file's qualified namespaces are removed from the included properties. diff --git a/glance/common/signature_utils.py b/glance/common/signature_utils.py index 40f0852286..78ac8426e5 100644 --- a/glance/common/signature_utils.py +++ b/glance/common/signature_utils.py @@ -297,7 +297,7 @@ def get_verifier(context, image_properties): def get_signature(signature_data): """Decode the signature data and returns the signature. - :param siganture_data: the base64-encoded signature data + :param signature_data: the base64-encoded signature data :returns: the decoded signature :raises glance.common.exception.SignatureVerificationError: if the signature data is malformatted diff --git a/glance/tests/unit/async/flows/test_ovf_process.py b/glance/tests/unit/async/flows/test_ovf_process.py index e575da912b..a68a9578ad 100644 --- a/glance/tests/unit/async/flows/test_ovf_process.py +++ b/glance/tests/unit/async/flows/test_ovf_process.py @@ -67,8 +67,8 @@ class TestOvfProcessTask(test_utils.BaseTestCase): super(TestOvfProcessTask, self).tearDown() def _copy_ova_to_tmpdir(self, ova_name): - # Copies an ova pacakge to the tempdir for tempdir from where - # the system-under-test will read it from + # Copies an ova package to the tempdir from which + # it will be read by the system-under-test shutil.copy(os.path.join(self.test_ova_dir, ova_name), self.tempdir) return os.path.join(self.tempdir, ova_name) diff --git a/glance/tests/unit/test_glare_plugin_loader.py b/glance/tests/unit/test_glare_plugin_loader.py index eba469d098..2ed995a388 100644 --- a/glance/tests/unit/test_glare_plugin_loader.py +++ b/glance/tests/unit/test_glare_plugin_loader.py @@ -52,7 +52,7 @@ class TestArtifactsLoader(utils.BaseTestCase): def test_load(self): """ - Plugins can be loaded as entrypoint=sigle plugin and + Plugins can be loaded as entrypoint=single plugin and entrypoint=[a, list, of, plugins] """ # single version diff --git a/glance/tests/unit/test_migrations.py b/glance/tests/unit/test_migrations.py index 83180090d2..6024f2afdb 100644 --- a/glance/tests/unit/test_migrations.py +++ b/glance/tests/unit/test_migrations.py @@ -238,7 +238,7 @@ class MigrationsMixin(test_migrations.WalkVersionsMixin): # load names from name collumn image_names = [row['name'] for row in select] - # check names from data in image names from name collumn + # check names from data in image names from name column for element in data: self.assertIn(element['key'], image_names) diff --git a/glance/tests/unit/v1/test_api.py b/glance/tests/unit/v1/test_api.py index f4d6bd3358..dc7390ea9c 100644 --- a/glance/tests/unit/v1/test_api.py +++ b/glance/tests/unit/v1/test_api.py @@ -4755,7 +4755,7 @@ class TestAPIPropertyQuotas(base.IsolatedUnitTest): def test_update_image_with_too_many_properties_without_purge_props(self): """ - Ensure that updating image properties counts existing image propertys + Ensure that updating image properties counts existing image properties when enforcing property quota. """ self.config(image_property_quota=1) diff --git a/glance/tests/unit/v2/test_registry_client.py b/glance/tests/unit/v2/test_registry_client.py index 6bc99bf041..e85d888720 100644 --- a/glance/tests/unit/v2/test_registry_client.py +++ b/glance/tests/unit/v2/test_registry_client.py @@ -677,7 +677,7 @@ class TestRegistryV2Client(base.IsolatedUnitTest, self.assertEqual(0, num_members) def test_image_member_find_include_deleted(self): - """Tests getting member images include the delted member""" + """Tests getting image members including the deleted member""" values = dict(image_id=UUID2, member='pattieblack') # create a member member = self.client.image_member_create(values=values) diff --git a/glance/tests/utils.py b/glance/tests/utils.py index 5024756407..802dbce55e 100644 --- a/glance/tests/utils.py +++ b/glance/tests/utils.py @@ -196,7 +196,7 @@ def fork_exec(cmd, :param cmd: Command to execute as an array of arguments. :param exec_env: A dictionary representing the environment with which to run the command. - :param logile: A path to a file which will hold the stdout/err of + :param logfile: A path to a file which will hold the stdout/err of the child process. :param pass_fds: Sequence of file descriptors passed to the child. """