fill for multi types with None value

This commit is contained in:
gwen 2012-07-05 09:17:15 +02:00
parent 52bc3f6507
commit 098df1ba76
1 changed files with 15 additions and 11 deletions

View File

@ -198,11 +198,12 @@ class Config(object):
# special owners # special owners
if owner in special_owners: if owner in special_owners:
value = self._cfgimpl_values[name] value = self._cfgimpl_values[name]
if value != None:
if opt_or_descr.is_multi(): if opt_or_descr.is_multi():
if owner == 'fill' and None not in value: if owner == 'fill' and None not in value:
return value return value
else: else:
if owner == 'fill' and value != None: if owner == 'fill':
return value return value
result = special_owner_factory(name, owner, result = special_owner_factory(name, owner,
value=value, value=value,
@ -220,6 +221,9 @@ class Config(object):
' for option {0}'.format(name)) ' for option {0}'.format(name))
if opt_or_descr.is_multi(): if opt_or_descr.is_multi():
if value == None:
_result = [result]
else:
_result = [] _result = []
for val in value: for val in value:
if val == None: if val == None: