From 530f4839a1a62ad330b3981f68b6aae9ecc62845 Mon Sep 17 00:00:00 2001 From: delthas Date: Wed, 13 Apr 2022 14:46:50 +0200 Subject: [PATCH] Fix obsolete Jinja2 imports jinja2.Markup was moved to markupsafe.Markup. See: https://github.com/pallets/jinja/issues/1438 --- gitsrht/blueprints/repo.py | 4 ++-- gitsrht/git.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitsrht/blueprints/repo.py b/gitsrht/blueprints/repo.py index 78c5680..f665e4d 100644 --- a/gitsrht/blueprints/repo.py +++ b/gitsrht/blueprints/repo.py @@ -14,8 +14,8 @@ from gitsrht.git import diffstat, get_log, diff_for_commit, strip_pgp_signature from gitsrht.rss import generate_feed from gitsrht.types import Artifact, User from io import BytesIO -from jinja2 import Markup -from jinja2.utils import url_quote, escape +from markupsafe import Markup, escape +from jinja2.utils import url_quote from pygments import highlight from pygments.formatters import HtmlFormatter from pygments.lexers import guess_lexer, guess_lexer_for_filename, TextLexer diff --git a/gitsrht/git.py b/gitsrht/git.py index 8bf161b..3c67241 100644 --- a/gitsrht/git.py +++ b/gitsrht/git.py @@ -1,7 +1,7 @@ from collections import deque from datetime import datetime, timedelta, timezone from pygit2 import Repository as GitRepository, Tag -from jinja2 import Markup, escape +from markupsafe import Markup, escape from stat import filemode import pygit2 import json, re -- 2.38.4