c34434d803
The last version bump of python-werkzeug v2.1.2 introduced a runtime issue in python-crossbar since escape from werkzeug has been removed since werkzeug 2.1.0 [1]. This has been fixed in python-crossbar v24.4.1 but we do not want to bump this package for the Buildroot release 2022.05. Instead apply the same change as the upstream commit [2] using escape from python-markupsafe package. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2520606768 [1]22d1e9ac13[2]ca8d383f01Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: James Hilliard <james.hilliard1@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From ac5fc826e33492bb0c4283a954389d7fd355fa61 Mon Sep 17 00:00:00 2001
|
|
From: Romain Naour <romain.naour@gmail.com>
|
|
Date: Mon, 30 May 2022 19:38:11 +0200
|
|
Subject: [PATCH] crossbar/webservice/wap: use markupsafe instead of werkzeug
|
|
|
|
wap.py use escape from werkzeug but it has been removed since
|
|
the version 2.1.0 [1].
|
|
|
|
Replace with escape from markupsafe like upstream commit [2]
|
|
(wihout other changes).
|
|
|
|
[1] https://github.com/pallets/werkzeug/commit/22d1e9ac13829b83347107a9b4d77072a8e1af6a
|
|
[2] https://github.com/crossbario/crossbar/commit/ca8d383f01231e2b3f986e791f215f12f2deee5d
|
|
|
|
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
|
---
|
|
crossbar/webservice/wap.py | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/crossbar/webservice/wap.py b/crossbar/webservice/wap.py
|
|
index 825558b1..6daa9b21 100644
|
|
--- a/crossbar/webservice/wap.py
|
|
+++ b/crossbar/webservice/wap.py
|
|
@@ -36,7 +36,12 @@ from collections.abc import Mapping, Sequence
|
|
|
|
from werkzeug.routing import Map, Rule
|
|
from werkzeug.exceptions import NotFound, MethodNotAllowed
|
|
-from werkzeug.utils import escape
|
|
+
|
|
+try:
|
|
+ # removed in werkzeug 2.1.0
|
|
+ from werkzeug.utils import escape
|
|
+except ImportError:
|
|
+ from markupsafe import escape
|
|
|
|
from jinja2 import Environment, FileSystemLoader
|
|
from jinja2.sandbox import SandboxedEnvironment
|
|
--
|
|
2.35.3
|
|
|