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

do not raise un __new__

Browse Source
This commit is contained in:
Emmanuel Garette
2018-10-30 11:57:04 +01:00
parent 1cda79154e
commit 69919535f6
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tiramisu/api.py
View File

@ -524,14 +524,9 @@ class TiramisuOptionValue(CommonTiramisuOption):
subconfig,
option_bag):
if subconfig is not None:
cls._name = name
cls._subconfig = subconfig
cls._option_bag = option_bag
cls._get_option(cls)
option = option_bag.option
del cls._name
del cls._subconfig
del cls._option_bag
option = subconfig.cfgimpl_get_description().impl_getchild(name,
option_bag.config_bag,
subconfig.cfgimpl_get_path())
else:
option = None
types = [CommonTiramisuOption]

12
tiramisu/setting.py
View File

@ -326,7 +326,7 @@ class Undefined(object):
undefined = Undefined()
#____________________________________________________________
# ____________________________________________________________
class Settings(object):
"``config.Config()``'s configuration options settings"
__slots__ = ('_p_',
@ -349,7 +349,7 @@ class Settings(object):
self._p_ = properties
self._pp_ = permissives
#____________________________________________________________
# ____________________________________________________________
# get properties and permissive methods
def get_context_properties(self):
@ -693,7 +693,9 @@ class Settings(object):
option_properties,
config_properties,
config_permissives):
properties = option_properties & config_properties - {'frozen', 'mandatory', 'empty'}
properties = option_properties & config_properties - {'frozen',
'mandatory',
'empty'}
# remove global permissive properties
if properties and ('permissive' in config_properties):
properties -= config_permissives
@ -713,8 +715,8 @@ class Settings(object):
if not config_bag.properties:
return
properties = self.calc_raises_properties(option_bag.properties,
option_bag.config_bag.properties,
option_bag.config_bag.permissives)
config_bag.properties,
config_bag.permissives)
if properties != frozenset():
raise PropertiesOptionError(option_bag,
properties,