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

setting_properties and self_properties are always set in _get_validated_value

Browse Source
This commit is contained in:
Emmanuel Garette 2016-10-14 22:30:53 +02:00
parent 4d02254234
commit 81f450fd7b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tiramisu/value.py
View File

@ -274,8 +274,8 @@ class Values(object):
val = self._get_validated_value(opt, path, validate, val = self._get_validated_value(opt, path, validate,
force_permissive, force_permissive,
validate_properties, validate_properties,
setting_properties=setting_properties, setting_properties,
self_properties=self_properties, self_properties,
with_meta=with_meta, with_meta=with_meta,
masterlen=masterlen, masterlen=masterlen,
index=index, index=index,
@ -297,10 +297,11 @@ class Values(object):
return val return val
def _get_validated_value(self, opt, path, validate, force_permissive, def _get_validated_value(self, opt, path, validate, force_permissive,
validate_properties, validate_properties, setting_properties,
self_properties,
index=None, submulti_index=undefined, index=None, submulti_index=undefined,
with_meta=True, setting_properties=undefined, with_meta=True,
self_properties=undefined, masterlen=undefined, masterlen=undefined,
check_frozen=False, check_frozen=False,
session=None, display_warnings=True): session=None, display_warnings=True):
"""same has getitem but don't touch the cache """same has getitem but don't touch the cache
@ -308,10 +309,6 @@ class Values(object):
""" """
context = self._getcontext() context = self._getcontext()
setting = context.cfgimpl_get_settings() setting = context.cfgimpl_get_settings()
if setting_properties is undefined:
setting_properties = setting._getproperties(read_write=False)
if self_properties is undefined:
self_properties = setting._getproperties(opt, path, read_write=False, index=index)
config_error = None config_error = None
if session is None: if session is None:
session = self._p_.getsession() session = self._p_.getsession()