mirror of https://github.com/python/cpython.git
More stylistic tweaks to the generic '--help-xxx' code.
This commit is contained in:
parent
2ff7887270
commit
55fced3df9
|
@ -443,13 +443,14 @@ def _parse_command_opts (self, parser, args):
|
||||||
type (cmd_class.help_options) is ListType):
|
type (cmd_class.help_options) is ListType):
|
||||||
help_options = fix_help_options(cmd_class.help_options)
|
help_options = fix_help_options(cmd_class.help_options)
|
||||||
else:
|
else:
|
||||||
help_optiosn = []
|
help_options = []
|
||||||
|
|
||||||
|
|
||||||
# All commands support the global options too, just by adding
|
# All commands support the global options too, just by adding
|
||||||
# in 'global_options'.
|
# in 'global_options'.
|
||||||
parser.set_option_table (self.global_options +
|
parser.set_option_table (self.global_options +
|
||||||
cmd_class.user_options + help_options)
|
cmd_class.user_options +
|
||||||
|
help_options)
|
||||||
parser.set_negative_aliases (negative_opt)
|
parser.set_negative_aliases (negative_opt)
|
||||||
(args, opts) = parser.getopt (args[1:])
|
(args, opts) = parser.getopt (args[1:])
|
||||||
if hasattr(opts, 'help') and opts.help:
|
if hasattr(opts, 'help') and opts.help:
|
||||||
|
@ -459,19 +460,21 @@ def _parse_command_opts (self, parser, args):
|
||||||
if (hasattr(cmd_class, 'help_options') and
|
if (hasattr(cmd_class, 'help_options') and
|
||||||
type (cmd_class.help_options) is ListType):
|
type (cmd_class.help_options) is ListType):
|
||||||
help_option_found=0
|
help_option_found=0
|
||||||
for help_option in cmd_class.help_options:
|
for (help_option, short, desc, func) in cmd_class.help_options:
|
||||||
if hasattr(opts, parser.get_attr_name(help_option[0])):
|
if hasattr(opts, parser.get_attr_name(help_option)):
|
||||||
help_option_found=1
|
help_option_found=1
|
||||||
#print "showing help for option %s of command %s" % \
|
#print "showing help for option %s of command %s" % \
|
||||||
# (help_option[0],cmd_class)
|
# (help_option[0],cmd_class)
|
||||||
if callable(help_option[3]):
|
|
||||||
help_option[3]()
|
if callable(func):
|
||||||
else:
|
func()
|
||||||
raise DistutilsClassError, \
|
else:
|
||||||
("command class %s must provide " +
|
raise DistutilsClassError, \
|
||||||
"a callable object for help_option '%s'") % \
|
("invalid help function %s for help option '%s': "
|
||||||
(cmd_class,help_option[0])
|
"must be a callable object (function, etc.)") % \
|
||||||
if help_option_found:
|
(`func`, help_option)
|
||||||
|
|
||||||
|
if help_option_found:
|
||||||
return
|
return
|
||||||
|
|
||||||
# Put the options from the command-line into their official
|
# Put the options from the command-line into their official
|
||||||
|
|
Loading…
Reference in New Issue