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

permissive only if needed + global properties are in metaconfig

Browse Source
This commit is contained in:
Emmanuel Garette
2017-07-16 12:30:13 +02:00
parent dc9454be63
commit 7fb0ee2575
2 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tiramisu/setting.py
View File

@ -385,7 +385,11 @@ class Settings(object):
else:
is_cached = False
if not is_cached or 'cache' not in props:
props = self._p_.getproperties(path, default_properties)
meta = self._getcontext().cfgimpl_get_meta()
if meta is None:
props = self._p_.getproperties(path, default_properties)
else:
props = meta.cfgimpl_get_settings()._getproperties()
if 'cache' in props:
if 'expire' in props:
ntime = ntime + expires_time
@ -446,6 +450,8 @@ class Settings(object):
"""save properties for specified path
(never save properties if same has option properties)
"""
if self._getcontext().cfgimpl_get_meta() is not None:
raise ConfigError(_('cannot change global property with metaconfig'))
if not force:
forbidden_properties = forbidden_set_properties & properties
if forbidden_properties:
@ -503,14 +509,6 @@ class Settings(object):
properties = self._getproperties(opt_or_descr, path,
setting_properties=setting_properties,
index=index)
# remove opt permissive
# permissive affect option's permission with or without permissive
# global property
properties -= self.getpermissive(setting_properties, path)
# remove global permissive if need
if force_permissive is True or 'permissive' in setting_properties:
properties -= self.getpermissive(setting_properties)
# calc properties
properties &= setting_properties
if not is_descr:
@ -531,6 +529,17 @@ class Settings(object):
properties.remove('frozen')
if 'empty' in properties:
properties.remove('empty')
# remove permissive properties
if properties != frozenset():
# remove opt permissive
# permissive affect option's permission with or without permissive
# global property
properties -= self.getpermissive(setting_properties, path)
# remove global permissive if need
if force_permissive is True or 'permissive' in setting_properties:
properties -= self.getpermissive(setting_properties)
# at this point an option should not remain in properties
if properties != frozenset():
props = list(properties)