From b6ea023c4f520c5a190a337553ccbb6bc1add85d Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Feb 13 2020 13:44:56 +0000
Subject: PR#2001: remove usage of deprecated cgi.escape function


Merges #2001
https://pagure.io/koji/pull-request/2001

Fixes: #1887
https://pagure.io/koji/issue/1887
py 3.8 drops cgi.escape

---

diff --git a/www/kojiweb/includes/header.chtml b/www/kojiweb/includes/header.chtml
index 421b3f1..edd032c 100644
--- a/www/kojiweb/includes/header.chtml
+++ b/www/kojiweb/includes/header.chtml
@@ -1,5 +1,4 @@
 #encoding UTF-8
-#import cgi
 #import koji
 #from kojiweb import util
 #from koji_cli.lib import greetings
@@ -51,7 +50,7 @@ $localnav
               #end if
             </select>
             #try
-                #set $old_terms = cgi.escape($terms)
+                #set $old_terms = util.escapeHTML($terms)
             #except
                 #set $old_terms = ""
             #end try
diff --git a/www/kojiweb/search.chtml b/www/kojiweb/search.chtml
index 9d83853..8371c35 100644
--- a/www/kojiweb/search.chtml
+++ b/www/kojiweb/search.chtml
@@ -1,4 +1,3 @@
-#import cgi
 #from kojiweb import util
 #from six.moves.urllib.parse import quote
 
@@ -14,7 +13,7 @@
         #end if
         <th>Search</th>
         #try
-            #set $old_terms = cgi.escape($terms)
+            #set $old_terms = util.escapeHTML($terms)
         #except
             #set $old_terms = ""
         #end try
diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py
index 3e8a08c..a318126 100644
--- a/www/lib/kojiweb/util.py
+++ b/www/lib/kojiweb/util.py
@@ -21,7 +21,6 @@
 #       Mike McLean <mikem@redhat.com>
 from __future__ import absolute_import, division
 
-import cgi
 import datetime
 import hashlib
 import os
@@ -669,7 +668,7 @@ class TaskResultFragment(object):
         else:
             text = self.text[:length]
         if self.need_escape:
-            text = cgi.escape(text)
+            text = escapeHTML(text)
         if self.size > 0 and text == '':
             text = self.empty_str_placeholder
         return '%s%s%s' % (self.begin_tag, text, self.end_tag)
@@ -725,7 +724,7 @@ class TaskResultLine(object):
                 size += fragment.size
 
         if self.need_escape:
-            line_text = cgi.escape(line_text)
+            line_text = escapeHTML(line_text)
 
         return '%s%s%s%s' % (self.begin_tag, line_text, postscript, self.end_tag)