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

separate baseoption and option

Browse Source
This commit is contained in:
Emmanuel Garette
2017-07-24 20:39:01 +02:00
parent 3c9a759e2e
commit 635b71d291
20 changed files with 682 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tiramisu/option/optiondescription.py
View File

@ -24,13 +24,14 @@ import re
from ..i18n import _
from ..setting import groups, undefined, owners # , log
from .baseoption import BaseOption, SymLinkOption, Option, ALLOWED_CONST_LIST
from .baseoption import BaseOption
from .option import Option, ALLOWED_CONST_LIST
from . import MasterSlaves
from ..error import ConfigError, ConflictError
from ..autolib import carry_out_calculation
name_regexp = re.compile(r'^[a-zA-Z\d\-_]*$')
NAME_REGEXP = re.compile(r'^[a-zA-Z\d\-_]*$')
import sys
if sys.version_info[0] >= 3: # pragma: no cover
@ -76,7 +77,7 @@ class CacheOptionDescription(BaseOption):
option._dependencies = tuple(options)
option._set_readonly(True)
is_multi = option.impl_is_multi()
if not isinstance(option, SymLinkOption) and 'force_store_value' in option.impl_getproperties():
if not option._is_symlinkoption() and 'force_store_value' in option.impl_getproperties():
force_store_values.append((subpath, option))
for func, all_cons_opts, params in option._get_consistencies():
option._valid_consistencies(all_cons_opts[1:], init=False)
@ -458,7 +459,7 @@ class OptionDescription(OptionDescriptionWalk):
if isinstance(group_type, groups.MasterGroupType):
children = self.impl_getchildren()
for child in children:
if isinstance(child, SymLinkOption): # pragma: optional cover
if child._is_symlinkoption(): # pragma: optional cover
raise ValueError(_("master group {0} shall not have "
"a symlinkoption").format(self.impl_getname()))
if not isinstance(child, Option): # pragma: optional cover
@ -490,7 +491,7 @@ class OptionDescription(OptionDescriptionWalk):
if len(values) > len(set(values)):
raise ConfigError(_('DynOptionDescription callback return not unique value'))
for val in values:
if not isinstance(val, str) or re.match(name_regexp, val) is None:
if not isinstance(val, str) or re.match(NAME_REGEXP, val) is None:
raise ValueError(_("invalid suffix: {0} for option").format(val))
return values
@ -507,7 +508,7 @@ class DynOptionDescription(OptionDescription):
'dynoptiondescription'))
for chld in child._impl_getchildren():
chld._impl_setsubdyn(self)
if isinstance(child, SymLinkOption):
if child._is_symlinkoption():
raise ConfigError(_('cannot set symlinkoption in a '
'dynoptiondescription'))
child._impl_setsubdyn(self)