1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
Description: flask.Markup no longer exists
Origin: upstream
Author: Dominik Wombacher, Rebecca N. Palmer <rebecca_palmer@zoho.com>
Forwarded: not-needed
--- a/pagure/docs_server.py
+++ b/pagure/docs_server.py
@@ -14,6 +14,7 @@ import logging
import os
import flask
+import markupsafe
import pygit2
from binaryornot.helpers import is_binary_string
@@ -189,7 +190,7 @@ def view_docs(repo, username=None, names
else:
flask.abort(
404,
- flask.Markup(
+ markupsafe.Markup(
"No content found in the repository, you may want to read "
'the <a href="'
'https://docs.pagure.org/pagure/usage/using_doc.html">'
--- a/pagure/ui/fas_login.py
+++ b/pagure/ui/fas_login.py
@@ -14,7 +14,7 @@ import logging
from base64 import b64decode
import flask
-from flask import Markup
+from markupsafe import Markup
from sqlalchemy.exc import SQLAlchemyError
--- a/pagure/ui/oidc_login.py
+++ b/pagure/ui/oidc_login.py
@@ -14,7 +14,7 @@ import logging
from base64 import b64decode
import flask
-from flask import Markup
+from markupsafe import Markup
import munch
from sqlalchemy.exc import SQLAlchemyError
--- a/pagure/ui/plugins.py
+++ b/pagure/ui/plugins.py
@@ -16,7 +16,7 @@ from __future__ import unicode_literals,
import logging
import flask
-from flask import Markup
+from markupsafe import Markup
from sqlalchemy.exc import SQLAlchemyError
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -28,6 +28,7 @@ from math import ceil
from six.moves.urllib.parse import urljoin
import flask
+import markupsafe
import pygit2
import kitchen.text.converters as ktc
import six
@@ -2512,7 +2513,7 @@ def revoke_api_token(repo, token_id, use
except SQLAlchemyError as err: # pragma: no cover
flask.g.session.rollback()
_log.exception(err)
- message = flask.Markup(
+ message = markupsafe.Markup(
"Token could not be revoked,"
' please <a href="/about">contact an administrator</a>'
)
--- a/pagure/utils.py
+++ b/pagure/utils.py
@@ -20,6 +20,7 @@ from six.moves.urllib.parse import urlpa
from functools import wraps
import flask
+import markupsafe
import pygit2
import six
import werkzeug.utils
@@ -385,7 +386,7 @@ def login_required(function):
elif auth_method == "fas" and not flask.g.fas_user.cla_done:
flask.session["_requires_fpca"] = True
flask.flash(
- flask.Markup(
+ markupsafe.Markup(
'You must <a href="https://accounts.fedoraproject'
'.org/">sign the FPCA</a> (Fedora Project '
"Contributor Agreement) to use pagure"
|
