From e6438a05822a007c0464b12088d5bf4f9a87e563 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Feb 26 2019 10:18:42 +0000
Subject: replace urrlib.quote with six.moves


Some web templates still uses old library, replace with py3-compatible
one.

Fixes: https://pagure.io/koji/issue/1283

---

diff --git a/www/kojiweb/archiveinfo.chtml b/www/kojiweb/archiveinfo.chtml
index 55b5bab..d448ac7 100644
--- a/www/kojiweb/archiveinfo.chtml
+++ b/www/kojiweb/archiveinfo.chtml
@@ -1,7 +1,7 @@
 #import koji
 #from kojiweb import util
 #from pprint import pformat
-#import urllib
+#from six.moves.urllib.parse import quote
 
 #attr _PASSTHROUGH = ['archiveID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
 
@@ -97,7 +97,7 @@
           </tr>
           #for $file in $files
           <tr class="$util.rowToggle($self)">
-            <td><a href="fileinfo?archiveID=$archive.id&filename=$urllib.quote($file.name)">$file.name</a></td><td>$file.size</td>
+            <td><a href="fileinfo?archiveID=$archive.id&filename=$quote($file.name)">$file.name</a></td><td>$file.size</td>
           </tr>
           #end for
         </table>
diff --git a/www/kojiweb/fileinfo.chtml b/www/kojiweb/fileinfo.chtml
index 6359d60..172dfa9 100644
--- a/www/kojiweb/fileinfo.chtml
+++ b/www/kojiweb/fileinfo.chtml
@@ -1,12 +1,12 @@
-#from kojiweb import util
-#import urllib
 #import datetime
+#from kojiweb import util
+#from six.moves.urllib.parse import quote
 
 #include "includes/header.chtml"
   #if $rpm
-  <h4>Information for file <a href="fileinfo?rpmID=$rpm.id&amp;filename=$urllib.quote($file.name)">$file.name</a></h4>
+  <h4>Information for file <a href="fileinfo?rpmID=$rpm.id&amp;filename=$quote($file.name)">$file.name</a></h4>
   #elif $archive
-  <h4>Information for file <a href="fileinfo?archiveID=$archive.id&amp;filename=$urllib.quote($file.name)">$file.name</a></h4>
+  <h4>Information for file <a href="fileinfo?archiveID=$archive.id&amp;filename=$quote($file.name)">$file.name</a></h4>
   #end if
 
   <table>
diff --git a/www/kojiweb/rpminfo.chtml b/www/kojiweb/rpminfo.chtml
index 0f8816e..f69bbd2 100644
--- a/www/kojiweb/rpminfo.chtml
+++ b/www/kojiweb/rpminfo.chtml
@@ -2,7 +2,7 @@
 #from kojiweb import util
 #from pprint import pformat
 #import time
-#import urllib
+#from six.moves.urllib.parse import quote
 
 #attr _PASSTHROUGH = ['rpmID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
 
@@ -248,7 +248,7 @@
           </tr>
           #for $file in $files
           <tr class="$util.rowToggle($self)">
-            <td><a href="fileinfo?rpmID=$rpm.id&amp;filename=$urllib.quote($file.name)">$util.escapeHTML($file.name)</a></td><td>$file.size</td>
+            <td><a href="fileinfo?rpmID=$rpm.id&amp;filename=$quote($file.name)">$util.escapeHTML($file.name)</a></td><td>$file.size</td>
           </tr>
           #end for
         </table>
diff --git a/www/kojiweb/searchresults.chtml b/www/kojiweb/searchresults.chtml
index e0c4ece..af01850 100644
--- a/www/kojiweb/searchresults.chtml
+++ b/www/kojiweb/searchresults.chtml
@@ -1,5 +1,5 @@
 #from kojiweb import util
-#import urllib
+#from six.moves.urllib.parse import quote
 
 #include "includes/header.chtml"
 
@@ -38,7 +38,7 @@
     <tr class="$util.rowToggle($self)">
       <td>$result.id</td>
       #set $quoted = $result.copy()
-      #silent $quoted['name'] = $urllib.quote($quoted['name'])
+      #silent $quoted['name'] = $quote($quoted['name'])
       <td><a href="${infoURL % $quoted}">$result.name</a></td>
     </tr>
     #end for