Infra
/
tiramisu
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

config not metaconfig

This commit is contained in:
Emmanuel Garette 2018-08-03 22:56:04 +02:00
parent fdbb0d83ff
commit 8e3b9f2d85
3 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/auto/test_auto.py
View File

@ -10,7 +10,6 @@ from tiramisu import Config, MetaConfig, \
StrOption, SymLinkOption, OptionDescription, MasterSlaves, DynOptionDescription, \
getapi, submulti, undefined, owners, Params, ParamOption
from tiramisu.error import PropertiesOptionError, APIError, ConfigError, SlaveError
from tiramisu.api import display_count
from collections import OrderedDict
ICON = u'\u2937'
@ -1772,4 +1771,3 @@ def test_options(paths):
weakrefs, **get_kwargs(lpath))
del cfg
check_deref(weakrefs)
display_count()

4
tiramisu/api.py
View File

@ -115,6 +115,8 @@ class CommonTiramisu(TiramisuHelp):
self.option_bag.path,
self.option_bag.index,
self.option_bag.config_bag)
if self.option_bag.config_bag.setting_properties:
self.option_bag.config_bag.context.cfgimpl_get_settings().validate_properties(self.option_bag)
index = self.option_bag.index
if index is not None:
if option.impl_is_optiondescription() or not option.impl_is_master_slaves('slave'):
@ -504,7 +506,7 @@ class TiramisuOption(CommonTiramisu):
return self.registers[subfunc](self._name,
self.subconfig,
self.option_bag)
elif self._get_option().impl_is_optiondescription():
elif self._get_option().impl_is_optiondescription() and not subfunc.startswith('_'):
return getattr(self, '_' + subfunc)
raise APIError(_('please specify a valid sub function ({})').format(subfunc))

27
tiramisu/config.py
View File

@ -249,16 +249,9 @@ class SubConfig(object):
option_bag,
_commit=True):
#self, name = self.cfgimpl_get_home_by_path(option_bag.path,
# option_bag.config_bag)
#if config_bag.option is None:
# config_bag.option = self.cfgimpl_get_description().impl_getchild(name,
# config_bag,
# self)
if option_bag.option.impl_is_symlinkoption():
raise ConfigError(_("can't assign to a SymLinkOption"))
else:
context = self.cfgimpl_get_context()
context = option_bag.config_bag.context
if option_bag.config_bag.setting_properties:
context.cfgimpl_get_settings().validate_properties(option_bag)
self.cfgimpl_get_description().impl_validate_value(option_bag.option,
@ -812,25 +805,27 @@ class GroupConfig(_CommonConfig):
"""
ret = []
for child in self._impl_children:
cconfig_bag = config_bag.copy()
cconfig_bag.context = child
try:
if isinstance(child, GroupConfig):
ret.extend(child.set_value(path,
index,
value,
config_bag,
cconfig_bag,
only_config=only_config,
_commit=False))
else:
subconfig, name = child.cfgimpl_get_home_by_path(path,
config_bag)
cconfig_bag)
option = subconfig.cfgimpl_get_description().impl_getchild(name,
config_bag,
cconfig_bag,
child)
option_bag = OptionBag()
option_bag.set_option(option,
path,
index,
config_bag)
cconfig_bag)
child.setattr(value,
option_bag,
_commit=False)
@ -978,16 +973,18 @@ class MetaConfig(GroupConfig):
' cannot be set together'))
opt = self.cfgimpl_get_description().impl_get_opt_by_path(path)
for child in self._impl_children:
cconfig_bag = config_bag.copy()
cconfig_bag.context = child
subconfig, name = child.cfgimpl_get_home_by_path(path,
config_bag)
cconfig_bag)
option = subconfig.cfgimpl_get_description().impl_getchild(name,
config_bag,
cconfig_bag,
child)
option_bag = OptionBag()
option_bag.set_option(option,
path,
index,
config_bag)
cconfig_bag)
if force_default_if_same:
if not child.cfgimpl_get_values()._p_.hasvalue(path):
child_value = undefined