From ed73fd8bf8b77dc168ef3a53980c81b10a3318c1 Mon Sep 17 00:00:00 2001 From: Goffi Date: Fri, 18 Oct 2019 17:51:44 +0200 Subject: [PATCH] tools (common/template): removed warning catches, jinja2>=2.10.3 now handles them correctly --- sat/tools/common/template.py | 9 +-------- setup.py | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sat/tools/common/template.py b/sat/tools/common/template.py index 4ce6a5ed..8e78b603 100644 --- a/sat/tools/common/template.py +++ b/sat/tools/common/template.py @@ -50,14 +50,7 @@ else: 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 " diff --git a/setup.py b/setup.py index b6c97ca5..1122b5c7 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ install_requires = [ 'babel', 'dbus-python', 'html2text', - 'jinja2>=2.10', + 'jinja2>=2.10.3', 'langid', 'lxml >= 3.1.0', 'markdown >= 3.0',