From d3670c6476d33f50b93512ea764cacc0b03d7a9d Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Sat, 8 Aug 2020 11:03:06 +0200 Subject: [PATCH] try tiramisu3 before tiramisu --- src/rougail/template.py | 6 +++--- src/rougail/tiramisu.py | 4 ++-- src/rougail/tiramisureflector.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rougail/template.py b/src/rougail/template.py index b715e1a9..fa87f9c5 100644 --- a/src/rougail/template.py +++ b/src/rougail/template.py @@ -16,11 +16,11 @@ 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 +except: + from tiramisu import Config + from tiramisu.error import PropertiesOptionError from .config import patch_dir, variable_namespace from .error import FileNotFound, TemplateError diff --git a/src/rougail/tiramisu.py b/src/rougail/tiramisu.py index caae09f2..44b3d259 100644 --- a/src/rougail/tiramisu.py +++ b/src/rougail/tiramisu.py @@ -1,7 +1,7 @@ try: - from tiramisu import DynOptionDescription -except: from tiramisu3 import DynOptionDescription +except: + from tiramisu import DynOptionDescription from .utils import normalize_family diff --git a/src/rougail/tiramisureflector.py b/src/rougail/tiramisureflector.py index 649c0b0a..dcaf5197 100644 --- a/src/rougail/tiramisureflector.py +++ b/src/rougail/tiramisureflector.py @@ -48,9 +48,9 @@ class TiramisuReflector: ): self.storage = ElementStorage() self.storage.text = ["try:", - " from tiramisu import *", - "except:", " from tiramisu3 import *", + "except:", + " from tiramisu import *", "from rougail.tiramisu import ConvertDynOptionDescription", "import imp", f"func = imp.load_source('func', '{funcs_path}')",