Fixed a handful of typos

Change-Id: Ieae86b435f9d542e1308a8e1d7d0c5cea9c7d076
This commit is contained in:
Alex Gaynor 2014-04-30 07:20:54 -07:00
parent ed816a214b
commit 69415fcec9
9 changed files with 10 additions and 10 deletions

View File

@ -343,7 +343,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':

View File

@ -506,7 +506,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)

View File

@ -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()])

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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)])

View File

@ -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)

View File

@ -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 = [