Fix requested feedback

requirements/static/ci/docs.in

@@ -1 +1,2 @@
 sphinx>=3.5.1
+jinja2<3.1

requirements/static/ci/py3.10/docs.txt

@@ -442,9 +442,10 @@ jaraco.functools==2.0
     #   tempora
 jaraco.text==3.7.0
     # via jaraco.collections
-jinja2==3.1.0
+jinja2==3.0.3
     # via
     #   -r requirements/base.txt
+    #   -r requirements/static/ci/docs.in
     #   ansible-core
     #   junos-eznc
     #   moto

requirements/static/ci/py3.6/docs.txt

@@ -463,6 +463,7 @@ jaraco.text==3.5.1
 jinja2==3.0.3
     # via
     #   -r requirements/base.txt
+    #   -r requirements/static/ci/docs.in
     #   ansible-core
     #   junos-eznc
     #   moto

requirements/static/ci/py3.7/docs.txt

@@ -458,9 +458,10 @@ jaraco.functools==2.0
     #   tempora
 jaraco.text==3.5.1
     # via jaraco.collections
-jinja2==3.1.0
+jinja2==3.0.3
     # via
     #   -r requirements/base.txt
+    #   -r requirements/static/ci/docs.in
     #   ansible-core
     #   junos-eznc
     #   moto

requirements/static/ci/py3.8/docs.txt

@@ -452,9 +452,10 @@ jaraco.functools==2.0
     #   tempora
 jaraco.text==3.5.1
     # via jaraco.collections
-jinja2==3.1.0
+jinja2==3.0.3
     # via
     #   -r requirements/base.txt
+    #   -r requirements/static/ci/docs.in
     #   ansible-core
     #   junos-eznc
     #   moto

requirements/static/ci/py3.9/docs.txt

@@ -450,9 +450,10 @@ jaraco.functools==2.0
     #   tempora
 jaraco.text==3.5.1
     # via jaraco.collections
-jinja2==3.1.0
+jinja2==3.0.3
     # via
     #   -r requirements/base.txt
+    #   -r requirements/static/ci/docs.in
     #   ansible-core
     #   junos-eznc
     #   moto

salt/utils/jinja.py

@@ -36,10 +36,10 @@ from salt.utils.odict import OrderedDict
 from salt.utils.versions import LooseVersion
 
 try:
-    from jinja2 import Markup
-except ImportError:
-    # Markup moved to markupsafe in jinja>= 3.1
     from markupsafe import Markup
+except ImportError:
+    # jinja < 3.1
+    from jinja2 import Markup
 
 log = logging.getLogger(__name__)
 
@@ -713,9 +713,9 @@ def method_call(obj, f_name, *f_args, **f_kwargs):
     return getattr(obj, f_name, lambda *args, **kwargs: None)(*f_args, **f_kwargs)
 
 
-if jinja2.__version__ < "3.0.0":
+try:
     contextfunction = jinja2.contextfunction
-else:
+except AttributeError:
     contextfunction = jinja2.pass_context
 
 

tests/pytests/unit/utils/jinja/test_jinja.py

@@ -2,9 +2,14 @@
 Tests for salt.utils.jinja
 """
 import salt.utils.dateutils  # pylint: disable=unused-import
-from jinja2 import Markup
 from salt.utils.jinja import indent, tojson
 
+try:
+    from markupsafe import Markup
+except ImportError:
+    # jinja < 3.1
+    from jinja2 import Markup
+
 
 def test_tojson():
     """