Merge branch 'develop' into dist/risotto/risotto-2.7.1/develop
This commit is contained in:
commit
0da8b868ac
@ -15,8 +15,12 @@ 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.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
|
||||
|
@ -1,4 +1,7 @@
|
||||
try:
|
||||
from tiramisu import DynOptionDescription
|
||||
except:
|
||||
from tiramisu3 import DynOptionDescription
|
||||
from .utils import normalize_family
|
||||
|
||||
|
||||
|
@ -47,7 +47,10 @@ class TiramisuReflector:
|
||||
funcs_path,
|
||||
):
|
||||
self.storage = ElementStorage()
|
||||
self.storage.text = ["from tiramisu import *",
|
||||
self.storage.text = ["try:",
|
||||
" from tiramisu import *",
|
||||
"except:",
|
||||
" from tiramisu3 import *",
|
||||
"from rougail.tiramisu import ConvertDynOptionDescription",
|
||||
"import imp",
|
||||
f"func = imp.load_source('func', '{funcs_path}')",
|
||||
|
@ -5,9 +5,6 @@ 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'
|
||||
|
Loading…
Reference in New Issue
Block a user