Mercurial > libervia-backend

changeset 3061:948833e3b542

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tools (common/template): removed warning catches, jinja2>=2.10.3 now handles them correctly
author Goffi <goffi@goffi.org>
date Fri, 18 Oct 2019 17:51:44 +0200
parents 730bbed77a89
children 93e8793a735a
files sat/tools/common/template.py setup.py
diffstat 2 files changed, 2 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/sat/tools/common/template.py	Fri Oct 18 14:45:07 2019 +0200
+++ b/sat/tools/common/template.py	Fri Oct 18 17:51:44 2019 +0200
@@ -50,14 +50,7 @@
     sat_templates  # to avoid pyflakes warning
 
 try:
-    import warnings
-
-    with warnings.catch_warnings():
-        warnings.filterwarnings("ignore", category=DeprecationWarning)
-        import jinja2
-        jinja2_version = tuple([int(n) for n in jinja2.__version__.split('.')])
-        if jinja2_version > (2, 10, 1):
-            log.warning("New jinja2 version available, warnings catches can be removed")
+    import jinja2
 except:
     raise exceptions.MissingModule(
         "Missing module jinja2, please install it from http://jinja.pocoo.org or with "
--- a/setup.py	Fri Oct 18 14:45:07 2019 +0200
+++ b/setup.py	Fri Oct 18 17:51:44 2019 +0200
@@ -27,7 +27,7 @@
     'babel',
     'dbus-python',
     'html2text',
-    'jinja2>=2.10',
+    'jinja2>=2.10.3',
     'langid',
     'lxml >= 3.1.0',
     'markdown >= 3.0',