mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fixed so options from config files and command lines actually work:

Browse source 
* 'get_command_obj()' now sets command attributes based on
    the 'command_options' dictionary
  * some typos fixed
  * kludged 'parse_config_files()' to re-initialize the ConfigParser
    instance after each file, so we know for sure which config
    file each option comes form
  * added lots of handy debugging output
This commit is contained in:
Greg Ward 2000-05-23 03:47:35 +00:00
parent 7cb42cd070
commit 474607777d
1 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Lib/distutils/dist.py
View file

@ -258,8 +258,11 @@ class Distribution:
if filenames is None: if filenames is None:
filenames = self.find_config_files() filenames = self.find_config_files()
print "Distribution.parse_config_files():"
parser = ConfigParser() parser = ConfigParser()
for filename in filenames: for filename in filenames:
print " reading", filename
parser.read(filename) parser.read(filename)
for section in parser.sections(): for section in parser.sections():
options = parser.options(section) options = parser.options(section)
@ -271,9 +274,11 @@ class Distribution:
if opt != '__name__': if opt != '__name__':
opts[opt] = (filename, parser.get(section,opt)) opts[opt] = (filename, parser.get(section,opt))
from pprint import pprint # Make the ConfigParser forget everything (so we retain
print "options (after parsing config files):" # the original filenames that options come from) -- gag,
pprint (self.command_options) # retch, puke -- another good reason for a distutils-
# specific config parser (sigh...)
parser.__init__()
# -- Command-line parsing methods ---------------------------------- # -- Command-line parsing methods ----------------------------------
@ -397,7 +402,7 @@ class Distribution:
cmd_class.user_options) cmd_class.user_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 opts.help: if hasattr(opts, 'help') and opts.help:
print "showing help for command", cmd_class print "showing help for command", cmd_class
self._show_help(parser, display_options=0, commands=[cmd_class]) self._show_help(parser, display_options=0, commands=[cmd_class])
return return
@ -408,7 +413,7 @@ class Distribution:
self.command_options[command] = {} self.command_options[command] = {}
cmd_opts = self.command_options[command] cmd_opts = self.command_options[command]
for (name, value) in vars(opts).items(): for (name, value) in vars(opts).items():
cmd_opts[command] = ("command line", value) cmd_opts[name] = ("command line", value)
return args return args
@ -605,9 +610,24 @@ class Distribution:
""" """
cmd_obj = self.command_obj.get(command) cmd_obj = self.command_obj.get(command)
if not cmd_obj and create: if not cmd_obj and create:
print "Distribution.get_command_obj(): " \
"creating '%s' command object" % command
klass = self.get_command_class(command) klass = self.get_command_class(command)
cmd_obj = self.command_obj[command] = klass() cmd_obj = self.command_obj[command] = klass(self)
self.command_run[command] = 0 self.have_run[command] = 0
# Set any options that were supplied in config files
# or on the command line. (NB. support for error
# reporting is lame here: any errors aren't reported
# until 'finalize_options()' is called, which means
# we won't report the source of the error.)
options = self.command_options.get(command)
if options:
print " setting options:"
for (option, (source, value)) in options.items():
print " %s = %s (from %s)" % (option, value, source)
setattr(cmd_obj, option, value)
return cmd_obj return cmd_obj