From b8ed8b92f115dddf5ffe772c9db5bca5392b2c0c Mon Sep 17 00:00:00 2001 From: Vyacheslav Anzhiganov Date: Sun, 31 Dec 2023 07:06:34 +0300 Subject: [PATCH 1/2] fix issue #25 import Markup from flask --- flaskext/markdown.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flaskext/markdown.py b/flaskext/markdown.py index 0059852..ed95886 100644 --- a/flaskext/markdown.py +++ b/flaskext/markdown.py @@ -29,7 +29,7 @@ :license: BSD, MIT see LICENSE for more details. """ from __future__ import absolute_import -from flask import Markup +from markupsafe import Markup from jinja2 import evalcontextfilter, escape import markdown as md from markdown import ( From 18924df2e26dac5333e9c5b16298f2245cd837b9 Mon Sep 17 00:00:00 2001 From: vanzhiganov Date: Sun, 31 Dec 2023 07:21:00 +0300 Subject: [PATCH 2/2] fix issue dcolish#25 import Markup from flask --- flaskext/markdown.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/flaskext/markdown.py b/flaskext/markdown.py index ed95886..413c2fd 100644 --- a/flaskext/markdown.py +++ b/flaskext/markdown.py @@ -29,8 +29,15 @@ :license: BSD, MIT see LICENSE for more details. """ from __future__ import absolute_import -from markupsafe import Markup -from jinja2 import evalcontextfilter, escape +try: + from flask import Markup +except: + from markupsafe import Markup +try: + from jinja2 import evalcontextfilter, escape +except: + from jinja2 import pass_eval_context as evalcontextfilter + from markupsafe import escape import markdown as md from markdown import ( blockprocessors,