diff options
-rwxr-xr-x | bin/swift | 56 | ||||
-rw-r--r-- | swiftclient/client.py | 7 | ||||
-rw-r--r-- | swiftclient/version.py | 2 | ||||
-rw-r--r-- | tox.ini | 3 |
4 files changed, 35 insertions, 33 deletions
@@ -86,9 +86,11 @@ Optional arguments: --all Delete all containers and objects --leave-segments Do not delete segments of manifest objects --object-threads <threads> - Number of threads to use for deleting objects + Number of threads to use for deleting objects. + Default is 10 --container-threads <threads> - Number of threads to use for deleting containers + Number of threads to use for deleting containers. + Default is 10 '''.strip("\n") @@ -238,7 +240,7 @@ def st_delete(parser, args, thread_manager): st_download_options = '''[--all] [--marker] [--prefix <prefix>] [--output <out_file>] [--object-threads <threads>] [--container-threads <threads>] [--no-download] - <container> <object> + <container> [object] ''' st_download_help = ''' @@ -247,7 +249,7 @@ Download objects from containers Positional arguments: <container> Name of container to download from. To download a whole account, omit this and specify --all. - <object> Name of object to download. Specify multiple times + [object] Name of object to download. Specify multiple times for multiple objects. Omit this to download all objects from the container. @@ -261,9 +263,11 @@ Optional arguments: <out_file>. Specifying "-" as <out_file> will redirect to stdout --object-threads <threads> - Number of threads to use for downloading objects + Number of threads to use for downloading objects. + Default is 10 --container-threads <threads> - Number of threads to use for deleting containers + Number of threads to use for downloading containers. + Default is 10 --no-download Perform download(s), but don't actually write anything to disk --header <header_name:header_value> @@ -294,7 +298,7 @@ def st_download(parser, args, thread_manager): default=10, help='Number of threads to use for downloading objects') parser.add_option( '', '--container-threads', type=int, default=10, - help='Number of threads to use for listing containers') + help='Number of threads to use for downloading containers') parser.add_option( '', '--no-download', action='store_true', default=False, @@ -478,8 +482,8 @@ def st_download(parser, args, thread_manager): for obj in args[1:]: object_queue.put((args[0], obj)) -st_list_options = '''[--long] [--lh] [--totals] - [--container-threads <threads>] +st_list_options = '''[--long] [--lh] [--totals] [--prefix <prefix>] + [--delimiter <delimiter>] ''' st_list_help = ''' Lists the containers for the account or the objects for a container @@ -490,7 +494,7 @@ Positional arguments: Optional arguments: --long Long listing format, similar to ls -l --lh Report sizes in human readable format similar to ls -lh - --totals Used with -l or --ls, only report totals + --totals Used with -l or --lh, only report totals --prefix Only list items beginning with the prefix --delimiter Roll up items with the given delimiter. For containers only. See OpenStack Swift API documentation for what @@ -507,7 +511,7 @@ def st_list(parser, args, thread_manager): "similar to ls -lh switch, but -h taken", action='store_true', default=False) parser.add_option( - '-t', '--totals', dest='totals', help='used with -l or --ls, ' + '-t', '--totals', dest='totals', help='used with -l or --lh, ' 'only report totals', action='store_true', default=False) parser.add_option( @@ -598,15 +602,15 @@ def st_list(parser, args, thread_manager): thread_manager.error('Container %r not found', args[0]) st_stat_options = '''[--lh] - <container> <object> + [container] [object] ''' st_stat_help = ''' Displays information for the account, container, or object Positional arguments: - <container> Name of container to stat from - <object> Name of object to stat. Specify multiple times + [container] Name of container to stat from + [object] Name of object to stat. Specify multiple times for multiple objects Optional arguments: @@ -655,7 +659,7 @@ def st_stat(parser, args, thread_manager): st_post_options = '''[--read-acl <acl>] [--write-acl <acl>] [--sync-to] [--sync-key <sync-key>] [--meta <name:value>] [--header <header>] - <container> <object> + [container] [object] ''' st_post_help = ''' @@ -663,7 +667,7 @@ Updates meta information for the account, container, or object. If the container is not found, it will be created automatically. Positional arguments: - <container> Name of container to post to + [container] Name of container to post to [object] Name of object to post. Specify multiple times for multiple objects @@ -1130,7 +1134,7 @@ st_capabilities_help = ''' Retrieve capability of the proxy Optional positional arguments: - <proxy_url> proxy URL of the cluster to retreive capabilities + <proxy_url> proxy URL of the cluster to retrieve capabilities ''' @@ -1312,13 +1316,13 @@ Examples: parser.add_option('--os-username', metavar='<auth-user-name>', default=environ.get('OS_USERNAME'), - help='Openstack username. Defaults to env[OS_USERNAME].') + help='OpenStack username. Defaults to env[OS_USERNAME].') parser.add_option('--os_username', help=SUPPRESS_HELP) parser.add_option('--os-password', metavar='<auth-password>', default=environ.get('OS_PASSWORD'), - help='Openstack password. Defaults to env[OS_PASSWORD].') + help='OpenStack password. Defaults to env[OS_PASSWORD].') parser.add_option('--os_password', help=SUPPRESS_HELP) parser.add_option('--os-tenant-id', @@ -1331,20 +1335,20 @@ Examples: parser.add_option('--os-tenant-name', metavar='<auth-tenant-name>', default=environ.get('OS_TENANT_NAME'), - help='Openstack tenant name. ' + help='OpenStack tenant name. ' 'Defaults to env[OS_TENANT_NAME].') parser.add_option('--os_tenant_name', help=SUPPRESS_HELP) parser.add_option('--os-auth-url', metavar='<auth-url>', default=environ.get('OS_AUTH_URL'), - help='Openstack auth URL. Defaults to env[OS_AUTH_URL].') + help='OpenStack auth URL. Defaults to env[OS_AUTH_URL].') parser.add_option('--os_auth_url', help=SUPPRESS_HELP) parser.add_option('--os-auth-token', metavar='<auth-token>', default=environ.get('OS_AUTH_TOKEN'), - help='Openstack token. Defaults to env[OS_AUTH_TOKEN]. ' + help='OpenStack token. Defaults to env[OS_AUTH_TOKEN]. ' 'Used with --os-storage-url to bypass the ' 'usual username/password authentication.') parser.add_option('--os_auth_token', @@ -1352,7 +1356,7 @@ Examples: parser.add_option('--os-storage-url', metavar='<storage-url>', default=environ.get('OS_STORAGE_URL'), - help='Openstack storage URL. ' + help='OpenStack storage URL. ' 'Defaults to env[OS_STORAGE_URL]. ' 'Overrides the storage url returned during auth. ' 'Will bypass authentication when used with ' @@ -1362,21 +1366,21 @@ Examples: parser.add_option('--os-region-name', metavar='<region-name>', default=environ.get('OS_REGION_NAME'), - help='Openstack region name. ' + help='OpenStack region name. ' 'Defaults to env[OS_REGION_NAME]') parser.add_option('--os_region_name', help=SUPPRESS_HELP) parser.add_option('--os-service-type', metavar='<service-type>', default=environ.get('OS_SERVICE_TYPE'), - help='Openstack Service type. ' + help='OpenStack Service type. ' 'Defaults to env[OS_SERVICE_TYPE]') parser.add_option('--os_service_type', help=SUPPRESS_HELP) parser.add_option('--os-endpoint-type', metavar='<endpoint-type>', default=environ.get('OS_ENDPOINT_TYPE'), - help='Openstack Endpoint type. ' + help='OpenStack Endpoint type. ' 'Defaults to env[OS_ENDPOINT_TYPE]') parser.add_option('--os-cacert', metavar='<ca-certificate>', diff --git a/swiftclient/client.py b/swiftclient/client.py index a8587cb..ee80769 100644 --- a/swiftclient/client.py +++ b/swiftclient/client.py @@ -569,8 +569,11 @@ def get_container(url, token, container, marker=None, limit=None, conn.request(method, '%s?%s' % (cont_path, qs), '', headers) resp = conn.getresponse() body = resp.read() - http_log(('%s%s?%s' % (url.replace(parsed.path, ''), cont_path, qs), - method,), {'headers': headers}, resp, body) + http_log(('%(url)s%(cont_path)s?%(qs)s' % + {'url': url.replace(parsed.path, ''), + 'cont_path': cont_path, + 'qs': qs}, method,), + {'headers': headers}, resp, body) if resp.status < 200 or resp.status >= 300: raise ClientException('Container GET failed', diff --git a/swiftclient/version.py b/swiftclient/version.py index 494d6ec..0be287d 100644 --- a/swiftclient/version.py +++ b/swiftclient/version.py @@ -1,5 +1,3 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - # Copyright 2012 OpenStack LLC # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -7,9 +7,6 @@ skipsdist = True usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} - LANG=en_US.UTF-8 - LANGUAGE=en_US:en - LC_ALL=C deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt |