Merge pull request #5085 from lucaswerkmeister/patch-1

davidism · web-flow · commit 0867dce42c1a · 2023-04-25T14:06:22.000-06:00
Fix importing Markup from flask
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,6 +3,8 @@ Version 2.3.1
 
 Unreleased
 
+-   Restore deprecated ``from flask import Markup``. :issue:`5084`
+
 
 Version 2.3.0
 -------------
diff --git a/src/flask/__init__.py b/src/flask/__init__.py
@@ -76,7 +76,7 @@ def __getattr__(name):
         )
         return escape
 
-    if name == "escape":
+    if name == "Markup":
         import warnings
         from markupsafe import Markup
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def __getattr__(name):`
`76`	`76`	`)`
`77`	`77`	`return escape`
`78`	`78`
`79`		`- if name == "escape":`
	`79`	`+ if name == "Markup":`
`80`	`80`	`import warnings`
`81`	`81`	`from markupsafe import Markup`
`82`	`82`