properties option in consistencies are now allowed

Conflicts:
	tiramisu/option.py (PortOption._validate): Strange try/except
	removed.
This commit is contained in:
Emmanuel Garette 2014-02-06 19:19:48 +01:00 committed by Daniel Dehennin
parent f8ac263c86
commit fc7f3c24a5
2 changed files with 13 additions and 1 deletions

View File

@ -283,3 +283,14 @@ def test_consistency_not_all():
c.a = ['192.168.1.0']
c.b = ['255.255.255.0']
c.c = ['192.168.1.255']
def test_consistency_permissive():
a = IntOption('a', '', 1)
b = IntOption('b', '', 2, properties=('hidden',))
od = OptionDescription('od', '', [a, b])
a.impl_add_consistency('not_equal', b)
c = Config(od)
c.cfgimpl_get_settings().setpermissive(('hidden',))
c.read_write()
c.a = 1

View File

@ -367,7 +367,8 @@ class Option(BaseOption):
#if context, calculate value, otherwise get default value
if context is not None:
opt_value = context._getattr(
descr.impl_get_path_by_opt(opt), validate=False)
descr.impl_get_path_by_opt(opt), validate=False,
force_permissive=True)
else:
opt_value = opt.impl_getdefault()