McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

When action is 'append', let's check value by value. 

Previously, we used `convert_value' in all cases, which seems
to try to detect lists based on the value of nargs, but that fails
with lists of one item. This "worked" for 'str' options, because
the values don't get checked, but was failing for choice types
(see Issue #772), and would fail for other types like int.
This commit is contained in:
Marcus Smith 2013-09-15 17:24:36 -07:00
parent 9075942002
commit 924d243de3
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pip/baseparser.py
View File

@ -139,6 +139,14 @@ class ConfigOptionParser(CustomOptionParser):
return [config_file]
return [default_config_file]
def check_default(self, option, key, val):
try:
return option.check_value(key, val)
except optparse.OptionValueError:
e = sys.exc_info()[1]
print("An error occurred during configuration: %s" % e)
sys.exit(3)
def update_defaults(self, defaults):
"""Updates the given defaults with values from the config files and
the environ. Does a little special handling for certain types of
@ -157,19 +165,14 @@ class ConfigOptionParser(CustomOptionParser):
# ignore empty values
if not val:
continue
# handle multiline configs
if option.action == 'append':
val = val.split()
else:
option.nargs = 1
if option.action in ('store_true', 'store_false', 'count'):
val = strtobool(val)
try:
val = option.convert_value(key, val)
except optparse.OptionValueError:
e = sys.exc_info()[1]
print("An error occurred during configuration: %s" % e)
sys.exit(3)
if option.action == 'append':
val = val.split()
val = [self.check_default(option, key, v) for v in val]
else:
val = self.check_default(option, key, val)
defaults[option.dest] = val
return defaults