From 96d95325d9d8e9dffd7a0f37a8fccb51aa8ff5b3 Mon Sep 17 00:00:00 2001
From: Murilo Belluzzo <murilo.belluzzo@intel.com>
Date: Dec 18 2019 17:45:35 +0000
Subject: [PATCH 1/2] Use html.escape instead of deprecated cgi.escape


This is required in order to have koji functional on Python3.8.

https://docs.python.org/3/whatsnew/3.8.html#api-and-feature-removals

Signed-off-by: Murilo Belluzzo <murilo.belluzzo@intel.com>

---

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

From 3277221024b9042f8768a557cd62cead692f3b0c Mon Sep 17 00:00:00 2001
From: Murilo Belluzzo <murilo.belluzzo@intel.com>
Date: Dec 18 2019 17:47:03 +0000
Subject: [PATCH 2/2] Remove unused cgi import from 'taskinfo' template


Signed-off-by: Murilo Belluzzo <murilo.belluzzo@intel.com>

---

diff --git a/www/kojiweb/taskinfo.chtml b/www/kojiweb/taskinfo.chtml
index 90a6ab0..852a38d 100644
--- a/www/kojiweb/taskinfo.chtml
+++ b/www/kojiweb/taskinfo.chtml
@@ -1,7 +1,6 @@
 #import koji
 #from kojiweb import util
 #from six.moves.urllib.parse import quote
-#import cgi
 #import time
 
 #def printValue($key, $value, $sep=', ')