Merge "fixed typos found by RETF rules"

This commit is contained in:
Jenkins 2014-05-22 09:05:15 +00:00 committed by Gerrit Code Review
commit 8f89a14c9f
3 changed files with 4 additions and 4 deletions

View File

@ -363,9 +363,9 @@ class VerifiedHTTPSConnection(HTTPSConnection):
@staticmethod
def host_matches_cert(host, x509):
"""
Verify that the the x509 certificate we have received
Verify that the x509 certificate we have received
from 'host' correctly identifies the server we are
connecting to, ie that the certificate's Common Name
connecting to, i.e. that the certificate's Common Name
or a Subject Alternative Name matches 'host'.
"""
def check_match(name):

View File

@ -277,7 +277,7 @@ def get_file_size(file_obj):
except IOError as e:
if e.errno == errno.ESPIPE:
# Illegal seek. This means the file object
# is a pipe (e.g the user is trying
# is a pipe (e.g. the user is trying
# to pipe image data to the client,
# echo testdata | bin/glance add blah...), or
# that file object is empty, or that a file-like

View File

@ -102,7 +102,7 @@ def do_image_update(gc, args):
@utils.arg('--checksum', metavar='<CHECKSUM>',
help='Displays images that match the checksum.')
@utils.arg('--tag', metavar='<TAG>', action='append',
help="Filter images by an user-defined tag.")
help="Filter images by a user-defined tag.")
def do_image_list(gc, args):
"""List images you can access."""
filter_keys = ['visibility', 'member_status', 'owner', 'checksum', 'tag']