[allura] 01/01: [#8425] upgrade jinja to 3.1.1

[ke...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kentontaylor pushed a commit to branch kt/8425
in repository https://gitbox.apache.org/repos/asf/allura.git

commit f34ba2d5ca2dd4421198c7e18de2a42d9b7e7212
Author: Kenton Taylor <kt...@slashdotmedia.com>
AuthorDate: Thu Apr 7 13:52:49 2022 +0000

    [#8425] upgrade jinja to 3.1.1
---
 Allura/allura/lib/app_globals.py          | 2 +-
 Allura/allura/lib/helpers.py              | 2 +-
 Allura/allura/lib/widgets/user_profile.py | 2 +-
 Allura/allura/tests/test_globals.py       | 2 +-
 Allura/allura/tests/test_helpers.py       | 2 +-
 requirements.in                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 8487d6d3e..4a958b19d 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -48,7 +48,7 @@ from ming.odm import session, MappedClass
 import ew as ew_core
 import ew.jinja2_ew as ew
 from ming.utils import LazyProperty
-from jinja2 import Markup
+from markupsafe import Markup
 
 import allura.tasks.event_tasks
 from allura import model as M
diff --git a/Allura/allura/lib/helpers.py b/Allura/allura/lib/helpers.py
index f0d00259b..c6ec0e973 100644
--- a/Allura/allura/lib/helpers.py
+++ b/Allura/allura/lib/helpers.py
@@ -56,7 +56,7 @@ from tg import response, request
 from tg.decorators import before_validate
 from formencode.variabledecode import variable_decode
 import formencode
-from jinja2 import Markup
+from markupsafe import Markup
 from jinja2.filters import escape, do_filesizeformat
 from jinja2.utils import pass_context
 from paste.deploy.converters import asbool, aslist, asint
diff --git a/Allura/allura/lib/widgets/user_profile.py b/Allura/allura/lib/widgets/user_profile.py
index 727ae4f76..8af7ebef7 100644
--- a/Allura/allura/lib/widgets/user_profile.py
+++ b/Allura/allura/lib/widgets/user_profile.py
@@ -20,7 +20,7 @@ import re
 
 import ew as ew_core
 import ew.jinja2_ew as ew
-from jinja2 import Markup
+from markupsafe import Markup
 from paste.deploy.converters import asbool
 import tg
 from tg import app_globals as g
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 6d1f51e8f..3b1334915 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -880,7 +880,7 @@ class TestCachedMarkdown(unittest.TestCase):
 
     @patch.dict('allura.lib.app_globals.config', markdown_cache_threshold='-0.01')
     def test_valid_cache(self):
-        from jinja2 import Markup
+        from markupsafe import Markup
         self.md.cached_convert(self.post, 'text')
         with patch.object(self.md, 'convert') as convert_func:
             html = self.md.cached_convert(self.post, 'text')
diff --git a/Allura/allura/tests/test_helpers.py b/Allura/allura/tests/test_helpers.py
index 267b3492b..3c1428586 100644
--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -28,7 +28,7 @@ from datadiff import tools as dd
 from webob import Request
 from webob.exc import HTTPUnauthorized
 from ming.orm import ThreadLocalORMSession
-from jinja2 import Markup
+from markupsafe import Markup
 
 from allura import model as M
 from allura.lib import exceptions as exc
diff --git a/requirements.in b/requirements.in
index 1546be7ad..177ac4b40 100644
--- a/requirements.in
+++ b/requirements.in
@@ -13,7 +13,7 @@ feedparser
 FormEncode
 GitPython
 html5lib
-Jinja2
+Jinja2==3.1.1
 Markdown
 markdown-checklist
 MarkupSafe