diff --git a/glance/cmd/control.py b/glance/cmd/control.py index a7174ee442..e2cd44ef53 100644 --- a/glance/cmd/control.py +++ b/glance/cmd/control.py @@ -342,7 +342,7 @@ def main(): children[new_pid] = args else: rsn = 'bouncing' if bouncing else 'deliberately stopped' - print(_('Supressed respawn as %(serv)s was %(rsn)s.') + print(_('Suppressed respawn as %(serv)s was %(rsn)s.') % {'serv': server, 'rsn': rsn}) if CONF.server.command == 'start': diff --git a/glance/common/utils.py b/glance/common/utils.py index 287d4c65dc..87483b66a4 100644 --- a/glance/common/utils.py +++ b/glance/common/utils.py @@ -508,7 +508,7 @@ def validate_key_cert(key_file, cert_file): key_str = open(key_file, "r").read() key = crypto.load_privatekey(crypto.FILETYPE_PEM, key_str) - error_key_name = "certficate" + error_key_name = "certificate" error_filename = cert_file cert_str = open(cert_file, "r").read() cert = crypto.load_certificate(crypto.FILETYPE_PEM, cert_str) diff --git a/glance/db/simple/api.py b/glance/db/simple/api.py index 447ec01be4..0e710cfabb 100644 --- a/glance/db/simple/api.py +++ b/glance/db/simple/api.py @@ -555,7 +555,7 @@ def image_update(context, image_id, image_values, purge_props=False, # this matches weirdness in the sqlalchemy api prop['deleted'] = True - # add in any completly new properties + # add in any completely new properties image['properties'].extend([{'name': k, 'value': v, 'image_id': image_id, 'deleted': False} for k, v in new_properties.items()]) diff --git a/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py b/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py index 833e67275c..3bf9aada77 100644 --- a/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py +++ b/glance/db/sqlalchemy/migrate_repo/versions/022_image_member_index.py @@ -80,7 +80,7 @@ def _infer_original_keyname(table): def _sanitize(migrate_engine, table): """ Avoid possible integrity error by removing deleted rows - to accommdate less restrictive uniqueness constraint + to accommodate less restrictive uniqueness constraint """ session = orm.sessionmaker(bind=migrate_engine)() # find the image_member rows containing duplicate combinations diff --git a/glance/registry/client/v1/client.py b/glance/registry/client/v1/client.py index 01b7d2ad33..d93e805ac2 100644 --- a/glance/registry/client/v1/client.py +++ b/glance/registry/client/v1/client.py @@ -90,7 +90,7 @@ class RegistryClient(BaseClient): :param marker: image id after which to start page :param limit: max number of images to return :param sort_key: results will be ordered by this image attribute - :param sort_dir: direction in which to to order results (asc, desc) + :param sort_dir: direction in which to order results (asc, desc) """ params = self._extract_params(kwargs, images.SUPPORTED_PARAMS) res = self.do_request("GET", "/images", params=params) @@ -131,7 +131,7 @@ class RegistryClient(BaseClient): :param marker: image id after which to start page :param limit: max number of images to return :param sort_key: results will be ordered by this image attribute - :param sort_dir: direction in which to to order results (asc, desc) + :param sort_dir: direction in which to order results (asc, desc) """ params = self._extract_params(kwargs, images.SUPPORTED_PARAMS) res = self.do_request("GET", "/images/detail", params=params) diff --git a/glance/store/__init__.py b/glance/store/__init__.py index 506d983ebc..4c17458e9f 100644 --- a/glance/store/__init__.py +++ b/glance/store/__init__.py @@ -99,7 +99,7 @@ class Indexable(object): """ Initialize the object - :param wrappped: the wrapped iterator or filelike. + :param wrapped: the wrapped iterator or filelike. :param size: the size of data available """ self.wrapped = wrapped diff --git a/glance/tests/functional/db/base.py b/glance/tests/functional/db/base.py index caf6142ada..3bbd39a5d6 100644 --- a/glance/tests/functional/db/base.py +++ b/glance/tests/functional/db/base.py @@ -31,7 +31,7 @@ from glance.tests import utils as test_utils # The default sort order of results is whatever sort key is specified, # plus created_at and id for ties. When we're not specifying a sort_key, # we get the default (created_at). Some tests below expect the fixtures to be -# returned in array-order, so if if the created_at timestamps are the same, +# returned in array-order, so if the created_at timestamps are the same, # these tests rely on the UUID* values being in order UUID1, UUID2, UUID3 = sorted([str(uuid.uuid4()) for x in range(3)]) diff --git a/glance/tests/functional/v2/test_images.py b/glance/tests/functional/v2/test_images.py index a309e643ce..3d8bd1eb5b 100644 --- a/glance/tests/functional/v2/test_images.py +++ b/glance/tests/functional/v2/test_images.py @@ -1563,7 +1563,7 @@ class TestImages(functional.FunctionalTest): response = requests.delete(path, headers=self._headers()) self.assertEqual(404, response.status_code) - # The tags won't be able to to query the images after deleting + # The tags won't be able to query the images after deleting path = self._url('/v2/images?tag=gabe%%40example.com') response = requests.get(path, headers=self._headers()) self.assertEqual(200, response.status_code) diff --git a/glance/tests/unit/test_store_location.py b/glance/tests/unit/test_store_location.py index f8d98e4b84..0d5f470c52 100644 --- a/glance/tests/unit/test_store_location.py +++ b/glance/tests/unit/test_store_location.py @@ -49,7 +49,7 @@ class TestStoreLocation(base.StoreClearingUnitTest): def test_get_location_from_uri_back_to_uri(self): """ Test that for various URIs, the correct Location - object can be contructed and then the original URI + object can be constructed and then the original URI returned via the get_store_uri() method. """ good_store_uris = [