From 56e7655643ccbc3079fab7af010ea99bfa71a884 Mon Sep 17 00:00:00 2001
From: Dominik Wombacher <dominik@wombacher.cc>
Date: Jan 16 2023 13:24:33 +0000
Subject: fix: cannot import name 'escape' from 'jinja2'


jinja2.escape deprecated since Jinja Version 3.0.1, removed in Version 3.1.0.
Has to be replaced by markupsafe.escape, added as falback in case import from jinja2 fails.

https://jinja.palletsprojects.com/en/3.1.x/changes/#version-3-1-0
https://github.com/pallets/jinja/pull/1544

Fixes: https://pagure.io/pagure/issue/5350

---

diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py
index 77e128d..40cc276 100644
--- a/pagure/ui/filters.py
+++ b/pagure/ui/filters.py
@@ -25,7 +25,11 @@ import bleach
 import flask
 import pygit2
 import six
-from jinja2 import escape
+
+try:
+    from jinja2 import escape
+except ImportError:
+    from markupsafe import escape
 from six.moves.urllib.parse import parse_qsl, urlparse
 
 import pagure.exceptions