src/rougail/template.py

@@ -15,12 +15,8 @@ from os.path import dirname, join, isfile
 from Cheetah.Template import Template as ChtTemplate
 from Cheetah.NameMapper import NotFound as CheetahNotFound
 
-try:
+from tiramisu import Config
-    from tiramisu import Config
+from tiramisu.error import PropertiesOptionError
-    from tiramisu.error import PropertiesOptionError
-except:
-    from tiramisu3 import Config
-    from tiramisu3.error import PropertiesOptionError
 
 from .config import patch_dir, variable_namespace
 from .error import FileNotFound, TemplateError

src/rougail/tiramisu.py

@@ -1,7 +1,4 @@
-try:
+from tiramisu import DynOptionDescription
-    from tiramisu import DynOptionDescription
-except:
-    from tiramisu3 import DynOptionDescription
 from .utils import normalize_family
 
 

src/rougail/tiramisureflector.py

@@ -47,10 +47,7 @@ class TiramisuReflector:
                  funcs_path,
                  ):
         self.storage = ElementStorage()
-        self.storage.text = ["try:",
+        self.storage.text = ["from tiramisu import *",
-                             "    from tiramisu import *",
-                             "except:",
-                             "    from tiramisu3 import *",
                              "from rougail.tiramisu import ConvertDynOptionDescription",
                              "import imp",
                              f"func = imp.load_source('func', '{funcs_path}')",

tests/test_2_makedict.py

@@ -5,6 +5,9 @@ from os import listdir, mkdir
 from json import dump, load, dumps, loads
 
 from tiramisu import Config
+from rougail.xml_compare import xml_compare
+from rougail.error import DictConsistencyError
+from rougail.config import dtdfilename
 
 
 dico_dirs = 'tests/flattener_dicos'