From e5f036796c7aa66f72f31e79ef9708aaf4003b49 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Sat, 3 Oct 2020 11:57:28 +0200 Subject: [PATCH] cgit: osmo-commit-filter.py: migrate from deprecated cgi.escape to html.escape Our error.log is full of: /usr/local/lib/cgit/filters/osmo-commit-filter.py:18: DeprecationWarning: cgi.escape is deprecated, use html.escape instead return '%s' % (url, cgi.escape(txt)) Change-Id: I97707519029d4f8d703d2df1b8beab15665d49b1 --- cgit/osmo-commit-filter.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cgit/osmo-commit-filter.py b/cgit/osmo-commit-filter.py index 7488bb5f..21728409 100755 --- a/cgit/osmo-commit-filter.py +++ b/cgit/osmo-commit-filter.py @@ -12,26 +12,26 @@ RT_URL = 'https://rt.sysmocom.de/TicketDisplay.html?id=%s' import re import sys -import cgi +import html def hyperlink(txt, url): - return '%s' % (url, cgi.escape(txt)) + return '%s' % (url, html.escape(txt)) def chgid_repl(matchobj): chg_id = matchobj.group(1) - url = GERRIT_URL % cgi.escape(chg_id) + url = GERRIT_URL % html.escape(chg_id) return hyperlink(chg_id, url) def relates_repl(matchobj): def process_item(x): def repl_os(m): - url = REDMINE_OS_URL % cgi.escape(m.group(1)) + url = REDMINE_OS_URL % html.escape(m.group(1)) return hyperlink(m.group(0), url) def repl_sys(m): - url = REDMINE_SYS_URL % cgi.escape(m.group(1)) + url = REDMINE_SYS_URL % html.escape(m.group(1)) return hyperlink(m.group(0), url) def repl_rt(m): - url = RT_URL % cgi.escape(m.group(1)) + url = RT_URL % html.escape(m.group(1)) return hyperlink(m.group(0), url) x = re.sub(r"OS#(\d+)", repl_os, x) x = re.sub(r"SYS#(\d+)", repl_sys, x)