remove xml_compare

src/rougail/annotator.py

@@ -5,7 +5,7 @@ from typing import List
 from collections import OrderedDict
 from os.path import join, basename
 from ast import literal_eval
-import imp
+from importlib.machinery import SourceFileLoader
 
 
 from .i18n import _
@@ -640,7 +640,7 @@ class ConstraintAnnotator:
         if not hasattr(objectspace.space, 'constraints'):
             return
         self.objectspace = objectspace
-        eosfunc = imp.load_source('eosfunc', eosfunc_file)
+        eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
         self.functions = dir(eosfunc)
         self.functions.extend(INTERNAL_FUNCTIONS)
         self.valid_enums = {}

src/rougail/template.py

@@ -4,7 +4,7 @@ Gestion du mini-langage de template
 On travaille sur les fichiers cibles
 """
 
-import imp
+from importlib.machinery import SourceFileLoader
 from shutil import copy
 import logging
 from typing import Dict, Any
@@ -252,7 +252,7 @@ class CreoleTemplateEngine:
         self.distrib_dir = distrib_dir
         eos = {}
         if eosfunc_file is not None:
-            eosfunc = imp.load_source('eosfunc', eosfunc_file)
+            eosfunc = SourceFileLoader('eosfunc', eosfunc_file).load_module()
             for func in dir(eosfunc):
                  if not func.startswith('_'):
                      eos[func] = getattr(eosfunc, func)

src/rougail/tiramisureflector.py

@@ -18,10 +18,10 @@ class TiramisuReflector:
                  funcs_path,
                  ):
         self.storage = ElementStorage()
-        self.storage.text = ["import imp",
+        self.storage.text = ["from importlib.machinery import SourceFileLoader",
-                             f"func = imp.load_source('func', '{funcs_path}')",
+                             f"func = SourceFileLoader('func', '{funcs_path}').load_module()",
                              "for key, value in dict(locals()).items():",
-                             "    if key != ['imp', 'func']:",
+                             "    if key != ['SourceFileLoader', 'func']:",
                              "        setattr(func, key, value)",
                              "try:",
                              "    from tiramisu3 import *",

src/rougail/xml_compare.py

@@ -1,161 +0,0 @@
-try:
-    import doctest
-    doctest.OutputChecker
-except (AttributeError, ImportError): # Python < 2.4
-    import util.doctest24 as doctest
-try:
-    import xml.etree.ElementTree as ET
-except ImportError:
-    import elementtree.ElementTree as ET
-from xml.parsers.expat import ExpatError as XMLParseError
-
-RealOutputChecker = doctest.OutputChecker
-
-
-def debug(*msg):
-    import sys
-    print >> sys.stderr, ' '.join(map(str, msg))
-
-
-class HTMLOutputChecker(RealOutputChecker):
-
-    def check_output(self, want, got, optionflags):
-        normal = RealOutputChecker.check_output(self, want, got, optionflags)
-        if normal or not got:
-            return normal
-        try:
-            want_xml = make_xml(want)
-        except XMLParseError:
-            pass
-        else:
-            try:
-                got_xml = make_xml(got)
-            except XMLParseError:
-                pass
-            else:
-                if xml_compare(want_xml, got_xml):
-                    return True
-        return False
-
-    def output_difference(self, example, got, optionflags):
-        actual = RealOutputChecker.output_difference(
-            self, example, got, optionflags)
-        want_xml = got_xml = None
-        try:
-            want_xml = make_xml(example.want)
-            want_norm = make_string(want_xml)
-        except XMLParseError as e:
-            if example.want.startswith('<'):
-                want_norm = '(bad XML: %s)' % e
-                #  '<xml>%s</xml>' % example.want
-            else:
-                return actual
-        try:
-            got_xml = make_xml(got)
-            got_norm = make_string(got_xml)
-        except XMLParseError as e:
-            if example.want.startswith('<'):
-                got_norm = '(bad XML: %s)' % e
-            else:
-                return actual
-        s = '%s\nXML Wanted: %s\nXML Got   : %s\n' % (
-            actual, want_norm, got_norm)
-        if got_xml and want_xml:
-            result = []
-            xml_compare(want_xml, got_xml, result.append)
-            s += 'Difference report:\n%s\n' % '\n'.join(result)
-        return s
-
-
-def xml_sort(children):
-    tcl1 = {}
-    #idx = 0
-
-    for child in children:
-        if 'name' in child.attrib:
-            key = child.attrib['name']
-        else:
-            key = child.tag
-        if key not in tcl1:
-            tcl1[key] = []
-        tcl1[key].append(child)
-    cl1_keys = list(tcl1.keys())
-    cl1_keys.sort()
-    cl1 = []
-    for key in cl1_keys:
-        cl1.extend(tcl1[key])
-    return cl1
-
-def xml_compare(x1, x2):
-    if x1.tag != x2.tag:
-        print ('Tags do not match: %s and %s' % (x1.tag, x2.tag))
-        return False
-    for name, value in x1.attrib.items():
-        if x2.attrib.get(name) != value:
-            print ('Attributes do not match: %s=%r, %s=%r'
-                     % (name, value, name, x2.attrib.get(name)))
-            return False
-    for name in x2.attrib:
-        if name not in x1.attrib:
-            print ('x2 has an attribute x1 is missing: %s'
-                     % name)
-            return False
-    if not text_compare(x1.text, x2.text):
-        print ('text: %r != %r' % (x1.text, x2.text))
-        return False
-    if not text_compare(x1.tail, x2.tail):
-        print ('tail: %r != %r' % (x1.tail, x2.tail))
-        return False
-
-    cl1 = xml_sort(x1.getchildren())
-    cl2 = xml_sort(x2.getchildren())
-
-    if len(cl1) != len(cl2):
-        cl1_tags = []
-        for c in cl1:
-            cl1_tags.append(c.tag)
-        cl2_tags = []
-        for c in cl2:
-            cl2_tags.append(c.tag)
-        print ('children length differs, %i != %i (%s != %s)'
-                 % (len(cl1), len(cl2), cl1_tags, cl2_tags))
-        return False
-    i = 0
-    for c1, c2 in zip(cl1, cl2):
-        i += 1
-        if not xml_compare(c1, c2):
-            if 'name' in c1.attrib:
-                name = c1.attrib['name']
-            else:
-                name = i
-            print ('in tag "%s" with name "%s"'
-                     % (c1.tag, name))
-            return False
-    return True
-
-
-def text_compare(t1, t2):
-    if not t1 and not t2:
-        return True
-    if t1 == '*' or t2 == '*':
-        return True
-    return (t1 or '').strip() == (t2 or '').strip()
-
-
-def make_xml(s):
-    return ET.XML('<xml>%s</xml>' % s)
-
-
-def make_string(xml):
-    if isinstance(xml, (str, unicode)):
-        xml = make_xml(xml)
-    s = ET.tostring(xml)
-    if s == '<xml />':
-        return ''
-    assert s.startswith('<xml>') and s.endswith('</xml>'), repr(s)
-    return s[5:-6]
-
-
-def install():
-    doctest.OutputChecker = HTMLOutputChecker
-

tests/dictionaries/00empty/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autofreeze/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autofreezeexpert/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autosave/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_autosaveexpert/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_comment/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_notype/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_save/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/00load_subfolder/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01auto_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01auto_withoutparam/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_file_include/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_file_patch/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_file_utfchar/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_float/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01base_var_name_same_family/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_autofreeze/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_autosave/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_baseaccent/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_mandatory/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_number/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01fill_optional/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01separator_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/01separator_neverhidden/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10autosave_hidden/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10autosave_hidden_frozenifin/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_no_param/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_option/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_optional/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_valid_differ/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_valid_differ_add/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_valid_differ_removecheck/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_valid_in_network/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_valid_in_network_cidr/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10check_valid_ipnetmask/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_append/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_auto/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_autoleader/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_autoleader_expert/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_autosaveexpert/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_familyaccent/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_leader_hidden/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_leader_hidden_if_in/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_leadermandatory/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_mandatory/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_mandatoryfollower/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10leadership_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabled_if_in/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabled_if_in_none/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabled_if_inaccent_family/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabled_if_not_in_fallback/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabled_if_not_in_fallback_force/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabledifin_fallback/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabledifin_fallback_force/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_disabledifin_whithouttype/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_emptyvalue/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_frozenifin/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_frozenifin_auto/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_frozenifin_multiparam/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_frozenifin_noexist/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_hidden_if_family/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_default_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_default_submulti/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_defaultmulti_leader/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_description/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_name/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_normalize_family/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_leadership_submulti/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_mandatoryifin/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10load_multivalue/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_accent/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_base/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_base_redefine/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_eosfunc/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_leader/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_mandatory/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_none/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_number/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_numberdefault/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_python/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/10valid_enum_value/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabled_if_in_filelist/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabled_if_in_filelist_disabled/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabled_if_in_filelist_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabledifin_filelist_notexist/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabledifnotin_filelist_notexist/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabledifnotin_filelist_notexist_multi/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11disabledifnotin_filelist_notexist_validenum/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/11multi_disabled_if_in_filelist/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/20family_append/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *

tests/dictionaries/20family_appendaccent/tiramisu/base.py

@@ -1,7 +1,7 @@
-import imp
+from importlib.machinery import SourceFileLoader
-func = imp.load_source('func', 'tests/dictionaries/../eosfunc/test.py')
+func = SourceFileLoader('func', 'tests/dictionaries/../eosfunc/test.py').load_module()
 for key, value in dict(locals()).items():
-    if key != ['imp', 'func']:
+    if key != ['SourceFileLoader', 'func']:
         setattr(func, key, value)
 try:
     from tiramisu3 import *