Merge pull request #7252 from freedomofpress/flask-escape

Import escape from markupsafe, not flask

securedrop/tests/test_integration.py

@@ -10,8 +10,8 @@
 from bs4 import BeautifulSoup
 from db import db
 from encryption import EncryptionManager
-from flask import escape
 from journalist_app.sessions import session
+from markupsafe import escape
 from source_app.session_manager import SessionManager
 from store import Storage
 from tests import utils

securedrop/tests/test_journalist.py

@@ -15,10 +15,11 @@
 from db import db
 from encryption import EncryptionManager, GpgKeyNotFoundError
 from flaky import flaky
-from flask import escape, g, url_for
+from flask import g, url_for
 from flask_babel import gettext, ngettext
 from journalist_app.sessions import session
 from journalist_app.utils import mark_seen
+from markupsafe import escape
 from models import (
     InstanceConfig,
     InvalidPasswordLength,

securedrop/tests/test_source.py

@@ -14,8 +14,9 @@
 import version
 from db import db
 from encryption import EncryptionManager, GpgDecryptError, GpgKeyNotFoundError
-from flask import escape, g, request, session, url_for
+from flask import g, request, session, url_for
 from journalist_app.utils import delete_collection
+from markupsafe import escape
 from models import InstanceConfig, Reply, Source
 from passphrases import PassphraseGenerator
 from source_app import api as source_app_api