DynOptionDescription accept only suffixes attributes with Calculation, no more callback/callback_params

tiramisu/config.py

@@ -114,8 +114,7 @@ class SubConfig(object):
             option = woption()
             if option.impl_is_dynoptiondescription():
                 subpath = option.impl_getpath().rsplit('.', 1)[0]
-                for suffix in option.get_suffixes(option_bag.config_bag,
-                                                  remove_none=True):
+                for suffix in option.get_suffixes(option_bag.config_bag):
                     doption = option.to_dynoption(subpath,
                                                   suffix)
                     doption_path = doption.impl_getpath()

tiramisu/option/dynoptiondescription.py

@@ -25,24 +25,24 @@ from typing import List, Callable
 from ..i18n import _
 from .optiondescription import OptionDescription
 from .baseoption import BaseOption
-from ..setting import ConfigBag, groups, undefined
+from ..setting import OptionBag, ConfigBag, groups, undefined
 from ..error import ConfigError
-from ..autolib import carry_out_calculation
+from ..autolib import carry_out_calculation, Calculation
 
 
 NAME_REGEXP = re.compile(r'^[a-zA-Z\d\-_]*$')
 
 
 class DynOptionDescription(OptionDescription):
+    __slots__ = ('_suffixes',)
 
     def __init__(self,
                  name: str,
                  doc: str,
                  children: List[BaseOption],
+                 suffixes: Calculation,
                  requires=None,
-                 properties=None,
-                 callback: Callable=None,
-                 callback_params=None) -> None:
+                 properties=None) -> None:
 
         super().__init__(name,
                          doc,
@@ -61,46 +61,40 @@ class DynOptionDescription(OptionDescription):
                 raise ConfigError(_('cannot set symlinkoption in a '
                                     'dynoptiondescription'))
             child._setsubdyn(self)
-        # add callback
-        self._impl_set_callback(callback,
-                                callback_params)
-
-    def _validate_calculator(self,
-                             callback: Callable,
-                             callback_params) -> None:
-        if callback is None:
-            raise ConfigError(_('callback is mandatory for the dynoptiondescription "{}"'
-                                '').format(self.impl_get_display_name()))
+        # add suffixes
+        if __debug__ and isinstance(suffixes, Calculation):
+            self._suffixes = suffixes
 
     def get_suffixes(self,
-                     config_bag: ConfigBag,
-                     remove_none: bool=False) -> List[str]:
-        callback, callback_params = self.impl_get_callback()
-        values = carry_out_calculation(self,
-                                       callback,
-                                       callback_params,
-                                       None,
-                                       config_bag,
-                                       fromconsistency=[])
-        if not isinstance(values, list):
-            raise ValueError(_('DynOptionDescription callback for option "{}", is not a list ({})'
-                               '').format(self.impl_get_display_name(), values))
-        values_ = []
-        for val in values:
-            if not isinstance(val, str) or re.match(NAME_REGEXP, val) is None:
-                if not remove_none or val is not None:
-                    raise ValueError(_('invalid suffix "{}" for option "{}"'
-                                       '').format(val,
-                                                  self.impl_get_display_name()))
-            else:
-                values_.append(val)
-        if len(values_) > len(set(values_)):
-            extra_values = values_.copy()
-            for val in set(values_):
-                extra_values.remove(val)
-            raise ValueError(_('DynOptionDescription callback return a list with multiple value '
-                               '"{}"''').format(extra_values))
-        return values_
+                     config_bag: ConfigBag) -> List[str]:
+
+        option_bag = OptionBag()
+        option_bag.set_option(self,
+                              self.impl_getpath(),
+                              None,
+                              config_bag)
+        values = self._suffixes.execute(option_bag)
+        if __debug__:
+            if not isinstance(values, list):
+                raise ValueError(_('DynOptionDescription suffixes for option "{}", is not a list ({})'
+                                   '').format(self.impl_get_display_name(), values))
+            values_ = []
+            for val in values:
+                if not isinstance(val, str) or re.match(NAME_REGEXP, val) is None:
+                    if val is not None:
+                        raise ValueError(_('invalid suffix "{}" for option "{}"'
+                                           '').format(val,
+                                                      self.impl_get_display_name()))
+                else:
+                    values_.append(val)
+            if len(values_) > len(set(values_)):
+                extra_values = values_.copy()
+                for val in set(values_):
+                    extra_values.remove(val)
+                raise ValueError(_('DynOptionDescription suffixes return a list with multiple value '
+                                   '"{}"''').format(extra_values))
+            values = values_
+        return values
 
     def impl_is_dynoptiondescription(self) -> bool:
         return True

tiramisu/option/syndynoptiondescription.py

@@ -69,8 +69,8 @@ class SynDynOptionDescription:
                 return child.to_dynoption(subpath,
                                           self._suffix)
         raise AttributeError(_('unknown option "{0}" '
-                               'in syndynoptiondescription "{1}"'
-                               '').format(name, self.impl_getname()))
+                               'in dynamic optiondescription "{1}"'
+                               '').format(name, self.impl_get_display_name()))
 
     def impl_getname(self) -> str:
         return self._opt.impl_getname() + self._suffix