aboutsummaryrefslogtreecommitdiff
path: root/gkeys
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-12-26 01:29:17 -0800
committerBrian Dolbec <dolsen@gentoo.org>2014-12-26 01:29:17 -0800
commit9f1d92c2e9c48af8a39dfcf1bdc044595ee3180c (patch)
tree10f4d1b62aa1876ca44bf74cbbc72dd26c5fb291 /gkeys
parentgkeygen/actions.py: tweak py3 version check (more readable) (diff)
downloadgentoo-keys-9f1d92c2e9c48af8a39dfcf1bdc044595ee3180c.tar.gz
gentoo-keys-9f1d92c2e9c48af8a39dfcf1bdc044595ee3180c.tar.bz2
gentoo-keys-9f1d92c2e9c48af8a39dfcf1bdc044595ee3180c.zip
gkeys/base.py: Improve help layout, unify no action help with py2.7
Diffstat (limited to 'gkeys')
-rw-r--r--gkeys/gkeys/base.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 2b32908..b09082f 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -164,7 +164,10 @@ class CliBase(object):
help='The logging level to set for the logfile')
- subparsers = parser.add_subparsers(help='actions')
+ subparsers = parser.add_subparsers(
+ title='Subcommands',
+ description='Valid subcommands',
+ help='Additional help')
for name in self.cli_config['Available_Actions']:
action_method = getattr(self.cli_config['Actions'], name)
actiondoc = action_method.__doc__
@@ -183,7 +186,7 @@ class CliBase(object):
parsed_args = parser.parse_args(args)
action = getattr(parsed_args, 'action', None)
if not action:
- parser.print_help()
+ parser.print_usage()
sys.exit(1)
return parsed_args