openstack/python-swiftclient
Code Issues Proposed changes

Merge "fixed typos found by RETF rules"

Browse Source
This commit is contained in:
Jenkins 2014-05-16 15:41:30 +00:00 committed by Gerrit Code Review
commit 09eb1843f1
2 changed files with 5 additions and 5 deletions

6
swiftclient/client.py

@ -274,7 +274,7 @@ def get_auth_1_0(url, user, key, snet, **kwargs):
def get_keystoneclient_2_0(auth_url, user, key, os_options, **kwargs): def get_keystoneclient_2_0(auth_url, user, key, os_options, **kwargs):
""" """
Authenticate against a auth 2.0 server. Authenticate against an auth 2.0 server.
We are using the keystoneclient library for our 2.0 authentication. We are using the keystoneclient library for our 2.0 authentication.
""" """
@ -898,7 +898,7 @@ def put_object(url, token=None, container=None, name=None, contents=None,
:param etag: etag of contents; if None, no etag will be sent :param etag: etag of contents; if None, no etag will be sent
:param chunk_size: chunk size of data to write; it defaults to 65536; :param chunk_size: chunk size of data to write; it defaults to 65536;
used only if the contents object has a 'read' used only if the contents object has a 'read'
method, eg. file-like objects, ignored otherwise method, e.g. file-like objects, ignored otherwise
:param content_type: value to send as content-type header; if None, no :param content_type: value to send as content-type header; if None, no
content-type will be set (remote end will likely try content-type will be set (remote end will likely try
to auto-detect it) to auto-detect it)
@ -1117,7 +1117,7 @@ class Connection(object):
:param max_backoff: maximum delay between retries (seconds) :param max_backoff: maximum delay between retries (seconds)
:param auth_version: OpenStack auth version, default is 1.0 :param auth_version: OpenStack auth version, default is 1.0
:param tenant_name: The tenant/account name, required when connecting :param tenant_name: The tenant/account name, required when connecting
to a auth 2.0 system. to an auth 2.0 system.
:param os_options: The OpenStack options which can have tenant_id, :param os_options: The OpenStack options which can have tenant_id,
auth_token, service_type, endpoint_type, auth_token, service_type, endpoint_type,
tenant_name, object_storage_url, region_name tenant_name, object_storage_url, region_name

4
swiftclient/shell.py

@ -831,7 +831,7 @@ Optional arguments:
--segment-container <container> --segment-container <container>
Upload the segments into the specified container. If Upload the segments into the specified container. If
not specified, the segments will be uploaded to a not specified, the segments will be uploaded to a
<container>_segments container so as to not pollute the <container>_segments container to not pollute the
main <container> listings. main <container> listings.
--leave-segments Indicates that you want the older segments of manifest --leave-segments Indicates that you want the older segments of manifest
objects left alone (in the case of overwrites). objects left alone (in the case of overwrites).
@ -872,7 +872,7 @@ def st_upload(parser, args, thread_manager):
'-C', '--segment-container', dest='segment_container', '-C', '--segment-container', dest='segment_container',
help='Upload the segments into the specified container. ' help='Upload the segments into the specified container. '
'If not specified, the segments will be uploaded to a ' 'If not specified, the segments will be uploaded to a '
'<container>_segments container so as to not pollute the main ' '<container>_segments container to not pollute the main '
'<container> listings.') '<container> listings.')
parser.add_option( parser.add_option(
'', '--leave-segments', action='store_true', '', '--leave-segments', action='store_true',