summaryrefslogtreecommitdiff
path: root/cliapp/app.py
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2013-01-19 20:17:35 +0000
committerLars Wirzenius <liw@liw.fi>2013-01-19 20:17:35 +0000
commitb9744094f060bcea9cb5d42df1c7a9cec2c08364 (patch)
tree80413b8e521a0e6a917663420a9fbc9a3fe1bba0 /cliapp/app.py
parent3cb6058de605170e6165dfbb5bc9dd2f24ee6cfe (diff)
downloadcliapp-b9744094f060bcea9cb5d42df1c7a9cec2c08364.tar.gz
Use new formatter for --help output to list subcommand summaries
Diffstat (limited to 'cliapp/app.py')
-rw-r--r--cliapp/app.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/cliapp/app.py b/cliapp/app.py
index bc43f21..832e8ad 100644
--- a/cliapp/app.py
+++ b/cliapp/app.py
@@ -296,10 +296,9 @@ class Application(object):
if self.subcommands:
summaries = []
for cmd in sorted(self.subcommands.keys()):
- summaries.append(
- ' %s\n' % self._format_subcommand_summary(cmd))
+ summaries.append(self._format_subcommand_summary(cmd))
cmd_desc = ''.join(summaries)
- return '%s\n\n%s' % (self._description or '', cmd_desc)
+ return '%s\n%s' % (self._description or '', cmd_desc)
else:
return self._description
@@ -311,7 +310,7 @@ class Application(object):
summary = lines[0].strip()
else:
summary = ''
- return '* %s: %s' % (cmd, summary)
+ return '* %%prog %s: %s\n' % (cmd, summary)
def _format_subcommand_description(self, cmd): # pragma: no cover