From 4770eb0d0e1e34d9cf2bd27718fd191fc7bf6bfe Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 20 Jan 2024 23:00:59 +0100 Subject: [PATCH] feat: we should be able to customize a new variable type --- docs/library.rst | 51 ++++++++ src/rougail/__init__.py | 9 +- src/rougail/annotator/__init__.py | 17 +-- src/rougail/annotator/variable.py | 52 -------- src/rougail/config.py | 1 + src/rougail/convert.py | 108 ++++++++-------- src/rougail/object_model.py | 119 +++++++++++------- src/rougail/tiramisureflector.py | 12 +- src/rougail/update.py | 2 +- tests/dictionaries/01base_custom/__init__.py | 0 .../dictionaries/rougail/00-base.yml | 4 + .../01base_custom/makedict/after.json | 6 + .../01base_custom/makedict/base.json | 3 + .../01base_custom/makedict/before.json | 6 + .../01base_custom/tiramisu/base.py | 24 ++++ .../01base_custom/tiramisu/multi.py | 28 +++++ .../10autosave_hidden/tiramisu/base.py | 2 +- .../10autosave_hidden/tiramisu/multi.py | 2 +- .../10check_no_param/tiramisu/base.py | 2 +- .../10check_no_param/tiramisu/multi.py | 2 +- .../10check_optional/tiramisu/base.py | 2 +- .../10check_optional/tiramisu/multi.py | 2 +- .../10check_valid_differ/tiramisu/base.py | 2 +- .../10check_valid_differ/tiramisu/multi.py | 2 +- .../10check_valid_differ_add/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10check_valid_in_network/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10check_valid_ipnetmask/tiramisu/base.py | 2 +- .../10check_valid_ipnetmask/tiramisu/multi.py | 2 +- .../10check_valid_jinja/tiramisu/base.py | 2 +- .../10check_valid_jinja/tiramisu/multi.py | 2 +- .../10disabled_with_variable/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- tests/dictionaries/10fill/tiramisu/base.py | 2 +- tests/dictionaries/10fill/tiramisu/multi.py | 2 +- .../10fill_optional/tiramisu/base.py | 2 +- .../10fill_optional/tiramisu/multi.py | 2 +- .../10fill_quote/tiramisu/base.py | 2 +- .../10fill_quote/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10leadership_append/tiramisu/base.py | 2 +- .../10leadership_append/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10leadership_append_name/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10leadership_auto/tiramisu/base.py | 2 +- .../10leadership_auto/tiramisu/multi.py | 2 +- .../10leadership_auto_index/tiramisu/base.py | 2 +- .../10leadership_auto_index/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10leadership_autoleader/tiramisu/base.py | 2 +- .../10leadership_autoleader/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10leadership_hidden/tiramisu/base.py | 2 +- .../10leadership_hidden/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10leadership_multi/tiramisu/base.py | 2 +- .../10leadership_multi/tiramisu/multi.py | 2 +- .../10load_disabled_if_in/tiramisu/base.py | 2 +- .../10load_disabled_if_in/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_frozenifin/tiramisu/base.py | 2 +- .../10load_frozenifin/tiramisu/multi.py | 2 +- .../10load_frozenifin_auto/tiramisu/base.py | 2 +- .../10load_frozenifin_auto/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_frozenifnotin/tiramisu/base.py | 2 +- .../10load_frozenifnotin/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_hidden_if_family/tiramisu/base.py | 2 +- .../10load_hidden_if_family/tiramisu/multi.py | 2 +- .../10load_hidden_if_family2/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_hidden_if_family3/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_leadership/tiramisu/base.py | 2 +- .../10load_leadership/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_leadership_name/tiramisu/base.py | 2 +- .../10load_leadership_name/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../10load_mandatoryifin/tiramisu/base.py | 2 +- .../10load_mandatoryifin/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../11fill_multi_calc_val/tiramisu/base.py | 2 +- .../11fill_multi_calc_val/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../11valid_enum_function/tiramisu/base.py | 2 +- .../11valid_enum_function/tiramisu/multi.py | 2 +- .../11valid_enum_variable/tiramisu/base.py | 2 +- .../11valid_enum_variable/tiramisu/multi.py | 2 +- .../dictionaries/12auto_base/tiramisu/base.py | 2 +- .../12auto_base/tiramisu/multi.py | 2 +- .../12auto_func_variable/tiramisu/base.py | 2 +- .../12auto_func_variable/tiramisu/multi.py | 2 +- .../12auto_jinja_base/tiramisu/base.py | 2 +- .../12auto_jinja_base/tiramisu/multi.py | 2 +- .../12auto_jinja_if/tiramisu/base.py | 2 +- .../12auto_jinja_if/tiramisu/multi.py | 2 +- .../12auto_jinja_if_bool/tiramisu/base.py | 2 +- .../12auto_jinja_if_bool/tiramisu/multi.py | 2 +- .../12auto_jinja_if_int/tiramisu/base.py | 2 +- .../12auto_jinja_if_int/tiramisu/multi.py | 2 +- .../12auto_jinja_set/tiramisu/base.py | 2 +- .../12auto_jinja_set/tiramisu/multi.py | 2 +- .../12auto_withoutparam/tiramisu/base.py | 2 +- .../12auto_withoutparam/tiramisu/multi.py | 2 +- .../13fill_information/tiramisu/base.py | 2 +- .../13fill_information/tiramisu/multi.py | 2 +- .../13fill_information_multi/tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../13fill_option/tiramisu/base.py | 2 +- .../13fill_option/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../15fill_autosave/tiramisu/base.py | 2 +- .../15fill_autosave/tiramisu/multi.py | 2 +- .../dictionaries/15fill_base/tiramisu/base.py | 2 +- .../15fill_base/tiramisu/multi.py | 2 +- .../15fill_mandatory/tiramisu/base.py | 2 +- .../15fill_mandatory/tiramisu/multi.py | 2 +- .../15fill_number/tiramisu/base.py | 2 +- .../15fill_number/tiramisu/multi.py | 2 +- .../15fill_only_optional/tiramisu/base.py | 2 +- .../15fill_only_optional/tiramisu/multi.py | 2 +- .../20family_dynamic_calc/tiramisu/base.py | 2 +- .../20family_dynamic_calc/tiramisu/multi.py | 2 +- .../20family_dynamic_calc2/tiramisu/base.py | 2 +- .../20family_dynamic_calc2/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../20family_dynamic_number/tiramisu/base.py | 2 +- .../20family_dynamic_number/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../40condition_base/tiramisu/base.py | 2 +- .../40condition_base/tiramisu/multi.py | 2 +- .../40condition_base_add/tiramisu/base.py | 2 +- .../40condition_base_add/tiramisu/multi.py | 2 +- .../40empty_param/tiramisu/base.py | 2 +- .../40empty_param/tiramisu/multi.py | 2 +- .../40empty_param2/tiramisu/base.py | 2 +- .../40empty_param2/tiramisu/multi.py | 2 +- .../40ifin_leadership/tiramisu/base.py | 2 +- .../40ifin_leadership/tiramisu/multi.py | 2 +- .../40ifin_leadershipauto/tiramisu/base.py | 2 +- .../40ifin_leadershipauto/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../40ifin_multi/tiramisu/base.py | 2 +- .../40ifin_multi/tiramisu/multi.py | 2 +- .../40ifin_multi2/tiramisu/base.py | 2 +- .../40ifin_multi2/tiramisu/multi.py | 2 +- .../40ifin_validenum/tiramisu/base.py | 2 +- .../40ifin_validenum/tiramisu/multi.py | 2 +- .../40space_param/tiramisu/base.py | 2 +- .../40space_param/tiramisu/multi.py | 2 +- .../45extra_without_family/tiramisu/base.py | 2 +- .../45extra_without_family/tiramisu/multi.py | 2 +- .../51redefine_auto/tiramisu/base.py | 2 +- .../51redefine_auto/tiramisu/multi.py | 2 +- .../51redefine_autofill/tiramisu/base.py | 2 +- .../51redefine_autofill/tiramisu/multi.py | 2 +- .../51redefine_family/tiramisu/base.py | 2 +- .../51redefine_family/tiramisu/multi.py | 2 +- .../51redefine_fill/tiramisu/base.py | 2 +- .../51redefine_fill/tiramisu/multi.py | 2 +- .../51redefine_fillauto/tiramisu/base.py | 2 +- .../51redefine_fillauto/tiramisu/multi.py | 2 +- .../60action_external/tiramisu/base.py | 2 +- .../60action_external/tiramisu/multi.py | 2 +- .../60extra_basic/tiramisu/base.py | 2 +- .../60extra_basic/tiramisu/multi.py | 2 +- .../tiramisu/base.py | 2 +- .../tiramisu/multi.py | 2 +- .../60extra_help/tiramisu/base.py | 2 +- .../60extra_help/tiramisu/multi.py | 2 +- .../60extra_load/tiramisu/base.py | 2 +- .../60extra_load/tiramisu/multi.py | 2 +- .../60extra_mandatory/tiramisu/base.py | 2 +- .../60extra_mandatory/tiramisu/multi.py | 2 +- .../60extra_name_family/tiramisu/base.py | 2 +- .../60extra_name_family/tiramisu/multi.py | 2 +- .../60extra_redefine/tiramisu/base.py | 2 +- .../60extra_redefine/tiramisu/multi.py | 2 +- .../80valid_enum_variables/tiramisu/base.py | 2 +- tests/test_1_flattener.py | 4 +- tests/test_2_makedict.py | 15 +-- 271 files changed, 534 insertions(+), 433 deletions(-) create mode 100644 tests/dictionaries/01base_custom/__init__.py create mode 100644 tests/dictionaries/01base_custom/dictionaries/rougail/00-base.yml create mode 100644 tests/dictionaries/01base_custom/makedict/after.json create mode 100644 tests/dictionaries/01base_custom/makedict/base.json create mode 100644 tests/dictionaries/01base_custom/makedict/before.json create mode 100644 tests/dictionaries/01base_custom/tiramisu/base.py create mode 100644 tests/dictionaries/01base_custom/tiramisu/multi.py diff --git a/docs/library.rst b/docs/library.rst index 8f643a7a3..21bec7de2 100644 --- a/docs/library.rst +++ b/docs/library.rst @@ -139,3 +139,54 @@ Let's execute `script.py`: {'rougail.my_variable': 'my_value', 'rougail.my_variable_jinja': 'no', 'example.my_variable_extra': 'my_value_extra'} The value of the `my_variable_extra` variable is calculated, and it's value comes from the :func:`return_no` function. + + +Create your own type +---------------------- + +A variable has a type. This type enables the variable to define the values that are accepted by this variable. + +There is a series of default types, but obviously not all cases are taken. + +It's possible to create your own type. + +Here an example to a lipogram option (in a string, we cannot use "e" character): + +.. code-block:: python + :caption: the `lipogram.py` file content + + from tiramisu import StrOption + class LipogramOption(StrOption): + __slots__ = tuple() + _type = 'lipogram' + + def validate(self, + value): + super().validate(value) + # verify that there is any 'e' in the sentense + if 'e' in value: + raise ValueError('Perec wrote a book without any "e", you could not do it in a simple sentence?') + +To add the new lipogram type in Rougail: + +.. code-block:: python + >>> from rougail import Rougail, RougailConfig + >>> RougailConfig['dictionaries_dir'] = ['dict'] + >>> RougailConfig['custom_types']['lipogram'] = LipogramOption + +Now, we can use lipogram type. +Here is a :file:`dict/00-base.yml` dictionary: + +.. code-block:: yaml + --- + version: '1.0' + var: + type: lipogram + +.. code-block:: python + >>> rougail = Rougail() + >>> config = rougail.get_config() + >>> config.option('var').value.set('blah') + >>> config.option('var').value.set('I just want to add a quality string that has no bad characters') + [...] + tiramisu.error.ValueOptionError: "I just want to add a quality string that has no bad characters" is an invalid lipogram for "var", Perec wrote a book without any "e", you could not do it in a simple sentence? diff --git a/src/rougail/__init__.py b/src/rougail/__init__.py index b1ff5ed5e..ead8559e4 100644 --- a/src/rougail/__init__.py +++ b/src/rougail/__init__.py @@ -28,10 +28,12 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from tiramisu import Config +from copy import copy from .convert import RougailConvert from .config import RougailConfig from .update import RougailUpgrade +from .object_model import CONVERT_OPTION def tiramisu_display_name(kls) -> str: @@ -46,7 +48,7 @@ class Rougail: def __init__( self, - rougailconfig = None, + rougailconfig=None, ) -> None: if rougailconfig is None: rougailconfig = RougailConfig @@ -66,7 +68,8 @@ class Rougail: if not self.config: tiram_obj = self.converted.save(self.rougailconfig["tiramisu_cache"]) optiondescription = {} - exec(tiram_obj, None, optiondescription) # pylint: disable=W0122 + custom_types = {custom.__name__: custom for custom in self.rougailconfig["custom_types"].values()} + exec(tiram_obj, custom_types, optiondescription) # pylint: disable=W0122 self.config = Config( optiondescription["option_0"], display_name=tiramisu_display_name, @@ -75,4 +78,4 @@ class Rougail: return self.config -__ALL__ = ("Rougail", "RougailConvert", "RougailConfig", "RougailUpgrade") +__ALL__ = ("Rougail", "RougailConfig", "RougailUpgrade") diff --git a/src/rougail/annotator/__init__.py b/src/rougail/annotator/__init__.py index 91d43f339..3570d1bef 100644 --- a/src/rougail/annotator/__init__.py +++ b/src/rougail/annotator/__init__.py @@ -27,27 +27,12 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ -from .variable import CONVERT_OPTION import importlib.resources from os.path import isfile from ..utils import load_modules ANNOTATORS = None -# -# -# if not 'files' in dir(importlib.resources): -# # old python version -# class fake_files: -# def __init__(self, package): -# self.mod = [] -# dir_package = dirname(importlib.resources._get_package(package).__file__) -# for mod in importlib.resources.contents(package): -# self.mod.append(join(dir_package, mod)) -# -# def iterdir(self): -# return self.mod -# importlib.resources.files = fake_files def get_level(module): @@ -101,4 +86,4 @@ class SpaceAnnotator: # pylint: disable=R0903 annotator(objectspace) -__all__ = ("SpaceAnnotator", "CONVERT_OPTION") +__all__ = ("SpaceAnnotator",) diff --git a/src/rougail/annotator/variable.py b/src/rougail/annotator/variable.py index b595b825b..12b0a71c5 100644 --- a/src/rougail/annotator/variable.py +++ b/src/rougail/annotator/variable.py @@ -33,58 +33,6 @@ from rougail.error import DictConsistencyError from rougail.object_model import Calculation -def convert_boolean(value: str) -> bool: - """Boolean coercion. The Rougail XML may contain srings like `True` or `False`""" - if isinstance(value, bool): - return value - value = value.lower() - if value == "true": - return True - elif value == "false": - return False - raise Exception(f"unknown boolean value {value}") - - -CONVERT_OPTION = { - "string": dict(opttype="StrOption"), - "number": dict(opttype="IntOption", func=int), - "float": dict(opttype="FloatOption", func=float), - "boolean": dict(opttype="BoolOption", func=convert_boolean), - "secret": dict(opttype="PasswordOption"), - "mail": dict(opttype="EmailOption"), - "unix_filename": dict(opttype="FilenameOption"), - "date": dict(opttype="DateOption"), - "unix_user": dict(opttype="UsernameOption"), - "ip": dict(opttype="IPOption", initkwargs={"allow_reserved": True}), - "cidr": dict(opttype="IPOption", initkwargs={"cidr": True}), - "netmask": dict(opttype="NetmaskOption"), - "network": dict(opttype="NetworkOption"), - "network_cidr": dict(opttype="NetworkOption", initkwargs={"cidr": True}), - "broadcast": dict(opttype="BroadcastOption"), - "netbios": dict( - opttype="DomainnameOption", - initkwargs={"type": "netbios", "warnings_only": True}, - ), - "domainname": dict( - opttype="DomainnameOption", initkwargs={"type": "domainname", "allow_ip": False} - ), - "hostname": dict( - opttype="DomainnameOption", initkwargs={"type": "hostname", "allow_ip": False} - ), - "web_address": dict( - opttype="URLOption", initkwargs={"allow_ip": False, "allow_without_dot": True} - ), - "port": dict(opttype="PortOption", initkwargs={"allow_private": True}), - "mac": dict(opttype="MACOption"), - "unix_permissions": dict( - opttype="PermissionsOption", initkwargs={"warnings_only": True}, func=int - ), - "choice": dict(opttype="ChoiceOption"), - # - "symlink": dict(opttype="SymLinkOption"), -} - - class Walk: """Walk to objectspace to find variable or family""" diff --git a/src/rougail/config.py b/src/rougail/config.py index 6e1d5fa94..85161fb3d 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -77,4 +77,5 @@ RougailConfig = { "force_convert_dyn_option_description": False, "suffix": "", "tiramisu_cache": None, + "custom_types": {}, } diff --git a/src/rougail/convert.py b/src/rougail/convert.py index 940486cc7..d17afe024 100644 --- a/src/rougail/convert.py +++ b/src/rougail/convert.py @@ -1,4 +1,4 @@ -"""Takes a bunch of Rougail XML dispatched in differents folders +"""Takes a bunch of Rougail YAML dispatched in differents folders as an input and outputs a Tiramisu's file. Created by: @@ -27,25 +27,20 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -Sample usage:: - - >>> from rougail import RougailConvert - >>> rougail = RougailConvert() - >>> tiramisu = rougail.save('tiramisu.py') - -The Rougail - -- loads the XML into an internal RougailObjSpace representation -- visits/annotates the objects -- dumps the object space as Tiramisu string - -The visit/annotation stage is a complex step that corresponds to the Rougail -procedures. """ import logging from pathlib import Path -from typing import Optional, Union, get_type_hints, Any, Literal, List, Dict, Iterator, Tuple +from typing import ( + Optional, + Union, + get_type_hints, + Any, + Literal, + List, + Dict, + Iterator, + Tuple, +) from itertools import chain from yaml import safe_load @@ -56,13 +51,15 @@ from .annotator import SpaceAnnotator from .tiramisureflector import TiramisuReflector from .utils import get_realpath from .object_model import ( + CONVERT_OPTION, Family, Dynamic, - Variable, + _Variable, Choice, SymLink, CALCULATION_TYPES, Calculation, + VariableCalculation, PARAM_TYPES, AnyParam, ) @@ -100,7 +97,7 @@ class Property: class Paths: def __init__(self) -> None: - self._data: Dict[str, Union[Variable, Family]] = {} + self._data: Dict[str, Union[_Variable, Family]] = {} self._dynamics: List[str] = [] self.path_prefix = None @@ -149,7 +146,7 @@ class Paths: def __getitem__( self, path: str, - ) -> Union[Family, Variable]: + ) -> Union[Family, _Variable]: if not path in self._data: raise AttributeError(f"cannot find variable or family {path}") return self._data[path] @@ -217,7 +214,6 @@ class ParserVariable: # self.family = Family self.dynamic = Dynamic - self.variable = Variable self.choice = Choice # self.exclude_imports = [] @@ -229,13 +225,23 @@ class ParserVariable: self.is_init = False super().__init__() + def get_variable(self): + convert_options = list(CONVERT_OPTION) + convert_options.extend(self.rougailconfig["custom_types"]) + + class Variable(_Variable): + type: Literal[*convert_options] = convert_options[0] + + return Variable + def init(self): if self.is_init: return + self.variable = self.get_variable() hint = get_type_hints(self.dynamic) self.family_types = hint["type"].__args__ # pylint: disable=W0201 self.family_attrs = frozenset( # pylint: disable=W0201 - set(hint) | {"redefine"} - {"name", "path", "xmlfiles"} + set(hint) - {"name", "path", "xmlfiles"} | {"redefine"} ) self.family_calculations = self.search_calculation( # pylint: disable=W0201 hint @@ -246,7 +252,7 @@ class ParserVariable: # hint = get_type_hints(self.choice) self.choice_attrs = frozenset( # pylint: disable=W0201 - set(hint) | {"redefine", "exists"} - {"name", "path", "xmlfiles"} + set(hint) - {"name", "path", "xmlfiles"} | {"redefine", "exists"} ) self.choice_calculations = self.search_calculation( # pylint: disable=W0201 hint @@ -290,7 +296,7 @@ class ParserVariable: if isinstance(value, dict) and not self.is_calculation( key, value, - "variable", + self.choice_calculations, False, ): break @@ -356,8 +362,7 @@ class ParserVariable: family_is_leadership: bool = False, family_is_dynamic: bool = False, ) -> None: - """ Parse a family - """ + """Parse a family""" if obj is None: return family_obj = {} @@ -371,10 +376,11 @@ class ParserVariable: else: subfamily_obj[key] = value if path in self.paths: + # it's just for modify subfamily or subvariable, do not redefine if family_obj: if not obj.pop("redefine", False): raise Exception( - "The family {path} already exists and she is not redefined" + f"The family {path} already exists and she is not redefined in {filemane}" ) self.paths.add( path, @@ -429,8 +435,7 @@ class ParserVariable: self, obj: Dict[str, Any], ) -> Iterator[str]: - """ List attributes - """ + """List attributes""" force_to_variable = [] for key, value in obj.items(): if key in force_to_variable: @@ -446,7 +451,7 @@ class ParserVariable: if isinstance(value, dict) and not self.is_calculation( key, value, - "family", + self.family_calculations, False, ): # it's a dict, so a new variables! @@ -462,8 +467,7 @@ class ParserVariable: filenames: Union[str, List[str]], family_is_dynamic: bool, ) -> None: - """ Add a new family - """ + """Add a new family""" family["path"] = path if not isinstance(filenames, list): filenames = [filenames] @@ -483,7 +487,7 @@ class ParserVariable: if not self.is_calculation( key, value, - "family", + self.family_calculations, False, ): continue @@ -528,8 +532,7 @@ class ParserVariable: family_is_leadership: bool = False, family_is_dynamic: bool = False, ) -> None: - """ Parse variable - """ + """Parse variable""" if obj is None: obj = {} extra_attrs = set(obj) - self.choice_attrs @@ -545,7 +548,9 @@ class ParserVariable: return if not obj.pop("redefine", False): raise Exception(f'Variable "{path}" already exists') - self.paths.add(path, self.paths[path].model_copy(update=obj), False, force=True) + self.paths.add( + path, self.paths[path].model_copy(update=obj), False, force=True + ) self.paths[path].xmlfiles.append(filename) else: if "exists" in obj and obj.pop("exists"): @@ -576,7 +581,7 @@ class ParserVariable: if self.is_calculation( key, value, - "variable", + self.choice_calculations, False, ): try: @@ -597,7 +602,7 @@ class ParserVariable: if not self.is_calculation( key, val, - "variable", + self.choice_calculations, True, ): continue @@ -617,8 +622,7 @@ class ParserVariable: ) from err def parse_params(self, path, obj): - """ Parse variable params - """ + """Parse variable params""" if "params" not in obj: return if not isinstance(obj["params"], dict): @@ -628,7 +632,9 @@ class ParserVariable: try: params.append(AnyParam(key=key, value=val, type="any")) except ValidationError as err: - raise Exception(f'"{key}" has an invalid "params" for {path}: {err}') from err + raise Exception( + f'"{key}" has an invalid "params" for {path}: {err}' + ) from err obj["params"] = params def add_variable( @@ -681,7 +687,7 @@ class ParserVariable: ############################################################################################### def set_name( self, - obj: Union[Variable, Family], + obj: Union[_Variable, Family], option_prefix: str, ): """Set Tiramisu object name""" @@ -697,14 +703,10 @@ class ParserVariable: self, attribute: str, value: dict, - typ: Literal["variable", "family"], + calculations: list, inside_list: bool, ): """Check if it's a calculation""" - if typ == "variable": - calculations = self.choice_calculations - else: - calculations = self.family_calculations if inside_list: calculations = calculations[0] else: @@ -786,7 +788,9 @@ class RougailConvert(ParserVariable): inside_list = [] outside_list = [] for key, value in hint.items(): - if "Union" in value.__class__.__name__ and Calculation in value.__args__: + if "Union" in value.__class__.__name__ and ( + Calculation in value.__args__ or VariableCalculation in value.__args__ + ): outside_list.append(key) if ( "Union" in value.__class__.__name__ @@ -914,7 +918,9 @@ class RougailConvert(ParserVariable): f"pffff version ... {version} not in {self.supported_version}" ) - def annotate(self): + def annotate( + self, + ): """Apply annotation""" if not self.paths.has_value(): self.parse_directories() @@ -940,7 +946,7 @@ class RougailConvert(ParserVariable): def save( self, - filename: None, + filename: str, ): """Return tiramisu object declaration as a string""" self.annotate() @@ -949,5 +955,5 @@ class RougailConvert(ParserVariable): if filename: with open(filename, "w", encoding="utf-8") as tiramisu: tiramisu.write(output) - # print(output) + # print(output) return output diff --git a/src/rougail/object_model.py b/src/rougail/object_model.py index 18ca5bdf6..b39cf9354 100644 --- a/src/rougail/object_model.py +++ b/src/rougail/object_model.py @@ -21,16 +21,77 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """ from typing import Optional, Union, get_type_hints, Any, Literal, List, Dict, Iterator -from pydantic import BaseModel, StrictBool, StrictInt, StrictFloat, StrictStr +from pydantic import ( + BaseModel, + StrictBool, + StrictInt, + StrictFloat, + StrictStr, + ConfigDict, +) from .utils import get_jinja_variable_to_param, get_realpath BASETYPE = Union[StrictBool, StrictInt, StrictFloat, StrictStr, None] +def convert_boolean(value: str) -> bool: + """Boolean coercion. The Rougail XML may contain srings like `True` or `False`""" + if isinstance(value, bool): + return value + value = value.lower() + if value == "true": + return True + elif value == "false": + return False + raise Exception(f"unknown boolean value {value}") + + +CONVERT_OPTION = { + "string": dict(opttype="StrOption"), + "number": dict(opttype="IntOption", func=int), + "float": dict(opttype="FloatOption", func=float), + "boolean": dict(opttype="BoolOption", func=convert_boolean), + "secret": dict(opttype="PasswordOption"), + "mail": dict(opttype="EmailOption"), + "unix_filename": dict(opttype="FilenameOption"), + "date": dict(opttype="DateOption"), + "unix_user": dict(opttype="UsernameOption"), + "ip": dict(opttype="IPOption", initkwargs={"allow_reserved": True}), + "cidr": dict(opttype="IPOption", initkwargs={"cidr": True}), + "netmask": dict(opttype="NetmaskOption"), + "network": dict(opttype="NetworkOption"), + "network_cidr": dict(opttype="NetworkOption", initkwargs={"cidr": True}), + "broadcast": dict(opttype="BroadcastOption"), + "netbios": dict( + opttype="DomainnameOption", + initkwargs={"type": "netbios", "warnings_only": True}, + ), + "domainname": dict( + opttype="DomainnameOption", initkwargs={"type": "domainname", "allow_ip": False} + ), + "hostname": dict( + opttype="DomainnameOption", initkwargs={"type": "hostname", "allow_ip": False} + ), + "web_address": dict( + opttype="URLOption", initkwargs={"allow_ip": False, "allow_without_dot": True} + ), + "port": dict(opttype="PortOption", initkwargs={"allow_private": True}), + "mac": dict(opttype="MACOption"), + "unix_permissions": dict( + opttype="PermissionsOption", initkwargs={"warnings_only": True}, func=int + ), + "choice": dict(opttype="ChoiceOption"), + # + "symlink": dict(opttype="SymLinkOption"), +} + + class Param(BaseModel): key: str + model_config = ConfigDict(extra="forbid") + class AnyParam(Param): type: str @@ -70,6 +131,9 @@ PARAM_TYPES = { class Calculation(BaseModel): path_prefix: Optional[str] path: str + inside_list: bool + + model_config = ConfigDict(extra="forbid") def get_realpath( self, @@ -114,7 +178,6 @@ class JinjaCalculation(Calculation): jinja: StrictStr params: Optional[List[Param]] = None return_type: BASETYPE = None - inside_list: bool def _jinja_to_function( self, @@ -154,7 +217,7 @@ class JinjaCalculation(Calculation): objectspace.functions, self.path_prefix, ): - if isinstance(sub_variable, objectspace.variable): + if sub_variable.path in objectspace.variables: default["params"][true_path] = { "type": "variable", "variable": sub_variable, @@ -223,7 +286,6 @@ class VariableCalculation(Calculation): ] variable: StrictStr propertyerror: bool = True - inside_list: bool def to_function( self, @@ -251,10 +313,6 @@ class VariableCalculation(Calculation): if variable.type != "boolean": raise Exception("only boolean!") params[None].insert(0, self.attribute_name) - elif ( - self.attribute_name != "default" and variable.path not in objectspace.multis - ): - raise Exception("pffff") if not self.inside_list and self.path in objectspace.multis: if ( not objectspace.paths.is_dynamic(variable_path) @@ -277,7 +335,6 @@ class InformationCalculation(Calculation): attribute_name: Literal["default"] information: StrictStr variable: Optional[StrictStr] - inside_list: bool def to_function( self, @@ -346,43 +403,15 @@ class Family(BaseModel): xmlfiles: List[str] = [] path: str - class ConfigDict: - arbitrary_types_allowed = True + model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True) class Dynamic(Family): variable: str -class Variable(BaseModel): +class _Variable(BaseModel): name: str - type: Literal[ - "number", - "float", - "string", - "password", - "secret", - "mail", - "boolean", - "unix_filename", - "date", - "unix_user", - "ip", - "local_ip", - "netmask", - "network", - "broadcast", - "netbios", - "domainname", - "hostname", - "web_address", - "port", - "mac", - "cidr", - "network_cidr", - "choice", - "unix_permissions", - ] = "string" description: Optional[str] = None default: Union[List[BASETYPE_CALC], BASETYPE_CALC] = None params: Optional[List[Param]] = None @@ -399,17 +428,19 @@ class Variable(BaseModel): xmlfiles: List[str] = [] path: str - class ConfigDict: - arbitrary_types_allowed = True + model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True) -class Choice(Variable): +class Choice(_Variable): + type: Literal["choice"] = "choice" choices: Union[List[BASETYPE_CALC], Calculation] class SymLink(BaseModel): name: str - type: str = "symlink" - opt: Variable + type: Literal["symlink"] = "symlink" + opt: _Variable xmlfiles: List[str] = [] path: str + + model_config = ConfigDict(extra="forbid") diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 8fda29351..9baea0169 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -33,10 +33,9 @@ from json import dumps from os.path import isfile, basename from .i18n import _ -from .annotator import CONVERT_OPTION from .error import DictConsistencyError from .utils import normalize_family -from .object_model import Calculation +from .object_model import Calculation, CONVERT_OPTION class BaseElt: # pylint: disable=R0903 @@ -122,7 +121,7 @@ class TiramisuReflector: [ "from jinja2 import StrictUndefined, DictLoader", "from jinja2.sandbox import SandboxedEnvironment", - "from rougail.annotator.variable import CONVERT_OPTION", + "from rougail import CONVERT_OPTION", "from tiramisu.error import ValueWarning", "def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs):", " global ENV, CONVERT_OPTION", @@ -469,7 +468,10 @@ class Variable(Common): tiramisu, ): super().__init__(elt, tiramisu) - self.object_type = CONVERT_OPTION[elt.type]["opttype"] + if elt.type in self.tiramisu.objectspace.rougailconfig['custom_types']: + self.object_type = self.tiramisu.objectspace.rougailconfig['custom_types'][elt.type].__name__ + else: + self.object_type = CONVERT_OPTION[elt.type]["opttype"] def _populate_attrib( self, @@ -528,7 +530,7 @@ class Variable(Common): else: validators.append(val) keys["validators"] = "[" + ", ".join(validators) + "]" - for key, value in CONVERT_OPTION[self.elt.type].get("initkwargs", {}).items(): + for key, value in CONVERT_OPTION.get(self.elt.type, {}).get("initkwargs", {}).items(): if isinstance(value, str): value = f"'{value}'" keys[key] = value diff --git a/src/rougail/update.py b/src/rougail/update.py index 56cf4721e..c43ec7d1e 100644 --- a/src/rougail/update.py +++ b/src/rougail/update.py @@ -42,7 +42,7 @@ from .error import UpgradeError from .utils import normalize_family from .config import RougailConfig -from .annotator.variable import CONVERT_OPTION +from .object_model import CONVERT_OPTION VERSIONS = ["0.10", "1.0"] diff --git a/tests/dictionaries/01base_custom/__init__.py b/tests/dictionaries/01base_custom/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/dictionaries/01base_custom/dictionaries/rougail/00-base.yml b/tests/dictionaries/01base_custom/dictionaries/rougail/00-base.yml new file mode 100644 index 000000000..27ca10846 --- /dev/null +++ b/tests/dictionaries/01base_custom/dictionaries/rougail/00-base.yml @@ -0,0 +1,4 @@ +--- +version: '1.0' +custom: + type: custom diff --git a/tests/dictionaries/01base_custom/makedict/after.json b/tests/dictionaries/01base_custom/makedict/after.json new file mode 100644 index 000000000..50595bbbb --- /dev/null +++ b/tests/dictionaries/01base_custom/makedict/after.json @@ -0,0 +1,6 @@ +{ + "rougail.custom": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/01base_custom/makedict/base.json b/tests/dictionaries/01base_custom/makedict/base.json new file mode 100644 index 000000000..98b2a3906 --- /dev/null +++ b/tests/dictionaries/01base_custom/makedict/base.json @@ -0,0 +1,3 @@ +{ + "rougail.custom": null +} diff --git a/tests/dictionaries/01base_custom/makedict/before.json b/tests/dictionaries/01base_custom/makedict/before.json new file mode 100644 index 000000000..50595bbbb --- /dev/null +++ b/tests/dictionaries/01base_custom/makedict/before.json @@ -0,0 +1,6 @@ +{ + "rougail.custom": { + "owner": "default", + "value": null + } +} diff --git a/tests/dictionaries/01base_custom/tiramisu/base.py b/tests/dictionaries/01base_custom/tiramisu/base.py new file mode 100644 index 000000000..649bbc110 --- /dev/null +++ b/tests/dictionaries/01base_custom/tiramisu/base.py @@ -0,0 +1,24 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +global func +func = {'calc_value': calc_value} + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + func[function] = getattr(func_, function) +_load_functions('tests/dictionaries/../eosfunc/test.py') +option_2 = CustomOption(name="custom", doc="custom", properties=frozenset({"basic", "mandatory"})) +optiondescription_1 = OptionDescription(name="rougail", doc="rougail", children=[option_2], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1]) diff --git a/tests/dictionaries/01base_custom/tiramisu/multi.py b/tests/dictionaries/01base_custom/tiramisu/multi.py new file mode 100644 index 000000000..b27fbbb68 --- /dev/null +++ b/tests/dictionaries/01base_custom/tiramisu/multi.py @@ -0,0 +1,28 @@ +from tiramisu import * +from tiramisu.setting import ALLOWED_LEADER_PROPERTIES +ALLOWED_LEADER_PROPERTIES.add("basic") +ALLOWED_LEADER_PROPERTIES.add("standard") +ALLOWED_LEADER_PROPERTIES.add("advanced") +from importlib.machinery import SourceFileLoader as _SourceFileLoader +from importlib.util import spec_from_loader as _spec_from_loader, module_from_spec as _module_from_spec +global func +func = {'calc_value': calc_value} + +def _load_functions(path): + global _SourceFileLoader, _spec_from_loader, _module_from_spec, func + loader = _SourceFileLoader('func', path) + spec = _spec_from_loader(loader.name, loader) + func_ = _module_from_spec(spec) + loader.exec_module(func_) + for function in dir(func_): + if function.startswith('_'): + continue + func[function] = getattr(func_, function) +_load_functions('tests/dictionaries/../eosfunc/test.py') +option_3 = CustomOption(name="custom", doc="custom", properties=frozenset({"basic", "mandatory"})) +optiondescription_2 = OptionDescription(name="rougail", doc="rougail", children=[option_3], properties=frozenset({"basic"})) +optiondescription_1 = OptionDescription(name="1", doc="1", children=[optiondescription_2], properties=frozenset({"basic"})) +option_6 = CustomOption(name="custom", doc="custom", properties=frozenset({"basic", "mandatory"})) +optiondescription_5 = OptionDescription(name="rougail", doc="rougail", children=[option_6], properties=frozenset({"basic"})) +optiondescription_4 = OptionDescription(name="2", doc="2", children=[optiondescription_5], properties=frozenset({"basic"})) +option_0 = OptionDescription(name="baseoption", doc="baseoption", children=[optiondescription_1, optiondescription_4]) diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py index f00d56674..69b7c13ff 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/multi.py b/tests/dictionaries/10autosave_hidden/tiramisu/multi.py index ce321c507..53c4fc478 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py index 3fbacfe9d..7595c303e 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_no_param/tiramisu/multi.py b/tests/dictionaries/10check_no_param/tiramisu/multi.py index 2209d3bd3..d1ca38564 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/multi.py +++ b/tests/dictionaries/10check_no_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py index dd0e13673..4d48cf0fc 100644 --- a/tests/dictionaries/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_optional/tiramisu/multi.py b/tests/dictionaries/10check_optional/tiramisu/multi.py index 64d53bded..421b7dba4 100644 --- a/tests/dictionaries/10check_optional/tiramisu/multi.py +++ b/tests/dictionaries/10check_optional/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py index 0d4d1b9a7..380028ca1 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/multi.py b/tests/dictionaries/10check_valid_differ/tiramisu/multi.py index c771bdba2..930ffe878 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index 897f8d625..967482bc5 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py index 869cd0c75..5b02b11be 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index 897f8d625..967482bc5 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py index 869cd0c75..5b02b11be 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py index ed2b741e7..386473495 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py b/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py index f4665f013..b132398cd 100644 --- a/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_in_network/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py index f219b59d5..ef195337f 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py index 4272d7eab..36eb2c613 100644 --- a/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_in_network_cidr/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index 875139261..240b4ebb8 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py index 5cc7380d2..f0b33e835 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_jinja/tiramisu/base.py b/tests/dictionaries/10check_valid_jinja/tiramisu/base.py index cf56e17bb..518c3396b 100644 --- a/tests/dictionaries/10check_valid_jinja/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_jinja/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py b/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py index 8299a89cd..e7620a117 100644 --- a/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py +++ b/tests/dictionaries/10check_valid_jinja/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10disabled_with_variable/tiramisu/base.py b/tests/dictionaries/10disabled_with_variable/tiramisu/base.py index 9e05b328d..aa54e9758 100644 --- a/tests/dictionaries/10disabled_with_variable/tiramisu/base.py +++ b/tests/dictionaries/10disabled_with_variable/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10disabled_with_variable/tiramisu/multi.py b/tests/dictionaries/10disabled_with_variable/tiramisu/multi.py index 7affbab33..64da959e6 100644 --- a/tests/dictionaries/10disabled_with_variable/tiramisu/multi.py +++ b/tests/dictionaries/10disabled_with_variable/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10disabled_with_variable2/tiramisu/base.py b/tests/dictionaries/10disabled_with_variable2/tiramisu/base.py index 0a11035b2..69b472a65 100644 --- a/tests/dictionaries/10disabled_with_variable2/tiramisu/base.py +++ b/tests/dictionaries/10disabled_with_variable2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10disabled_with_variable2/tiramisu/multi.py b/tests/dictionaries/10disabled_with_variable2/tiramisu/multi.py index 6ccf47a5b..7a3a24876 100644 --- a/tests/dictionaries/10disabled_with_variable2/tiramisu/multi.py +++ b/tests/dictionaries/10disabled_with_variable2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill/tiramisu/base.py b/tests/dictionaries/10fill/tiramisu/base.py index 994f089dd..78ea77b11 100644 --- a/tests/dictionaries/10fill/tiramisu/base.py +++ b/tests/dictionaries/10fill/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill/tiramisu/multi.py b/tests/dictionaries/10fill/tiramisu/multi.py index f2306adda..99f4197f3 100644 --- a/tests/dictionaries/10fill/tiramisu/multi.py +++ b/tests/dictionaries/10fill/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill_optional/tiramisu/base.py b/tests/dictionaries/10fill_optional/tiramisu/base.py index e4a187f2a..522738d53 100644 --- a/tests/dictionaries/10fill_optional/tiramisu/base.py +++ b/tests/dictionaries/10fill_optional/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill_optional/tiramisu/multi.py b/tests/dictionaries/10fill_optional/tiramisu/multi.py index 4de69de6e..dbeb123fe 100644 --- a/tests/dictionaries/10fill_optional/tiramisu/multi.py +++ b/tests/dictionaries/10fill_optional/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill_quote/tiramisu/base.py b/tests/dictionaries/10fill_quote/tiramisu/base.py index 1db28bb7a..11394463a 100644 --- a/tests/dictionaries/10fill_quote/tiramisu/base.py +++ b/tests/dictionaries/10fill_quote/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill_quote/tiramisu/multi.py b/tests/dictionaries/10fill_quote/tiramisu/multi.py index aa42ae540..5ad399b56 100644 --- a/tests/dictionaries/10fill_quote/tiramisu/multi.py +++ b/tests/dictionaries/10fill_quote/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill_target_information/tiramisu/base.py b/tests/dictionaries/10fill_target_information/tiramisu/base.py index eb477df0e..3e9155a20 100644 --- a/tests/dictionaries/10fill_target_information/tiramisu/base.py +++ b/tests/dictionaries/10fill_target_information/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10fill_target_information/tiramisu/multi.py b/tests/dictionaries/10fill_target_information/tiramisu/multi.py index 4b2956abc..dd258fb25 100644 --- a/tests/dictionaries/10fill_target_information/tiramisu/multi.py +++ b/tests/dictionaries/10fill_target_information/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py index 6b71e45e7..1799a2267 100644 --- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py index 35342b5eb..796d1e0b7 100644 --- a/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py +++ b/tests/dictionaries/10frozenifin_unknown_valid_enum_number/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py index 4984d6501..40661f472 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_append/tiramisu/multi.py b/tests/dictionaries/10leadership_append/tiramisu/multi.py index 417ff4714..6f4c6217d 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_append/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py index 85e8d9393..e448674d0 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py b/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py index 60a2b70aa..59e619a83 100644 --- a/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_append_hidden/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/base.py b/tests/dictionaries/10leadership_append_name/tiramisu/base.py index 550eb465f..bcdf6f440 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_append_name/tiramisu/multi.py b/tests/dictionaries/10leadership_append_name/tiramisu/multi.py index a9ebfbc5e..3b465abf3 100644 --- a/tests/dictionaries/10leadership_append_name/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_append_name/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index a09191243..4ddb66d68 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_auto/tiramisu/multi.py b/tests/dictionaries/10leadership_auto/tiramisu/multi.py index f8ac214ab..469c599d3 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_auto_index/tiramisu/base.py b/tests/dictionaries/10leadership_auto_index/tiramisu/base.py index 3239aa44f..b626cbd10 100644 --- a/tests/dictionaries/10leadership_auto_index/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto_index/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py b/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py index 95f70be05..13db399ee 100644 --- a/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_auto_index/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_auto_index_param/tiramisu/base.py b/tests/dictionaries/10leadership_auto_index_param/tiramisu/base.py index 85a78da9f..ab6d40b93 100644 --- a/tests/dictionaries/10leadership_auto_index_param/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto_index_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_auto_index_param/tiramisu/multi.py b/tests/dictionaries/10leadership_auto_index_param/tiramisu/multi.py index cbbf5ab07..2361e5e77 100644 --- a/tests/dictionaries/10leadership_auto_index_param/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_auto_index_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 57c864940..fe43145d5 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py b/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py index 458e453aa..5906930dc 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index 4956cc0ae..ffe867d41 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py index 5052c6e24..2673f400c 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index 3bc122835..6ccf59ae2 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py index 27e0cb95a..53e9e7e81 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_hidden/tiramisu/base.py index c7bb9d562..a799e363c 100644 --- a/tests/dictionaries/10leadership_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_hidden/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_hidden/tiramisu/multi.py b/tests/dictionaries/10leadership_hidden/tiramisu/multi.py index 9c9c8a0c7..59911b43b 100644 --- a/tests/dictionaries/10leadership_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_hidden/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index c7bb9d562..a799e363c 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py index 9c9c8a0c7..59911b43b 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py index 67442bc3c..b0a4208ce 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py index 1b28a28fa..22627a9a8 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py index a89c34b78..2bbbfabfd 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py index 49cda164a..704f5b6ff 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in_name/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 4c240920a..c9173cd6f 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py index aeacfa425..c6c806edd 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index 4fc0b77f1..d90836af9 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10leadership_multi/tiramisu/multi.py b/tests/dictionaries/10leadership_multi/tiramisu/multi.py index 7ad59dd05..64080e1a7 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/multi.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index 1d2f88ae1..337ce7b62 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py index 62274ae53..cf1cab7af 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py index 2a3bd5fbe..e96caec48 100644 --- a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py index cae54815a..1253b7688 100644 --- a/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_fill/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py index 83648cf2f..bcf9019b3 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py index e059b4749..49938400e 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py index efc360c26..9b85b1c9e 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py index 00545d0bb..12cd80fcd 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py index bd331bfb1..fe97746d0 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py index 98d334690..fcd8959b3 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param3/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py index b46dd776c..a7535fb11 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py index bd68e0e98..cce5b9973 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param4/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py index 0fc3f3b15..d736440cc 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py index cb21c0ca8..fabbb915f 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param5/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py index 1d1370d6d..7caf37055 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py index 1beb8b59e..ddc3e3fb0 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param6/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py index 6c312dd43..ae8bbda88 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py index 82cec529a..a1a886358 100644 --- a/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_multi_param_disabled/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py index 56aa60715..aa0288a28 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py index 34bb3ca9b..8a137d24a 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py index 2debe00cc..13a3caea4 100644 --- a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py index 012826a3a..ace23101b 100644 --- a/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_twice/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py index 84758794d..9fcad1694 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py index c17141c93..107588b49 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_variable/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py index 8fee7a7da..df57ea44c 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py index 4794e3bd0..3ad36462a 100644 --- a/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_in_variable2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py index 0e937fb91..f1e4c4497 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py index 418bec07d..59559630e 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py index bf755f888..65a08ca6c 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py index 24c8d5b57..eeaf5937f 100644 --- a/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index c14750655..18a25d30f 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py index 3bbd12f77..464f87c36 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index a33be4062..aec41ade2 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py index 3c9107c93..9c1dea954 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index b39a5acba..b34dfa7f3 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py index 721604205..59949300c 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index aa908978d..7f8893949 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin/tiramisu/multi.py index 44caa067c..34c70e4b1 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index e217c0399..69a511d0e 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py index 41ef74de9..a0ccb2c53 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index 1a533d94e..1603d7c3d 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py index 08d5c9506..1d23e4da2 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py index 4c645b6e4..68412db7b 100644 --- a/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py b/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py index ba8d04b33..2d16d4888 100644 --- a/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifin_variable/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py index b60eb101e..a21320562 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py b/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py index 2ab023dd1..ae920bb2b 100644 --- a/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py +++ b/tests/dictionaries/10load_frozenifnotin/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py index 58edb4332..ecea7597a 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py index 0433d696d..5bc139e31 100644 --- a/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_empty_family/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index eec642bca..0c24bff23 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py index abf4394de..d6962bd24 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_family2/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family2/tiramisu/base.py index 833d209d2..1c3e31bb9 100644 --- a/tests/dictionaries/10load_hidden_if_family2/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_family2/tiramisu/multi.py b/tests/dictionaries/10load_hidden_if_family2/tiramisu/multi.py index e6608061a..4fdc670ba 100644 --- a/tests/dictionaries/10load_hidden_if_family2/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_family2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_family3/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family3/tiramisu/base.py index 24336bc8e..c7db58e51 100644 --- a/tests/dictionaries/10load_hidden_if_family3/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family3/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_hidden_if_family3/tiramisu/multi.py b/tests/dictionaries/10load_hidden_if_family3/tiramisu/multi.py index e86686229..ad3329718 100644 --- a/tests/dictionaries/10load_hidden_if_family3/tiramisu/multi.py +++ b/tests/dictionaries/10load_hidden_if_family3/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py index aefacec48..166d9503a 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership/tiramisu/multi.py b/tests/dictionaries/10load_leadership/tiramisu/multi.py index 21b287618..8a46725c7 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index 88b0f544f..2afb3df88 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/multi.py b/tests/dictionaries/10load_leadership_description/tiramisu/multi.py index 10eb000b7..d81fb489b 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/base.py b/tests/dictionaries/10load_leadership_name/tiramisu/base.py index 28ea34d41..95cbd6912 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership_name/tiramisu/multi.py b/tests/dictionaries/10load_leadership_name/tiramisu/multi.py index b38d32758..e55550e69 100644 --- a/tests/dictionaries/10load_leadership_name/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_name/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index c66460c86..dcd3d114b 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py index c00f93a4d..6d5e78cf2 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index 6de49937a..6698fbaa4 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py index 9cec02d83..885ccbd45 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/base.py index cc321983f..286591184 100644 --- a/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/multi.py b/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/multi.py index 79012aba6..e88eec821 100644 --- a/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/multi.py +++ b/tests/dictionaries/11autosave_hidden_frozenifin/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 8742e0520..9cd462db0 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py index 26a5c671e..8958576e1 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py index 083e7110c..c28328c7c 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py index 8daa322e7..154e2ad47 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py index c35c92f67..6de972144 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py index 4c9fa4139..be7860a0f 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py index 8742e0520..9cd462db0 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py index 26a5c671e..8958576e1 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py +++ b/tests/dictionaries/11disabled_if_in_filelist_same_name/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11fill_multi_calc_val/tiramisu/base.py b/tests/dictionaries/11fill_multi_calc_val/tiramisu/base.py index 225300e5c..b269cd8a5 100644 --- a/tests/dictionaries/11fill_multi_calc_val/tiramisu/base.py +++ b/tests/dictionaries/11fill_multi_calc_val/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11fill_multi_calc_val/tiramisu/multi.py b/tests/dictionaries/11fill_multi_calc_val/tiramisu/multi.py index 4fdc54d46..5d20a36a7 100644 --- a/tests/dictionaries/11fill_multi_calc_val/tiramisu/multi.py +++ b/tests/dictionaries/11fill_multi_calc_val/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/base.py b/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/base.py index b1ed2afc3..513c7cfb4 100644 --- a/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/base.py +++ b/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/multi.py b/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/multi.py index 9189929e2..146999fe0 100644 --- a/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/multi.py +++ b/tests/dictionaries/11fill_multi_calc_val_multi/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11valid_enum_function/tiramisu/base.py b/tests/dictionaries/11valid_enum_function/tiramisu/base.py index cdf823c4a..582d1155a 100644 --- a/tests/dictionaries/11valid_enum_function/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_function/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11valid_enum_function/tiramisu/multi.py b/tests/dictionaries/11valid_enum_function/tiramisu/multi.py index 9ef67e55e..d9c0984f1 100644 --- a/tests/dictionaries/11valid_enum_function/tiramisu/multi.py +++ b/tests/dictionaries/11valid_enum_function/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py index 151544a25..f333e92ab 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/base.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py b/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py index b2413ca39..f35fe4364 100644 --- a/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py +++ b/tests/dictionaries/11valid_enum_variable/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_base/tiramisu/base.py b/tests/dictionaries/12auto_base/tiramisu/base.py index 3fd75b453..0b2c8a776 100644 --- a/tests/dictionaries/12auto_base/tiramisu/base.py +++ b/tests/dictionaries/12auto_base/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_base/tiramisu/multi.py b/tests/dictionaries/12auto_base/tiramisu/multi.py index e1384c2c4..c4bc4864a 100644 --- a/tests/dictionaries/12auto_base/tiramisu/multi.py +++ b/tests/dictionaries/12auto_base/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_func_variable/tiramisu/base.py b/tests/dictionaries/12auto_func_variable/tiramisu/base.py index 81e241901..bf9c93861 100644 --- a/tests/dictionaries/12auto_func_variable/tiramisu/base.py +++ b/tests/dictionaries/12auto_func_variable/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_func_variable/tiramisu/multi.py b/tests/dictionaries/12auto_func_variable/tiramisu/multi.py index 790f973cd..34121aed0 100644 --- a/tests/dictionaries/12auto_func_variable/tiramisu/multi.py +++ b/tests/dictionaries/12auto_func_variable/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_base/tiramisu/base.py b/tests/dictionaries/12auto_jinja_base/tiramisu/base.py index f1838a415..0093e7fe5 100644 --- a/tests/dictionaries/12auto_jinja_base/tiramisu/base.py +++ b/tests/dictionaries/12auto_jinja_base/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_base/tiramisu/multi.py b/tests/dictionaries/12auto_jinja_base/tiramisu/multi.py index 30362726d..ecd024658 100644 --- a/tests/dictionaries/12auto_jinja_base/tiramisu/multi.py +++ b/tests/dictionaries/12auto_jinja_base/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_if/tiramisu/base.py b/tests/dictionaries/12auto_jinja_if/tiramisu/base.py index 67fcac13c..40092b094 100644 --- a/tests/dictionaries/12auto_jinja_if/tiramisu/base.py +++ b/tests/dictionaries/12auto_jinja_if/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_if/tiramisu/multi.py b/tests/dictionaries/12auto_jinja_if/tiramisu/multi.py index 34bcb270f..d1d5cf410 100644 --- a/tests/dictionaries/12auto_jinja_if/tiramisu/multi.py +++ b/tests/dictionaries/12auto_jinja_if/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_if_bool/tiramisu/base.py b/tests/dictionaries/12auto_jinja_if_bool/tiramisu/base.py index 3cd9eca9c..2284e36ca 100644 --- a/tests/dictionaries/12auto_jinja_if_bool/tiramisu/base.py +++ b/tests/dictionaries/12auto_jinja_if_bool/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_if_bool/tiramisu/multi.py b/tests/dictionaries/12auto_jinja_if_bool/tiramisu/multi.py index 510712a72..d23e9c1d0 100644 --- a/tests/dictionaries/12auto_jinja_if_bool/tiramisu/multi.py +++ b/tests/dictionaries/12auto_jinja_if_bool/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_if_int/tiramisu/base.py b/tests/dictionaries/12auto_jinja_if_int/tiramisu/base.py index 0e2683e41..5bfe2a4d4 100644 --- a/tests/dictionaries/12auto_jinja_if_int/tiramisu/base.py +++ b/tests/dictionaries/12auto_jinja_if_int/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_if_int/tiramisu/multi.py b/tests/dictionaries/12auto_jinja_if_int/tiramisu/multi.py index 64758722f..5d8c15bc0 100644 --- a/tests/dictionaries/12auto_jinja_if_int/tiramisu/multi.py +++ b/tests/dictionaries/12auto_jinja_if_int/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_set/tiramisu/base.py b/tests/dictionaries/12auto_jinja_set/tiramisu/base.py index b53adce9a..154a79b91 100644 --- a/tests/dictionaries/12auto_jinja_set/tiramisu/base.py +++ b/tests/dictionaries/12auto_jinja_set/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_jinja_set/tiramisu/multi.py b/tests/dictionaries/12auto_jinja_set/tiramisu/multi.py index 34865dfc0..f64724f2f 100644 --- a/tests/dictionaries/12auto_jinja_set/tiramisu/multi.py +++ b/tests/dictionaries/12auto_jinja_set/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_withoutparam/tiramisu/base.py b/tests/dictionaries/12auto_withoutparam/tiramisu/base.py index aa0c3d383..18b8f0971 100644 --- a/tests/dictionaries/12auto_withoutparam/tiramisu/base.py +++ b/tests/dictionaries/12auto_withoutparam/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/12auto_withoutparam/tiramisu/multi.py b/tests/dictionaries/12auto_withoutparam/tiramisu/multi.py index ad6e8e53a..c37c9e390 100644 --- a/tests/dictionaries/12auto_withoutparam/tiramisu/multi.py +++ b/tests/dictionaries/12auto_withoutparam/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_information/tiramisu/base.py b/tests/dictionaries/13fill_information/tiramisu/base.py index 0d51f977b..9359599a4 100644 --- a/tests/dictionaries/13fill_information/tiramisu/base.py +++ b/tests/dictionaries/13fill_information/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_information/tiramisu/multi.py b/tests/dictionaries/13fill_information/tiramisu/multi.py index 8fa3f077b..1a6e9a3d0 100644 --- a/tests/dictionaries/13fill_information/tiramisu/multi.py +++ b/tests/dictionaries/13fill_information/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_information_multi/tiramisu/base.py b/tests/dictionaries/13fill_information_multi/tiramisu/base.py index df0a841ad..1f08de575 100644 --- a/tests/dictionaries/13fill_information_multi/tiramisu/base.py +++ b/tests/dictionaries/13fill_information_multi/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_information_multi/tiramisu/multi.py b/tests/dictionaries/13fill_information_multi/tiramisu/multi.py index 9e6d025bf..c20c073f3 100644 --- a/tests/dictionaries/13fill_information_multi/tiramisu/multi.py +++ b/tests/dictionaries/13fill_information_multi/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_option/tiramisu/base.py b/tests/dictionaries/13fill_option/tiramisu/base.py index 1e1270382..d9d088350 100644 --- a/tests/dictionaries/13fill_option/tiramisu/base.py +++ b/tests/dictionaries/13fill_option/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_option/tiramisu/multi.py b/tests/dictionaries/13fill_option/tiramisu/multi.py index 87046f2bd..606d2e322 100644 --- a/tests/dictionaries/13fill_option/tiramisu/multi.py +++ b/tests/dictionaries/13fill_option/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_option_information/tiramisu/base.py b/tests/dictionaries/13fill_option_information/tiramisu/base.py index 003fac6f4..124276461 100644 --- a/tests/dictionaries/13fill_option_information/tiramisu/base.py +++ b/tests/dictionaries/13fill_option_information/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_option_information/tiramisu/multi.py b/tests/dictionaries/13fill_option_information/tiramisu/multi.py index 6b4b89c47..420ac2f35 100644 --- a/tests/dictionaries/13fill_option_information/tiramisu/multi.py +++ b/tests/dictionaries/13fill_option_information/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_option_information_param/tiramisu/base.py b/tests/dictionaries/13fill_option_information_param/tiramisu/base.py index 547694e05..457e883cf 100644 --- a/tests/dictionaries/13fill_option_information_param/tiramisu/base.py +++ b/tests/dictionaries/13fill_option_information_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/13fill_option_information_param/tiramisu/multi.py b/tests/dictionaries/13fill_option_information_param/tiramisu/multi.py index fe275bb20..427aa2f07 100644 --- a/tests/dictionaries/13fill_option_information_param/tiramisu/multi.py +++ b/tests/dictionaries/13fill_option_information_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_autosave/tiramisu/base.py b/tests/dictionaries/15fill_autosave/tiramisu/base.py index b6cfb1198..a6d21b6c2 100644 --- a/tests/dictionaries/15fill_autosave/tiramisu/base.py +++ b/tests/dictionaries/15fill_autosave/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_autosave/tiramisu/multi.py b/tests/dictionaries/15fill_autosave/tiramisu/multi.py index a2f1e7d9e..bef3f3675 100644 --- a/tests/dictionaries/15fill_autosave/tiramisu/multi.py +++ b/tests/dictionaries/15fill_autosave/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_base/tiramisu/base.py b/tests/dictionaries/15fill_base/tiramisu/base.py index efcbbd874..e88b9ff62 100644 --- a/tests/dictionaries/15fill_base/tiramisu/base.py +++ b/tests/dictionaries/15fill_base/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_base/tiramisu/multi.py b/tests/dictionaries/15fill_base/tiramisu/multi.py index 29f32495a..f7e39c068 100644 --- a/tests/dictionaries/15fill_base/tiramisu/multi.py +++ b/tests/dictionaries/15fill_base/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_mandatory/tiramisu/base.py b/tests/dictionaries/15fill_mandatory/tiramisu/base.py index 46f69b259..479c233cb 100644 --- a/tests/dictionaries/15fill_mandatory/tiramisu/base.py +++ b/tests/dictionaries/15fill_mandatory/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_mandatory/tiramisu/multi.py b/tests/dictionaries/15fill_mandatory/tiramisu/multi.py index 99daaffaf..aea5d148a 100644 --- a/tests/dictionaries/15fill_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/15fill_mandatory/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_number/tiramisu/base.py b/tests/dictionaries/15fill_number/tiramisu/base.py index 5e6d3a5ed..b66275800 100644 --- a/tests/dictionaries/15fill_number/tiramisu/base.py +++ b/tests/dictionaries/15fill_number/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_number/tiramisu/multi.py b/tests/dictionaries/15fill_number/tiramisu/multi.py index 56c5a560a..03114a222 100644 --- a/tests/dictionaries/15fill_number/tiramisu/multi.py +++ b/tests/dictionaries/15fill_number/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_only_optional/tiramisu/base.py b/tests/dictionaries/15fill_only_optional/tiramisu/base.py index 5b16d7d41..80e0bd820 100644 --- a/tests/dictionaries/15fill_only_optional/tiramisu/base.py +++ b/tests/dictionaries/15fill_only_optional/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/15fill_only_optional/tiramisu/multi.py b/tests/dictionaries/15fill_only_optional/tiramisu/multi.py index f5dee9938..6e3666fe0 100644 --- a/tests/dictionaries/15fill_only_optional/tiramisu/multi.py +++ b/tests/dictionaries/15fill_only_optional/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index 7a3905b37..2e7d65d55 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py index 8dec91028..9f919c9fb 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py index 10285c015..bb8b3a26b 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py index 39711cf09..f4b7dab42 100644 --- a/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py index e20d448c2..34da7ea46 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py index f15378e72..3513d41f6 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/base.py index e944d7774..31a68a438 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/multi.py index a7f6e26c2..f83fa7577 100644 --- a/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_calc_suffix_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py index 34a7e36c6..a42c1490d 100644 --- a/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py index 481630117..fdcd700ae 100644 --- a/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_jinja_fill/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py index f760deee2..22d69df0c 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py index 55b3e6c66..90133e5a5 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/base.py b/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/base.py index a73030a38..5c72e9c08 100644 --- a/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/multi.py index cdf5a69e7..63a4f31c8 100644 --- a/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_variable_outside/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/base.py b/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/base.py index bcd02276d..e5c4bc913 100644 --- a/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/multi.py b/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/multi.py index 0397279b8..5fb1177b4 100644 --- a/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/multi.py +++ b/tests/dictionaries/20family_dynamic_variable_outside_suffix/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index fa9812b0a..6c2048194 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py index caef248c5..1b5a409cb 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index f653577cb..a1c4ecc08 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py index 01609d4b7..d02f3759a 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index f77583efb..e29060ef5 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40condition_base/tiramisu/multi.py b/tests/dictionaries/40condition_base/tiramisu/multi.py index 8ca64aebf..7e5d15b97 100644 --- a/tests/dictionaries/40condition_base/tiramisu/multi.py +++ b/tests/dictionaries/40condition_base/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40condition_base_add/tiramisu/base.py b/tests/dictionaries/40condition_base_add/tiramisu/base.py index 6c59eb137..11fb83a8e 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/base.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40condition_base_add/tiramisu/multi.py b/tests/dictionaries/40condition_base_add/tiramisu/multi.py index dbe1a2102..c0debe65b 100644 --- a/tests/dictionaries/40condition_base_add/tiramisu/multi.py +++ b/tests/dictionaries/40condition_base_add/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40empty_param/tiramisu/base.py b/tests/dictionaries/40empty_param/tiramisu/base.py index 468de52f6..b46cf2364 100644 --- a/tests/dictionaries/40empty_param/tiramisu/base.py +++ b/tests/dictionaries/40empty_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40empty_param/tiramisu/multi.py b/tests/dictionaries/40empty_param/tiramisu/multi.py index 25d39977a..0feb086b9 100644 --- a/tests/dictionaries/40empty_param/tiramisu/multi.py +++ b/tests/dictionaries/40empty_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40empty_param2/tiramisu/base.py b/tests/dictionaries/40empty_param2/tiramisu/base.py index 468de52f6..b46cf2364 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/base.py +++ b/tests/dictionaries/40empty_param2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40empty_param2/tiramisu/multi.py b/tests/dictionaries/40empty_param2/tiramisu/multi.py index 25d39977a..0feb086b9 100644 --- a/tests/dictionaries/40empty_param2/tiramisu/multi.py +++ b/tests/dictionaries/40empty_param2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index a5b01d04e..6d855341d 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/multi.py b/tests/dictionaries/40ifin_leadership/tiramisu/multi.py index 920a65dba..9e50c5ae1 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 530dd4e01..9e100172f 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py index 139a58f00..06d482802 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py index f5bc151c3..c008ef146 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py index 51137a775..b3e823e97 100644 --- a/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_leadershipauto_follower/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index 9cee13ac3..f09ea2330 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_multi/tiramisu/multi.py b/tests/dictionaries/40ifin_multi/tiramisu/multi.py index 365877d98..4f9860f37 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_multi2/tiramisu/base.py b/tests/dictionaries/40ifin_multi2/tiramisu/base.py index edb32d0d8..1d6d81b83 100644 --- a/tests/dictionaries/40ifin_multi2/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi2/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_multi2/tiramisu/multi.py b/tests/dictionaries/40ifin_multi2/tiramisu/multi.py index 10a3643c0..a9e43ea1d 100644 --- a/tests/dictionaries/40ifin_multi2/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_multi2/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py index 541b032b4..3296f1cec 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/base.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/multi.py b/tests/dictionaries/40ifin_validenum/tiramisu/multi.py index ac25cd6d1..dc6d8e8b2 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/multi.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40space_param/tiramisu/base.py b/tests/dictionaries/40space_param/tiramisu/base.py index 6a8da76c0..0fef14ffe 100644 --- a/tests/dictionaries/40space_param/tiramisu/base.py +++ b/tests/dictionaries/40space_param/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/40space_param/tiramisu/multi.py b/tests/dictionaries/40space_param/tiramisu/multi.py index 4e52b204c..7fb3e1fbe 100644 --- a/tests/dictionaries/40space_param/tiramisu/multi.py +++ b/tests/dictionaries/40space_param/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/45extra_without_family/tiramisu/base.py b/tests/dictionaries/45extra_without_family/tiramisu/base.py index 6db30b3ba..d8cc391e9 100644 --- a/tests/dictionaries/45extra_without_family/tiramisu/base.py +++ b/tests/dictionaries/45extra_without_family/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/45extra_without_family/tiramisu/multi.py b/tests/dictionaries/45extra_without_family/tiramisu/multi.py index f20c93058..f956e590c 100644 --- a/tests/dictionaries/45extra_without_family/tiramisu/multi.py +++ b/tests/dictionaries/45extra_without_family/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py index d4d89ef19..b9539bbd2 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_auto/tiramisu/multi.py b/tests/dictionaries/51redefine_auto/tiramisu/multi.py index bf378f32f..155068721 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py index 7e018a13a..9d21fab85 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/multi.py b/tests/dictionaries/51redefine_autofill/tiramisu/multi.py index 74ae7464f..5f3d421b9 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index 3724e39d3..b671e837a 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_family/tiramisu/multi.py b/tests/dictionaries/51redefine_family/tiramisu/multi.py index 7c7d379c6..306c597f8 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_family/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py index d4d89ef19..b9539bbd2 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_fill/tiramisu/multi.py b/tests/dictionaries/51redefine_fill/tiramisu/multi.py index bf378f32f..155068721 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py index d4d89ef19..b9539bbd2 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py b/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py index bf378f32f..155068721 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py index 2ede649fa..bb01e4634 100644 --- a/tests/dictionaries/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60action_external/tiramisu/multi.py b/tests/dictionaries/60action_external/tiramisu/multi.py index 2c9ceac45..e8b8b25de 100644 --- a/tests/dictionaries/60action_external/tiramisu/multi.py +++ b/tests/dictionaries/60action_external/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_basic/tiramisu/base.py b/tests/dictionaries/60extra_basic/tiramisu/base.py index dd827436e..1bd958bef 100644 --- a/tests/dictionaries/60extra_basic/tiramisu/base.py +++ b/tests/dictionaries/60extra_basic/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_basic/tiramisu/multi.py b/tests/dictionaries/60extra_basic/tiramisu/multi.py index d857dc0ae..a75e21cc7 100644 --- a/tests/dictionaries/60extra_basic/tiramisu/multi.py +++ b/tests/dictionaries/60extra_basic/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index 5362bd2e2..2a68bc9e6 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py index d87b2977d..7d1468837 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index 8821677d1..7711fa1c2 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_help/tiramisu/multi.py b/tests/dictionaries/60extra_help/tiramisu/multi.py index b45e1635b..ff7fc10de 100644 --- a/tests/dictionaries/60extra_help/tiramisu/multi.py +++ b/tests/dictionaries/60extra_help/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py index 47636e873..93aa66bef 100644 --- a/tests/dictionaries/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_load/tiramisu/multi.py b/tests/dictionaries/60extra_load/tiramisu/multi.py index 841cc6e70..2f7534f03 100644 --- a/tests/dictionaries/60extra_load/tiramisu/multi.py +++ b/tests/dictionaries/60extra_load/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py index b43663a4d..7ba9f528b 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/multi.py b/tests/dictionaries/60extra_mandatory/tiramisu/multi.py index e63273ec8..49a75eed1 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/multi.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_name_family/tiramisu/base.py b/tests/dictionaries/60extra_name_family/tiramisu/base.py index 30ef15494..fd430aca9 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/base.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_name_family/tiramisu/multi.py b/tests/dictionaries/60extra_name_family/tiramisu/multi.py index 2d548a3f9..86efd4f48 100644 --- a/tests/dictionaries/60extra_name_family/tiramisu/multi.py +++ b/tests/dictionaries/60extra_name_family/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py index e478718d7..736276ad1 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/60extra_redefine/tiramisu/multi.py b/tests/dictionaries/60extra_redefine/tiramisu/multi.py index 4441afa28..95b05836e 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/multi.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/multi.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/dictionaries/80valid_enum_variables/tiramisu/base.py b/tests/dictionaries/80valid_enum_variables/tiramisu/base.py index 1283b8751..69ff09eb3 100644 --- a/tests/dictionaries/80valid_enum_variables/tiramisu/base.py +++ b/tests/dictionaries/80valid_enum_variables/tiramisu/base.py @@ -21,7 +21,7 @@ def _load_functions(path): _load_functions('tests/dictionaries/../eosfunc/test.py') from jinja2 import StrictUndefined, DictLoader from jinja2.sandbox import SandboxedEnvironment -from rougail.annotator.variable import CONVERT_OPTION +from rougail import CONVERT_OPTION from tiramisu.error import ValueWarning def jinja_to_function(__internal_jinja, __internal_type, __internal_multi, **kwargs): global ENV, CONVERT_OPTION diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 96743fe76..a7c0fc2a9 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -8,6 +8,7 @@ environ['TIRAMISU_LOCALE'] = 'en' from rougail import Rougail, RougailConfig from rougail.error import DictConsistencyError +from .custom import CustomOption logger = logging.getLogger() @@ -39,7 +40,7 @@ excludes = set([ ]) test_ok -= excludes test_raise -= excludes -#test_ok = ['45multi_family_expert'] +#test_ok = ['20override_source'] #test_ok = [] #test_raise = ['80auto_autofreeze'] #test_raise = [] @@ -90,6 +91,7 @@ def load_rougail_object(test_dir, multi=False): if isdir(subfolder): rougailconfig['extra_dictionaries'][extra] = [subfolder] rougailconfig['tiramisu_cache'] = get_tiramisu_filename(test_dir, 'tmp', multi) + rougailconfig['custom_types']['custom'] = CustomOption return Rougail(rougailconfig) diff --git a/tests/test_2_makedict.py b/tests/test_2_makedict.py index 0e6b6dc14..48d7155af 100644 --- a/tests/test_2_makedict.py +++ b/tests/test_2_makedict.py @@ -5,6 +5,7 @@ from json import dump, load, dumps, loads environ['TIRAMISU_LOCALE'] = 'en' +from .custom import CustomOption from tiramisu import Config from tiramisu.error import PropertiesOptionError @@ -29,7 +30,7 @@ excludes = set([ #excludes = set(['01base_file_utfchar']) test_ok -= excludes -#test_ok = ['01base_domainname_params'] +#test_ok = ['10base_certificate_list'] test_ok = list(test_ok) @@ -50,11 +51,11 @@ def launch_flattener(test_dir, makedict_after = join(makedict_dir, 'after.json') informations_file = join(test_dir, 'informations.json') - modulepath = test_dir.replace('/', '.') + f'.tiramisu.{filename}' - mod = __import__(modulepath) - for token in modulepath.split(".")[1:]: - mod = getattr(mod, token) - config = Config(mod.option_0) + modulepath = join(test_dir, 'tiramisu', filename + '.py') + with open(modulepath) as fh: + optiondescription = {} + exec(fh.read(), {'CustomOption': CustomOption}, optiondescription) # pylint: disable=W0122 + config = Config(optiondescription["option_0"]) # change default rights ro_origin = config.property.default('read_only', 'append') ro_append = frozenset(ro_origin - {'force_store_value'}) @@ -76,7 +77,7 @@ def launch_flattener(test_dir, for root in ['1', '2']: config.option(f'{root}.{key}').information.set('test_information', value) # - config_dict = config.value.dict() + config_dict = config.value.get() if filename == 'base': if not isdir(makedict_dir): mkdir(makedict_dir)