Skip to content

Commit

Permalink
Merge pull request #5085 from lucaswerkmeister/patch-1
Browse files Browse the repository at this point in the history
Fix importing Markup from flask
  • Loading branch information
davidism authored Apr 25, 2023
2 parents 345f184 + 0ec9192 commit 0867dce
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Version 2.3.1

Unreleased

- Restore deprecated ``from flask import Markup``. :issue:`5084`


Version 2.3.0
-------------
Expand Down
2 changes: 1 addition & 1 deletion src/flask/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def __getattr__(name):
)
return escape

if name == "escape":
if name == "Markup":
import warnings
from markupsafe import Markup

Expand Down

0 comments on commit 0867dce

Please sign in to comment.