python3 and simplify import

tests/test_makedict.py

@@ -4,13 +4,11 @@ from pytest import fixture, raises
 from os import listdir, mkdir
 from json import dump, load, dumps, loads
 
-#from creole.xmlreflector import CreoleObjSpace, CreoleDictConsistencyError
-#from creole import xmlreflector
-from creole import objspace, annotator
-from creole.xml_compare import xml_compare
-from creole.error import CreoleDictConsistencyError
-from creole.loader import PopulateTiramisuObjects
-from creole.config import dtdfilename
+from tiramisu import Config
+from rougail import load as rougail_load
+from rougail.xml_compare import xml_compare
+from rougail.error import CreoleDictConsistencyError
+from rougail.config import dtdfilename
 
 
 dico_dirs = 'tests/flattener_dicos'
@@ -43,10 +41,10 @@ def launch_flattener(test_dir):
     cache_file = test_dir + '/result/00-base.xml'
     fileio = open(cache_file)
     xmlroot = etree.parse(fileio).getroot()
-    tiramisu_objects = PopulateTiramisuObjects()
-    tiramisu_objects.parse_dtd(dtdfilename)
-    tiramisu_objects.make_tiramisu_objects(xmlroot, eosfunc)
-    config = tiramisu_objects.build()
+    tiramisu_objects = rougail_load(xmlroot,
+                                    dtdfilename,
+                                    eosfunc)
+    config = Config(tiramisu_objects)
     config.property.read_write()
     makedict_dir = join(test_dir, 'makedict')
     makedict_file = join(makedict_dir, 'base.json')
@@ -64,22 +62,6 @@ def launch_flattener(test_dir):
             assert load(fh) == loads(dumps(config_dict))
 
 
-def fake_traduc(txt):
-    return txt
-
-
-def setup_module(module):
-    module.traduc_ori = objspace._
-    objspace._ = fake_traduc
-    annotator._ = fake_traduc
-    objspace.ContainerAnnotator = getattr(annotator, 'ContainerAnnotator')
-
-
-def teardown_module(module):
-    objspace._ = module.traduc_ori
-    annotator._ = module.traduc_ori
-
-
 def test_dictionary(test_dir):
     test_dir = join(dico_dirs, test_dir)
     launch_flattener(test_dir)