diff options
| author | Shashirekha Gundur <shashirekha.j.gundur@intel.com> | 2016-10-23 19:59:11 +0000 |
|---|---|---|
| committer | Shashirekha Gundur <shashirekha.j.gundur@intel.com> | 2016-12-13 13:41:08 +0000 |
| commit | 41666d60c88e4b70bceb7898459a93e6cf389382 (patch) | |
| tree | 179d605e0cf8c546121d588277a01cc0fb32c679 /swiftclient/shell.py | |
| parent | a0d1fe04bc9f9566986b0496a78562b5ec4702e1 (diff) | |
| download | python-swiftclient-41666d60c88e4b70bceb7898459a93e6cf389382.tar.gz | |
modify 'swift <sub_command> —help' display
In python swiftclient: swift <sub_command> —help will now
display st_<sub_command>_options + st_<sub_command>_help texts
e.g. http://paste.openstack.org/show/589752/
Change-Id: I34e4b2ac29ef395f8ca474ce7a82f59a1fd8c7f4
Closes-Bug: #1621415
Diffstat (limited to 'swiftclient/shell.py')
| -rwxr-xr-x | swiftclient/shell.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/swiftclient/shell.py b/swiftclient/shell.py index 3f8aad6..259379e 100755 --- a/swiftclient/shell.py +++ b/swiftclient/shell.py @@ -861,7 +861,8 @@ st_upload_options = '''[--changed] [--skip-identical] [--segment-size <size>] <container> <file_or_directory> [<file_or_directory>] [...] ''' -st_upload_help = ''' Uploads specified files and directories to the given container. +st_upload_help = ''' +Uploads specified files and directories to the given container. Positional arguments: <container> Name of container to upload to. @@ -1098,7 +1099,8 @@ def st_upload(parser, args, output_manager): output_manager.error(e.value) -st_capabilities_options = "[--json] [<proxy_url>]" +st_capabilities_options = '''[--json] [<proxy_url>] +''' st_info_options = st_capabilities_options st_capabilities_help = ''' Retrieve capability of the proxy. @@ -1198,7 +1200,8 @@ def st_auth(parser, args, thread_manager): st_tempurl_options = '''[--absolute] - <method> <seconds> <path> <key>''' + <method> <seconds> <path> <key> +''' st_tempurl_help = ''' @@ -1306,9 +1309,12 @@ def parse_args(parser, args, enforce_requires=True): logging.basicConfig(level=logging.INFO) if args and options.get('help'): - _help = globals().get('st_%s_help' % args[0], - "no help for %s" % args[0]) - print(_help) + _help = globals().get('st_%s_help' % args[0]) + _options = globals().get('st_%s_options' % args[0], "\n") + if _help: + print("Usage: %s %s %s\n%s" % (BASENAME, args[0], _options, _help)) + else: + print("no such command: %s" % args[0]) exit() # Short circuit for tempurl, which doesn't need auth |