try tiramisu3 before tiramisu
This commit is contained in:
parent
4eb42e4290
commit
d3670c6476
|
@ -16,11 +16,11 @@ from Cheetah.Template import Template as ChtTemplate
|
||||||
from Cheetah.NameMapper import NotFound as CheetahNotFound
|
from Cheetah.NameMapper import NotFound as CheetahNotFound
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from tiramisu import Config
|
|
||||||
from tiramisu.error import PropertiesOptionError
|
|
||||||
except:
|
|
||||||
from tiramisu3 import Config
|
from tiramisu3 import Config
|
||||||
from tiramisu3.error import PropertiesOptionError
|
from tiramisu3.error import PropertiesOptionError
|
||||||
|
except:
|
||||||
|
from tiramisu import Config
|
||||||
|
from tiramisu.error import PropertiesOptionError
|
||||||
|
|
||||||
from .config import patch_dir, variable_namespace
|
from .config import patch_dir, variable_namespace
|
||||||
from .error import FileNotFound, TemplateError
|
from .error import FileNotFound, TemplateError
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
try:
|
try:
|
||||||
from tiramisu import DynOptionDescription
|
|
||||||
except:
|
|
||||||
from tiramisu3 import DynOptionDescription
|
from tiramisu3 import DynOptionDescription
|
||||||
|
except:
|
||||||
|
from tiramisu import DynOptionDescription
|
||||||
from .utils import normalize_family
|
from .utils import normalize_family
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -48,9 +48,9 @@ class TiramisuReflector:
|
||||||
):
|
):
|
||||||
self.storage = ElementStorage()
|
self.storage = ElementStorage()
|
||||||
self.storage.text = ["try:",
|
self.storage.text = ["try:",
|
||||||
" from tiramisu import *",
|
|
||||||
"except:",
|
|
||||||
" from tiramisu3 import *",
|
" from tiramisu3 import *",
|
||||||
|
"except:",
|
||||||
|
" from tiramisu import *",
|
||||||
"from rougail.tiramisu import ConvertDynOptionDescription",
|
"from rougail.tiramisu import ConvertDynOptionDescription",
|
||||||
"import imp",
|
"import imp",
|
||||||
f"func = imp.load_source('func', '{funcs_path}')",
|
f"func = imp.load_source('func', '{funcs_path}')",
|
||||||
|
|
Loading…
Reference in New Issue