Import Markup from markupsafe (#2047)

Flask v2.3.0 deprecates importing Markup from flask, indicating that it
should be imported from markupsafe instead.

---------

Co-authored-by: Anton Pirker <[email protected]>
Co-authored-by: Ivana Kellyerova <[email protected]>

Author: 3 people

sentry_sdk/integrations/flask.py

@@ -26,14 +26,15 @@
     flask_login = None
 
 try:
-    from flask import Flask, Markup, Request  # type: ignore
+    from flask import Flask, Request  # type: ignore
     from flask import __version__ as FLASK_VERSION
     from flask import request as flask_request
     from flask.signals import (
         before_render_template,
         got_request_exception,
         request_started,
     )
+    from markupsafe import Markup
 except ImportError:
     raise DidNotEnable("Flask is not installed")
 

setup.py

@@ -45,7 +45,7 @@ def get_file_text(file_name):
         "certifi",
     ],
     extras_require={
-        "flask": ["flask>=0.11", "blinker>=1.1"],
+        "flask": ["flask>=0.11", "blinker>=1.1", "markupsafe"],
         "quart": ["quart>=0.16.1", "blinker>=1.1"],
         "bottle": ["bottle>=0.12.13"],
         "falcon": ["falcon>=1.4"],