koji

Clone

#1284 replace urrlib.quote with six.moves
Merged 5 years ago by mikem. Opened 5 years ago by tkopecek.
tkopecek/koji issue1283  into  master

file modified
+2 -2 
@@ -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>

file modified
+4 -4 
@@ -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>

file modified
+2 -2 
@@ -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>

file modified
+2 -2 
@@ -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

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

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

:thumbsup:

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready
5 years ago

Commit c491480 fixes this pull-request

Pull-Request has been merged by mikem
5 years ago
Changes Summary 4
+2 -2
file changed
www/kojiweb/archiveinfo.chtml
+4 -4
file changed
www/kojiweb/fileinfo.chtml
+2 -2
file changed
www/kojiweb/rpminfo.chtml
+2 -2
file changed
www/kojiweb/searchresults.chtml
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.