Merge pull request #1321 from UlrichB22/fix_markup

Replace Jinja2.Markup with markupsafe.Markup

src/moin/apps/feed/views.py

@@ -14,7 +14,7 @@
 from flask import g as flaskg
 
 from feedgen.feed import FeedGenerator
-from jinja2 import Markup
+from markupsafe import Markup
 
 from whoosh.query import Term, And
 

src/moin/apps/frontend/views.py

@@ -42,7 +42,7 @@
 from flatland import Form
 from flatland.validation import Validator
 
-from jinja2 import Markup
+from markupsafe import Markup
 
 import pytz
 from babel import Locale

src/moin/auth/__init__.py

@@ -139,7 +139,7 @@
 from flask import url_for, session, request
 from flask import g as flaskg
 from flask import current_app as app
-from jinja2 import Markup
+from markupsafe import Markup
 
 from moin import user
 from moin.i18n import _

src/moin/items/__init__.py

@@ -32,7 +32,7 @@
 from flatland import Form
 from flatland.validation import Validator
 
-from jinja2 import Markup
+from markupsafe import Markup
 
 from whoosh.query import Term, Prefix, And, Or, Not
 

src/moin/items/ticket.py

@@ -42,7 +42,7 @@
 from flask import g as flaskg
 from flask import current_app as app
 
-from jinja2 import Markup
+from markupsafe import Markup
 
 from whoosh.query import Term, And
 

src/moin/utils/forms.py

@@ -6,7 +6,7 @@
 """
 
 
-from jinja2 import Markup
+from markupsafe import Markup
 import werkzeug.datastructures
 
 from flatland import AdaptationError, Scalar