change Config object

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')