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

fill and auto fixes

This commit is contained in:
gwen 2012-07-04 14:46:14 +02:00
parent 3de8a7ed33
commit df7a7f2c29
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
autolib.py
View File

@ -19,6 +19,7 @@
# the whole pypy projet is under MIT licence # the whole pypy projet is under MIT licence
# ____________________________________________________________ # ____________________________________________________________
"enables us to carry out a calculation and return an option's value" "enables us to carry out a calculation and return an option's value"
from tiramisu.error import DisabledOptionError, SpecialOwnersError
# ____________________________________________________________ # ____________________________________________________________
# automatic Option object # automatic Option object
special_owners = ['auto', 'fill'] special_owners = ['auto', 'fill']
@ -31,7 +32,7 @@ def special_owner_factory(name, owner, value,
# we have to carry out a calculation # we have to carry out a calculation
return calc_factory(name, callback, callback_params, config) return calc_factory(name, callback, callback_params, config)
g = globals() #g = globals()
def calc_factory(name, callback, callback_params, config): def calc_factory(name, callback, callback_params, config):
# FIXME we have to know the exact status of the config # FIXME we have to know the exact status of the config
@ -39,6 +40,7 @@ def calc_factory(name, callback, callback_params, config):
# config.freeze() # config.freeze()
if callback_params is None: if callback_params is None:
callback_params = {} callback_params = {}
tcparams = {}
for key, value in callback_params.items(): for key, value in callback_params.items():
if type(value) == tuple: if type(value) == tuple:
path, check_disabled = value path, check_disabled = value
@ -46,20 +48,18 @@ def calc_factory(name, callback, callback_params, config):
opt_value = getattr(config, path) opt_value = getattr(config, path)
except DisabledOptionError, e: except DisabledOptionError, e:
if chek_disabled: if chek_disabled:
del(callback_params[key])
continue continue
raise DisabledOptionError(e) raise DisabledOptionError(e)
callback_params[key] = opt_value tcparams[key] = opt_value
else:
tcparams[key] = value
try: try:
#return getattr(autolib, callback)(name, config) #return getattr(autolib, callback)(name, config)
return g[callback](name, config, **callback_params) #return g[callback](name, config, **callback_params)
from creole import eosfunc
return getattr(eosfunc, callback)(**tcparams)
except AttributeError: except AttributeError:
import traceback
traceback.print_exc()
raise SpecialOwnersError("callback: {0} not found for " raise SpecialOwnersError("callback: {0} not found for "
"option: {1}".format(callback, name)) "option: {1}".format(callback, name))
# ____________________________________________________________
# FIXME: import eosfunc here
def identical(name, config, *args):
return "identical" + name

10
config.py
View File

@ -67,7 +67,13 @@ class Config(object):
for child in self._cfgimpl_descr._children: for child in self._cfgimpl_descr._children:
if isinstance(child, Option): if isinstance(child, Option):
self._cfgimpl_values[child._name] = child.getdefault() self._cfgimpl_values[child._name] = child.getdefault()
self._cfgimpl_value_owners[child._name] = 'default' if child.getcallback() is not None:
if child._is_hidden():
self._cfgimpl_value_owners[child._name] = 'auto'
else:
self._cfgimpl_value_owners[child._name] = 'fill'
else:
self._cfgimpl_value_owners[child._name] = 'default'
elif isinstance(child, OptionDescription): elif isinstance(child, OptionDescription):
self._validate_duplicates(child._children) self._validate_duplicates(child._children)
self._cfgimpl_values[child._name] = Config(child, parent=self) self._cfgimpl_values[child._name] = Config(child, parent=self)
@ -195,7 +201,7 @@ class Config(object):
value=self._cfgimpl_values[name], value=self._cfgimpl_values[name],
callback=opt_or_descr.getcallback(), callback=opt_or_descr.getcallback(),
callback_params=opt_or_descr.getcallback_params(), callback_params=opt_or_descr.getcallback_params(),
config=self) config=self._cfgimpl_get_toplevel())
# mandatory options # mandatory options
if not isinstance(opt_or_descr, OptionDescription): if not isinstance(opt_or_descr, OptionDescription):
homeconfig = self._cfgimpl_get_toplevel() homeconfig = self._cfgimpl_get_toplevel()