mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More stylistic tweaks to the generic '--help-xxx' code.

This commit is contained in:
Greg Ward 2000-06-24 01:22:41 +00:00
parent 2ff7887270
commit 55fced3df9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Lib/distutils/dist.py
View File

@ -443,13 +443,14 @@ def _parse_command_opts (self, parser, args):
type (cmd_class.help_options) is ListType):
help_options = fix_help_options(cmd_class.help_options)
else:
help_optiosn = []
help_options = []
# All commands support the global options too, just by adding
# in '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)
(args, opts) = parser.getopt (args[1:])
if hasattr(opts, 'help') and opts.help:
@ -459,18 +460,20 @@ def _parse_command_opts (self, parser, args):
if (hasattr(cmd_class, 'help_options') and
type (cmd_class.help_options) is ListType):
help_option_found=0
for help_option in cmd_class.help_options:
if hasattr(opts, parser.get_attr_name(help_option[0])):
for (help_option, short, desc, func) in cmd_class.help_options:
if hasattr(opts, parser.get_attr_name(help_option)):
help_option_found=1
#print "showing help for option %s of command %s" % \
# (help_option[0],cmd_class)
if callable(help_option[3]):
help_option[3]()
if callable(func):
func()
else:
raise DistutilsClassError, \
("command class %s must provide " +
"a callable object for help_option '%s'") % \
(cmd_class,help_option[0])
("invalid help function %s for help option '%s': "
"must be a callable object (function, etc.)") % \
(`func`, help_option)
if help_option_found:
return