diff --git a/src/rougail/config.py b/src/rougail/config.py index 671693d7..948b8f62 100644 --- a/src/rougail/config.py +++ b/src/rougail/config.py @@ -3,17 +3,20 @@ fichier de configuration pour rougail """ -from os.path import join, isfile, abspath, dirname -from pathlib import Path +from os.path import join, abspath, dirname -rougailroot = '/var/rougail' -patch_dir = join(rougailroot, 'patches') -manifests_dir = join(rougailroot, 'manifests') -templates_dir = join(rougailroot, 'templates') + +rougailroot = '/var/rougail' dtddir = join(dirname(abspath(__file__)), 'data') -dtdfilename = join(dtddir, 'rougail.dtd') -# chemin du répertoire source des fichiers templates -patch_dir = '/srv/rougail/patch' -variable_namespace = 'rougail' +Config = {'rougailroot': rougailroot, + 'patch_dir': join(rougailroot, 'patches'), + 'manifests_dir': join(rougailroot, 'manifests'), + 'templates_dir': join(rougailroot, 'templates'), + 'dtdfilename': join(dtddir, 'rougail.dtd'), + 'dtddir': dtddir, + # chemin du répertoire source des fichiers templates + 'patch_dir': '/srv/rougail/patch', + 'variable_namespace': 'rougail', + } diff --git a/src/rougail/objspace.py b/src/rougail/objspace.py index 4b076f5d..cc205a3e 100644 --- a/src/rougail/objspace.py +++ b/src/rougail/objspace.py @@ -32,7 +32,7 @@ from .tiramisureflector import TiramisuReflector from .utils import normalize_family from .error import OperationError, SpaceObjShallNotBeUpdated, DictConsistencyError from .path import Path -from .config import variable_namespace +from .config import Config # CreoleObjSpace's elements like 'family' or 'follower', that shall be forced to the Redefinable type FORCE_REDEFINABLES = ('family', 'follower', 'service', 'disknod', 'variables') @@ -329,7 +329,7 @@ class CreoleObjSpace: def is_already_exists(self, name, space, child, namespace): if isinstance(space, self.family): # pylint: disable=E1101 - if namespace != variable_namespace: + if namespace != Config['variable_namespace']: name = space.path + '.' + name return self.paths.path_is_defined(name) if child.tag == 'family': @@ -362,14 +362,14 @@ class CreoleObjSpace: else: norm_name = name return getattr(family, variable.tag)[norm_name] - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: path = name else: path = family.path + '.' + name old_family_name = self.paths.get_variable_family_name(path) if normalize_family(family.name) == old_family_name: return getattr(family, variable.tag)[name] - old_family = self.space.variables[variable_namespace].family[old_family_name] # pylint: disable=E1101 + old_family = self.space.variables[Config['variable_namespace']].family[old_family_name] # pylint: disable=E1101 variable_obj = old_family.variable[name] del old_family.variable[name] if 'variable' not in vars(family): @@ -501,7 +501,7 @@ class CreoleObjSpace: document.attrib.get('dynamic') != None, variableobj) if child.attrib.get('redefine', 'False') == 'True': - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: self.redefine_variables.append(child.attrib['name']) else: self.redefine_variables.append(namespace + '.' + family_name + '.' + @@ -509,7 +509,7 @@ class CreoleObjSpace: elif child.tag == 'family': family_name = normalize_family(child.attrib['name']) - if namespace != variable_namespace: + if namespace != Config['variable_namespace']: family_name = namespace + '.' + family_name self.paths.add_family(namespace, family_name, diff --git a/src/rougail/path.py b/src/rougail/path.py index 7f0c62db..d3fe8e81 100644 --- a/src/rougail/path.py +++ b/src/rougail/path.py @@ -1,7 +1,7 @@ from .i18n import _ from .utils import normalize_family from .error import OperationError, DictConsistencyError -from .config import variable_namespace +from .config import Config class Path: @@ -21,7 +21,7 @@ class Path: name: str, variableobj: str, ) -> str: # pylint: disable=C0111 - if '.' not in name and namespace == variable_namespace: + if '.' not in name and namespace == Config['variable_namespace']: full_name = '.'.join([namespace, name]) self.full_paths[name] = full_name else: @@ -41,12 +41,12 @@ class Path: check_name=False, allow_dot=True, ) - if '.' not in name and current_namespace == variable_namespace and name in self.full_paths: + if '.' not in name and current_namespace == Config['variable_namespace'] and name in self.full_paths: name = self.full_paths[name] if current_namespace is None: # pragma: no cover raise OperationError('current_namespace must not be None') dico = self.families[name] - if dico['namespace'] != variable_namespace and current_namespace != dico['namespace']: + if dico['namespace'] != Config['variable_namespace'] and current_namespace != dico['namespace']: raise DictConsistencyError(_('A family located in the {} namespace ' 'shall not be used in the {} namespace').format( dico['namespace'], current_namespace)) @@ -87,7 +87,7 @@ class Path: False, dico['variableobj'], ) - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: self.full_paths[name] = new_path else: name = new_path @@ -113,7 +113,7 @@ class Path: self.full_paths[name] = full_name else: full_name = name - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: name = name.rsplit('.', 1)[1] self.variables[full_name] = dict(name=name, family=family, @@ -157,7 +157,7 @@ class Path: else: dico = self._get_variable(name) if not allow_source: - if dico['namespace'] not in [variable_namespace, 'services'] and current_namespace != dico['namespace']: + if dico['namespace'] not in [Config['variable_namespace'], 'services'] and current_namespace != dico['namespace']: raise DictConsistencyError(_('A variable located in the {} namespace ' 'shall not be used in the {} namespace').format( dico['namespace'], current_namespace)) diff --git a/src/rougail/template.py b/src/rougail/template.py index fa87f9c5..a2d583b3 100644 --- a/src/rougail/template.py +++ b/src/rougail/template.py @@ -22,7 +22,7 @@ except: from tiramisu import Config from tiramisu.error import PropertiesOptionError -from .config import patch_dir, variable_namespace +from .config import Config from .error import FileNotFound, TemplateError from .i18n import _ from .utils import normalize_family @@ -294,7 +294,7 @@ class CreoleTemplateEngine: patch_no_debug = ['-s', '-r', '-', '--backup-if-mismatch'] # patches variante + locaux - for directory in [join(patch_dir, 'variante'), patch_dir]: + for directory in [join(Config['patch_dir'], 'variante'), Config['patch_dir']]: patch_file = join(directory, f'{filename}.patch') if isfile(patch_file): log.info(_("Patching template '{filename}' with '{patch_file}'")) @@ -376,7 +376,7 @@ class CreoleTemplateEngine: """ for option in await self.config.option.list(type='all'): namespace = await option.option.name() - if namespace == variable_namespace: + if namespace == Config['variable_namespace']: await self.load_eole_variables_rougail(option) else: families = await self.load_eole_variables(namespace, diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index dcaf5197..dde73e9e 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -1,10 +1,7 @@ """loader flattened XML specific """ -from os.path import isfile -from lxml.etree import DTD - -from .config import dtdfilename, variable_namespace +from .config import Config from .i18n import _ from .error import LoaderError from .annotator import ERASED_ATTRIBUTES @@ -83,10 +80,10 @@ class TiramisuReflector: # variable_namespace family has to be loaded before any other family # because `extra` family could use `variable_namespace` variables. if hasattr(xmlroot, 'variables'): - if variable_namespace in xmlroot.variables: - yield xmlroot.variables[variable_namespace] + if Config['variable_namespace'] in xmlroot.variables: + yield xmlroot.variables[Config['variable_namespace']] for xmlelt, value in xmlroot.variables.items(): - if xmlelt != variable_namespace: + if xmlelt != Config['variable_namespace']: yield value if hasattr(xmlroot, 'services'): yield xmlroot.services diff --git a/tests/dictionaries/00empty/tiramisu/base.py b/tests/dictionaries/00empty/tiramisu/base.py index 0880c343..500aecf5 100644 --- a/tests/dictionaries/00empty/tiramisu/base.py +++ b/tests/dictionaries/00empty/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_autofreeze/tiramisu/base.py b/tests/dictionaries/00load_autofreeze/tiramisu/base.py index f27b6624..4d92e9f0 100644 --- a/tests/dictionaries/00load_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreeze/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py index 3b002f00..446cb043 100644 --- a/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_autosave/tiramisu/base.py b/tests/dictionaries/00load_autosave/tiramisu/base.py index 3b53f31f..6a1fa723 100644 --- a/tests/dictionaries/00load_autosave/tiramisu/base.py +++ b/tests/dictionaries/00load_autosave/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py index 3397df0a..a5e922f7 100644 --- a/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/00load_autosaveexpert/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_comment/tiramisu/base.py b/tests/dictionaries/00load_comment/tiramisu/base.py index 64eda118..f844f854 100644 --- a/tests/dictionaries/00load_comment/tiramisu/base.py +++ b/tests/dictionaries/00load_comment/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_notype/tiramisu/base.py b/tests/dictionaries/00load_notype/tiramisu/base.py index 95b717c4..1a591eac 100644 --- a/tests/dictionaries/00load_notype/tiramisu/base.py +++ b/tests/dictionaries/00load_notype/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_save/tiramisu/base.py b/tests/dictionaries/00load_save/tiramisu/base.py index 64eda118..f844f854 100644 --- a/tests/dictionaries/00load_save/tiramisu/base.py +++ b/tests/dictionaries/00load_save/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/00load_subfolder/tiramisu/base.py b/tests/dictionaries/00load_subfolder/tiramisu/base.py index ad8747f2..9daa0bf4 100644 --- a/tests/dictionaries/00load_subfolder/tiramisu/base.py +++ b/tests/dictionaries/00load_subfolder/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01auto_base/tiramisu/base.py b/tests/dictionaries/01auto_base/tiramisu/base.py index 70b6d7d4..f5e62662 100644 --- a/tests/dictionaries/01auto_base/tiramisu/base.py +++ b/tests/dictionaries/01auto_base/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py index d19917ea..f4dabd5c 100644 --- a/tests/dictionaries/01auto_withoutparam/tiramisu/base.py +++ b/tests/dictionaries/01auto_withoutparam/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01base_multi/tiramisu/base.py b/tests/dictionaries/01base_multi/tiramisu/base.py index d171a661..3142ff75 100644 --- a/tests/dictionaries/01base_multi/tiramisu/base.py +++ b/tests/dictionaries/01base_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py index 868c5318..80f274a7 100644 --- a/tests/dictionaries/01fill_autofreeze/tiramisu/base.py +++ b/tests/dictionaries/01fill_autofreeze/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_autosave/tiramisu/base.py b/tests/dictionaries/01fill_autosave/tiramisu/base.py index 76d431b1..5a2b79f9 100644 --- a/tests/dictionaries/01fill_autosave/tiramisu/base.py +++ b/tests/dictionaries/01fill_autosave/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_base/tiramisu/base.py b/tests/dictionaries/01fill_base/tiramisu/base.py index 70b6d7d4..f5e62662 100644 --- a/tests/dictionaries/01fill_base/tiramisu/base.py +++ b/tests/dictionaries/01fill_base/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_baseaccent/tiramisu/base.py b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py index c6e5617b..e40af6b5 100644 --- a/tests/dictionaries/01fill_baseaccent/tiramisu/base.py +++ b/tests/dictionaries/01fill_baseaccent/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_mandatory/tiramisu/base.py b/tests/dictionaries/01fill_mandatory/tiramisu/base.py index 2d7b9eb7..97c28412 100644 --- a/tests/dictionaries/01fill_mandatory/tiramisu/base.py +++ b/tests/dictionaries/01fill_mandatory/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_number/tiramisu/base.py b/tests/dictionaries/01fill_number/tiramisu/base.py index ec49bb29..c6820d77 100644 --- a/tests/dictionaries/01fill_number/tiramisu/base.py +++ b/tests/dictionaries/01fill_number/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01fill_optional/tiramisu/base.py b/tests/dictionaries/01fill_optional/tiramisu/base.py index 70b6d7d4..f5e62662 100644 --- a/tests/dictionaries/01fill_optional/tiramisu/base.py +++ b/tests/dictionaries/01fill_optional/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01separator_base/tiramisu/base.py b/tests/dictionaries/01separator_base/tiramisu/base.py index 42b2bef1..5f2f202d 100644 --- a/tests/dictionaries/01separator_base/tiramisu/base.py +++ b/tests/dictionaries/01separator_base/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/01separator_neverhidden/tiramisu/base.py b/tests/dictionaries/01separator_neverhidden/tiramisu/base.py index 42b2bef1..5f2f202d 100644 --- a/tests/dictionaries/01separator_neverhidden/tiramisu/base.py +++ b/tests/dictionaries/01separator_neverhidden/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10autosave_hidden/tiramisu/base.py b/tests/dictionaries/10autosave_hidden/tiramisu/base.py index be3ee64b..cae64eb6 100644 --- a/tests/dictionaries/10autosave_hidden/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py b/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py index 940dec06..c3577921 100644 --- a/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_base/tiramisu/base.py b/tests/dictionaries/10check_base/tiramisu/base.py index 0714a46a..7f214b7c 100644 --- a/tests/dictionaries/10check_base/tiramisu/base.py +++ b/tests/dictionaries/10check_base/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_no_param/tiramisu/base.py b/tests/dictionaries/10check_no_param/tiramisu/base.py index 0f50c219..06281772 100644 --- a/tests/dictionaries/10check_no_param/tiramisu/base.py +++ b/tests/dictionaries/10check_no_param/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_option/tiramisu/base.py b/tests/dictionaries/10check_option/tiramisu/base.py index 8aadae15..9b07c753 100644 --- a/tests/dictionaries/10check_option/tiramisu/base.py +++ b/tests/dictionaries/10check_option/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_optional/tiramisu/base.py b/tests/dictionaries/10check_optional/tiramisu/base.py index 3f3624fd..e921d87f 100644 --- a/tests/dictionaries/10check_optional/tiramisu/base.py +++ b/tests/dictionaries/10check_optional/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_valid_differ/tiramisu/base.py b/tests/dictionaries/10check_valid_differ/tiramisu/base.py index 9f3dd4e1..71e1ef29 100644 --- a/tests/dictionaries/10check_valid_differ/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py index 2a63d45e..a4da3a01 100644 --- a/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_add/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py index 2a63d45e..a4da3a01 100644 --- a/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py index 257a7fa8..0b90eb8d 100644 --- a/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py +++ b/tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_append/tiramisu/base.py b/tests/dictionaries/10leadership_append/tiramisu/base.py index ddfd2f9d..cce65d89 100644 --- a/tests/dictionaries/10leadership_append/tiramisu/base.py +++ b/tests/dictionaries/10leadership_append/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_auto/tiramisu/base.py b/tests/dictionaries/10leadership_auto/tiramisu/base.py index e4d24aeb..5835c366 100644 --- a/tests/dictionaries/10leadership_auto/tiramisu/base.py +++ b/tests/dictionaries/10leadership_auto/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py index 6448449f..39832fd8 100644 --- a/tests/dictionaries/10leadership_autoleader/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py index d6b8f5a7..d727ed5e 100644 --- a/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py index 61734425..d3be72cc 100644 --- a/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py +++ b/tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py index 37283384..76d72b2d 100644 --- a/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py +++ b/tests/dictionaries/10leadership_familyaccent/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py index d22e7706..c6d13baf 100644 --- a/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') 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 1af8dc0e..db1659cc 100644 --- a/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py index 510fe5d1..fdc74c7e 100644 --- a/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py index f1e8f406..00f0730b 100644 --- a/tests/dictionaries/10leadership_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatory/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py index 80fde6fc..f1d54453 100644 --- a/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py +++ b/tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10leadership_multi/tiramisu/base.py b/tests/dictionaries/10leadership_multi/tiramisu/base.py index a602ea8a..84a460e1 100644 --- a/tests/dictionaries/10leadership_multi/tiramisu/base.py +++ b/tests/dictionaries/10leadership_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py index 63688927..e7daeb0c 100644 --- a/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') 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 bbbbd68c..c5a6d70c 100644 --- a/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py index 9392126d..e546c4e3 100644 --- a/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py +++ b/tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') 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 88f27ba3..49562737 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 @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') 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 88f27ba3..49562737 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 @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py index d90a098b..d02fe4ed 100644 --- a/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py index 202d3967..199de4ae 100644 --- a/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py index 202d3967..199de4ae 100644 --- a/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py +++ b/tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py index b71f0692..b817fcbc 100644 --- a/tests/dictionaries/10load_emptyvalue/tiramisu/base.py +++ b/tests/dictionaries/10load_emptyvalue/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_frozenifin/tiramisu/base.py b/tests/dictionaries/10load_frozenifin/tiramisu/base.py index 7fc798c3..4df1f359 100644 --- a/tests/dictionaries/10load_frozenifin/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py index afa70831..bdd4bd8c 100644 --- a/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py index 90bd320c..ee740c1b 100644 --- a/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py index 4882df10..6480984e 100644 --- a/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py +++ b/tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py index 1a2e8cb5..4ba2c60c 100644 --- a/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py +++ b/tests/dictionaries/10load_hidden_if_family/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership/tiramisu/base.py b/tests/dictionaries/10load_leadership/tiramisu/base.py index c6138847..e76a39da 100644 --- a/tests/dictionaries/10load_leadership/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py index e0c00fc4..5e61121e 100644 --- a/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py index 18716274..46b6c316 100644 --- a/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py index 9b2a0284..118ccabd 100644 --- a/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership_description/tiramisu/base.py b/tests/dictionaries/10load_leadership_description/tiramisu/base.py index fbf6894e..14f289ec 100644 --- a/tests/dictionaries/10load_leadership_description/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_description/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py index 08c16804..5de69a55 100644 --- a/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py index 75949068..6e718c9e 100644 --- a/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py +++ b/tests/dictionaries/10load_leadership_submulti/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py index 22dafbdb..171b5779 100644 --- a/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py +++ b/tests/dictionaries/10load_mandatoryifin/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10load_multivalue/tiramisu/base.py b/tests/dictionaries/10load_multivalue/tiramisu/base.py index 051d030a..64f2ab6f 100644 --- a/tests/dictionaries/10load_multivalue/tiramisu/base.py +++ b/tests/dictionaries/10load_multivalue/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py index 6136c843..3d20cc4d 100644 --- a/tests/dictionaries/10valid_enum_accent/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_accent/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_base/tiramisu/base.py b/tests/dictionaries/10valid_enum_base/tiramisu/base.py index a3aef0a4..7a7b32c1 100644 --- a/tests/dictionaries/10valid_enum_base/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py index 6672f05b..43da0cea 100644 --- a/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py index f6fe39fc..637aec54 100644 --- a/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py index aa1123e2..0fccef13 100644 --- a/tests/dictionaries/10valid_enum_leader/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_leader/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py index 45bbebca..4e58e1ea 100644 --- a/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py index d07d09ef..1827a4f8 100644 --- a/tests/dictionaries/10valid_enum_multi/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_none/tiramisu/base.py b/tests/dictionaries/10valid_enum_none/tiramisu/base.py index 14da9bcf..cebbf612 100644 --- a/tests/dictionaries/10valid_enum_none/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_none/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_number/tiramisu/base.py b/tests/dictionaries/10valid_enum_number/tiramisu/base.py index 28ee6867..be2400c6 100644 --- a/tests/dictionaries/10valid_enum_number/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_number/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py index ea6abb5b..413790a2 100644 --- a/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_python/tiramisu/base.py b/tests/dictionaries/10valid_enum_python/tiramisu/base.py index 3e41acca..78f0f8a3 100644 --- a/tests/dictionaries/10valid_enum_python/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_python/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/10valid_enum_value/tiramisu/base.py b/tests/dictionaries/10valid_enum_value/tiramisu/base.py index 143b7e76..e4c891e0 100644 --- a/tests/dictionaries/10valid_enum_value/tiramisu/base.py +++ b/tests/dictionaries/10valid_enum_value/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py index 9a588098..54331695 100644 --- a/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') 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 663faf41..99c29cd7 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') 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 cdc3d4ad..0c5bc268 100644 --- a/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py index 089f0f48..29af91a5 100644 --- a/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py index 089f0f48..29af91a5 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py index 089f0f48..29af91a5 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py index 11e4ace2..d0652baa 100644 --- a/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py +++ b/tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py index d20fd531..5eaf2816 100644 --- a/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py +++ b/tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_append/tiramisu/base.py b/tests/dictionaries/20family_append/tiramisu/base.py index d605b02f..5265212c 100644 --- a/tests/dictionaries/20family_append/tiramisu/base.py +++ b/tests/dictionaries/20family_append/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_appendaccent/tiramisu/base.py b/tests/dictionaries/20family_appendaccent/tiramisu/base.py index 84781c42..f0d24a78 100644 --- a/tests/dictionaries/20family_appendaccent/tiramisu/base.py +++ b/tests/dictionaries/20family_appendaccent/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_dynamic/tiramisu/base.py b/tests/dictionaries/20family_dynamic/tiramisu/base.py index 89d10529..5e330242 100644 --- a/tests/dictionaries/20family_dynamic/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py index 8048c18b..c6a6ec95 100644 --- a/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_calc/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py index 3021baf3..710a1b52 100644 --- a/tests/dictionaries/20family_dynamic_number/tiramisu/base.py +++ b/tests/dictionaries/20family_dynamic_number/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_empty/tiramisu/base.py b/tests/dictionaries/20family_empty/tiramisu/base.py index 1a498a0f..87d36ec4 100644 --- a/tests/dictionaries/20family_empty/tiramisu/base.py +++ b/tests/dictionaries/20family_empty/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_hidden/tiramisu/base.py b/tests/dictionaries/20family_hidden/tiramisu/base.py index ab28cd29..511914f5 100644 --- a/tests/dictionaries/20family_hidden/tiramisu/base.py +++ b/tests/dictionaries/20family_hidden/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_mode/tiramisu/base.py b/tests/dictionaries/20family_mode/tiramisu/base.py index 1a498a0f..87d36ec4 100644 --- a/tests/dictionaries/20family_mode/tiramisu/base.py +++ b/tests/dictionaries/20family_mode/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20family_modeleadership/tiramisu/base.py b/tests/dictionaries/20family_modeleadership/tiramisu/base.py index 95b2342e..c93cccdc 100644 --- a/tests/dictionaries/20family_modeleadership/tiramisu/base.py +++ b/tests/dictionaries/20family_modeleadership/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20notemplating/tiramisu/base.py b/tests/dictionaries/20notemplating/tiramisu/base.py index 3d6f1baa..1c78ea07 100644 --- a/tests/dictionaries/20notemplating/tiramisu/base.py +++ b/tests/dictionaries/20notemplating/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/20override/tiramisu/base.py b/tests/dictionaries/20override/tiramisu/base.py index 54a6fd2b..dea870ab 100644 --- a/tests/dictionaries/20override/tiramisu/base.py +++ b/tests/dictionaries/20override/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/21family_change/tiramisu/base.py b/tests/dictionaries/21family_change/tiramisu/base.py index 57cf2f2e..f8cfc872 100644 --- a/tests/dictionaries/21family_change/tiramisu/base.py +++ b/tests/dictionaries/21family_change/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/21family_changeaccent/tiramisu/base.py b/tests/dictionaries/21family_changeaccent/tiramisu/base.py index 3e2956c2..cd8fc809 100644 --- a/tests/dictionaries/21family_changeaccent/tiramisu/base.py +++ b/tests/dictionaries/21family_changeaccent/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/21family_empty/tiramisu/base.py b/tests/dictionaries/21family_empty/tiramisu/base.py index f6fe39fc..637aec54 100644 --- a/tests/dictionaries/21family_empty/tiramisu/base.py +++ b/tests/dictionaries/21family_empty/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py index 9d94926d..e0a63eeb 100644 --- a/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvalue/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py index 76789e5f..f01e932b 100644 --- a/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withoutvaluecalc/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py index 1de984bf..28cfbf16 100644 --- a/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvalue/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py index 925bcc2a..e333ae87 100644 --- a/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py +++ b/tests/dictionaries/30mandatory_withvaluecalc/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40condition_base/tiramisu/base.py b/tests/dictionaries/40condition_base/tiramisu/base.py index 033f538e..2c557ea2 100644 --- a/tests/dictionaries/40condition_base/tiramisu/base.py +++ b/tests/dictionaries/40condition_base/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40condition_fallback/tiramisu/base.py b/tests/dictionaries/40condition_fallback/tiramisu/base.py index e6b9072c..75ef8f53 100644 --- a/tests/dictionaries/40condition_fallback/tiramisu/base.py +++ b/tests/dictionaries/40condition_fallback/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40condition_optional/tiramisu/base.py b/tests/dictionaries/40condition_optional/tiramisu/base.py index 64367a39..34bba746 100644 --- a/tests/dictionaries/40condition_optional/tiramisu/base.py +++ b/tests/dictionaries/40condition_optional/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py index 4de3e2af..5ed4ca22 100644 --- a/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py +++ b/tests/dictionaries/40hidden_if_in_group_fallback/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40ifin_leadership/tiramisu/base.py b/tests/dictionaries/40ifin_leadership/tiramisu/base.py index b362c189..067f9fef 100644 --- a/tests/dictionaries/40ifin_leadership/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadership/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py index 5f34a798..f789d141 100644 --- a/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py +++ b/tests/dictionaries/40ifin_leadershipauto/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40ifin_multi/tiramisu/base.py b/tests/dictionaries/40ifin_multi/tiramisu/base.py index 1d563b50..8afb6dd5 100644 --- a/tests/dictionaries/40ifin_multi/tiramisu/base.py +++ b/tests/dictionaries/40ifin_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/40ifin_validenum/tiramisu/base.py b/tests/dictionaries/40ifin_validenum/tiramisu/base.py index 94d8ca34..ea11621c 100644 --- a/tests/dictionaries/40ifin_validenum/tiramisu/base.py +++ b/tests/dictionaries/40ifin_validenum/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/50exists_exists/tiramisu/base.py b/tests/dictionaries/50exists_exists/tiramisu/base.py index aaf49488..28d6035d 100644 --- a/tests/dictionaries/50exists_exists/tiramisu/base.py +++ b/tests/dictionaries/50exists_exists/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/50redefine_description/tiramisu/base.py b/tests/dictionaries/50redefine_description/tiramisu/base.py index 7a63133f..2181f454 100644 --- a/tests/dictionaries/50redefine_description/tiramisu/base.py +++ b/tests/dictionaries/50redefine_description/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51exists_nonexists/tiramisu/base.py b/tests/dictionaries/51exists_nonexists/tiramisu/base.py index cd622630..9d06935b 100644 --- a/tests/dictionaries/51exists_nonexists/tiramisu/base.py +++ b/tests/dictionaries/51exists_nonexists/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_auto/tiramisu/base.py b/tests/dictionaries/51redefine_auto/tiramisu/base.py index f494a889..7d6ad8fe 100644 --- a/tests/dictionaries/51redefine_auto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_auto/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_autofill/tiramisu/base.py b/tests/dictionaries/51redefine_autofill/tiramisu/base.py index 62a034bf..633df0c6 100644 --- a/tests/dictionaries/51redefine_autofill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_autofill/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_family/tiramisu/base.py b/tests/dictionaries/51redefine_family/tiramisu/base.py index 7378d584..a32b8aaf 100644 --- a/tests/dictionaries/51redefine_family/tiramisu/base.py +++ b/tests/dictionaries/51redefine_family/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_fill/tiramisu/base.py b/tests/dictionaries/51redefine_fill/tiramisu/base.py index f494a889..7d6ad8fe 100644 --- a/tests/dictionaries/51redefine_fill/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fill/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py index f494a889..7d6ad8fe 100644 --- a/tests/dictionaries/51redefine_fillauto/tiramisu/base.py +++ b/tests/dictionaries/51redefine_fillauto/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_help/tiramisu/base.py b/tests/dictionaries/51redefine_help/tiramisu/base.py index ad08864c..0d37ca12 100644 --- a/tests/dictionaries/51redefine_help/tiramisu/base.py +++ b/tests/dictionaries/51redefine_help/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_hidden/tiramisu/base.py b/tests/dictionaries/51redefine_hidden/tiramisu/base.py index c14b3665..e821fad7 100644 --- a/tests/dictionaries/51redefine_hidden/tiramisu/base.py +++ b/tests/dictionaries/51redefine_hidden/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_remove_check/tiramisu/base.py b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py index c1e19b59..2dd59246 100644 --- a/tests/dictionaries/51redefine_remove_check/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_check/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py index 669a75f0..01573329 100644 --- a/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py +++ b/tests/dictionaries/51redefine_remove_condition/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py index 88f66fec..83c1759d 100644 --- a/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_alltarget/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py index b346290c..10e02322 100644 --- a/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py +++ b/tests/dictionaries/51redefine_removecondition_nonautofreeze/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_validenum/tiramisu/base.py b/tests/dictionaries/51redefine_validenum/tiramisu/base.py index 7d76b030..9d9bf3c8 100644 --- a/tests/dictionaries/51redefine_validenum/tiramisu/base.py +++ b/tests/dictionaries/51redefine_validenum/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/51redefine_value/tiramisu/base.py b/tests/dictionaries/51redefine_value/tiramisu/base.py index d80106c8..a0770820 100644 --- a/tests/dictionaries/51redefine_value/tiramisu/base.py +++ b/tests/dictionaries/51redefine_value/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/52exists_redefine/tiramisu/base.py b/tests/dictionaries/52exists_redefine/tiramisu/base.py index 4ed67844..d2979842 100644 --- a/tests/dictionaries/52exists_redefine/tiramisu/base.py +++ b/tests/dictionaries/52exists_redefine/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60action_external/tiramisu/base.py b/tests/dictionaries/60action_external/tiramisu/base.py index df2b7630..fe33ac79 100644 --- a/tests/dictionaries/60action_external/tiramisu/base.py +++ b/tests/dictionaries/60action_external/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py index 2b6ba8d0..e47255da 100644 --- a/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py +++ b/tests/dictionaries/60extra_externalspacecondition/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_group/tiramisu/base.py b/tests/dictionaries/60extra_group/tiramisu/base.py index 12947142..ac6e938c 100644 --- a/tests/dictionaries/60extra_group/tiramisu/base.py +++ b/tests/dictionaries/60extra_group/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_help/tiramisu/base.py b/tests/dictionaries/60extra_help/tiramisu/base.py index e8f360e4..3a52bb30 100644 --- a/tests/dictionaries/60extra_help/tiramisu/base.py +++ b/tests/dictionaries/60extra_help/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_load/tiramisu/base.py b/tests/dictionaries/60extra_load/tiramisu/base.py index 0f20874c..614ae51d 100644 --- a/tests/dictionaries/60extra_load/tiramisu/base.py +++ b/tests/dictionaries/60extra_load/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_mandatory/tiramisu/base.py b/tests/dictionaries/60extra_mandatory/tiramisu/base.py index ffc3f524..6fa684cc 100644 --- a/tests/dictionaries/60extra_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60extra_mandatory/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_redefine/tiramisu/base.py b/tests/dictionaries/60extra_redefine/tiramisu/base.py index ad395ced..cb9a21a5 100644 --- a/tests/dictionaries/60extra_redefine/tiramisu/base.py +++ b/tests/dictionaries/60extra_redefine/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60extra_separators/tiramisu/base.py b/tests/dictionaries/60extra_separators/tiramisu/base.py index 6b7e4e09..ca8fe373 100644 --- a/tests/dictionaries/60extra_separators/tiramisu/base.py +++ b/tests/dictionaries/60extra_separators/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60familyaction/tiramisu/base.py b/tests/dictionaries/60familyaction/tiramisu/base.py index f2d0e099..bc31e3a2 100644 --- a/tests/dictionaries/60familyaction/tiramisu/base.py +++ b/tests/dictionaries/60familyaction/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60familyaction_accent/tiramisu/base.py b/tests/dictionaries/60familyaction_accent/tiramisu/base.py index f2d0e099..bc31e3a2 100644 --- a/tests/dictionaries/60familyaction_accent/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_accent/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py index d867defe..eba4dcf7 100644 --- a/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py +++ b/tests/dictionaries/60familyaction_mandatory/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_files/tiramisu/base.py b/tests/dictionaries/70container_files/tiramisu/base.py index 046db94b..5885ac5e 100644 --- a/tests/dictionaries/70container_files/tiramisu/base.py +++ b/tests/dictionaries/70container_files/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py index fb65db16..645333a6 100644 --- a/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py index ff1923c3..3568afc4 100644 --- a/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py +++ b/tests/dictionaries/70container_files_symlink_multi_variable/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_files_twice/tiramisu/base.py b/tests/dictionaries/70container_files_twice/tiramisu/base.py index c44727b4..0a2abddb 100644 --- a/tests/dictionaries/70container_files_twice/tiramisu/base.py +++ b/tests/dictionaries/70container_files_twice/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_filesmulti/tiramisu/base.py b/tests/dictionaries/70container_filesmulti/tiramisu/base.py index a219cf23..ab9a703c 100644 --- a/tests/dictionaries/70container_filesmulti/tiramisu/base.py +++ b/tests/dictionaries/70container_filesmulti/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_filesredefine/tiramisu/base.py b/tests/dictionaries/70container_filesredefine/tiramisu/base.py index 3349c2af..140c83d3 100644 --- a/tests/dictionaries/70container_filesredefine/tiramisu/base.py +++ b/tests/dictionaries/70container_filesredefine/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_new/tiramisu/base.py b/tests/dictionaries/70container_new/tiramisu/base.py index fa2c92b4..2ab86b31 100644 --- a/tests/dictionaries/70container_new/tiramisu/base.py +++ b/tests/dictionaries/70container_new/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_newnocont/tiramisu/base.py b/tests/dictionaries/70container_newnocont/tiramisu/base.py index a8f65365..976dbe69 100644 --- a/tests/dictionaries/70container_newnocont/tiramisu/base.py +++ b/tests/dictionaries/70container_newnocont/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_newwithip/tiramisu/base.py b/tests/dictionaries/70container_newwithip/tiramisu/base.py index 74982c5f..225e702a 100644 --- a/tests/dictionaries/70container_newwithip/tiramisu/base.py +++ b/tests/dictionaries/70container_newwithip/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_pathaccess/tiramisu/base.py b/tests/dictionaries/70container_pathaccess/tiramisu/base.py index 8478bedf..6bce2145 100644 --- a/tests/dictionaries/70container_pathaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py index 532c9442..05bdc205 100644 --- a/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py +++ b/tests/dictionaries/70container_pathaccess_leadership/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_save/tiramisu/base.py b/tests/dictionaries/70container_save/tiramisu/base.py index a677ef41..35b321c8 100644 --- a/tests/dictionaries/70container_save/tiramisu/base.py +++ b/tests/dictionaries/70container_save/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py index 9f1d758e..f0305311 100644 --- a/tests/dictionaries/70container_serviceaccess/tiramisu/base.py +++ b/tests/dictionaries/70container_serviceaccess/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py index dc331651..2d3a793b 100644 --- a/tests/dictionaries/70container_servicerestriction/tiramisu/base.py +++ b/tests/dictionaries/70container_servicerestriction/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70container_services/tiramisu/base.py b/tests/dictionaries/70container_services/tiramisu/base.py index ec256f8e..ab392227 100644 --- a/tests/dictionaries/70container_services/tiramisu/base.py +++ b/tests/dictionaries/70container_services/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/dictionaries/70services_unmanage/tiramisu/base.py b/tests/dictionaries/70services_unmanage/tiramisu/base.py index 7c1441a4..ae77a044 100644 --- a/tests/dictionaries/70services_unmanage/tiramisu/base.py +++ b/tests/dictionaries/70services_unmanage/tiramisu/base.py @@ -1,4 +1,7 @@ -from tiramisu import * +try: + from tiramisu3 import * +except: + from tiramisu import * from rougail.tiramisu import ConvertDynOptionDescription import imp func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py') diff --git a/tests/test_1_flattener.py b/tests/test_1_flattener.py index 7cb0b70e..d192702f 100644 --- a/tests/test_1_flattener.py +++ b/tests/test_1_flattener.py @@ -7,7 +7,7 @@ from json import load from rougail import objspace, annotator from rougail.xml_compare import xml_compare from rougail.error import DictConsistencyError -from rougail.config import dtdfilename, variable_namespace +from rougail.config import Config @@ -67,12 +67,12 @@ def compare_xml(exported_xmlfile, expected_xmlfile): def launch_flattener(test_dir, test_ok=False): debug = False #debug = True - eolobj = objspace.CreoleObjSpace(dtdfilename) + eolobj = objspace.CreoleObjSpace(Config['dtdfilename']) dirs = [test_dir] subfolder = join(test_dir, 'subfolder') if isdir(subfolder): dirs.append(subfolder) - eolobj.create_or_populate_from_xml(variable_namespace, dirs) + eolobj.create_or_populate_from_xml(Config['variable_namespace'], dirs) subfolder = join(test_dir, 'extra_dirs', 'extra') if isdir(subfolder): eolobj.create_or_populate_from_xml('extra', [subfolder]) diff --git a/tests/test_2_makedict.py b/tests/test_2_makedict.py index 02d43a14..5657d98e 100644 --- a/tests/test_2_makedict.py +++ b/tests/test_2_makedict.py @@ -7,7 +7,7 @@ from json import dump, load, dumps, loads from tiramisu import Config -dico_dirs = 'tests/flattener_dicos' +dico_dirs = 'tests/dictionaries' test_ok = set() diff --git a/tests/test_3_template.py b/tests/test_3_template.py index 71468d3d..dbaf974c 100644 --- a/tests/test_3_template.py +++ b/tests/test_3_template.py @@ -6,7 +6,6 @@ from lxml.etree import parse from tiramisu import Config from rougail import template -from rougail.config import dtdfilename template_dirs = 'tests/dictionaries'