particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

skip fixEncoding for py3

Browse source
This commit is contained in:
Tomas Kopecek 2019-02-27 17:13:40 +01:00 • committed by Mike McLean
parent 613d1587a6
commit eeeeb3ab78
6 changed files with 76 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

6
www/kojiweb/index.py
View file

@ -1382,9 +1382,9 @@ def rpminfo(environ, rpmID, fileOrder='name', fileStart=None, buildrootOrder='-i
values['enhances'] = server.getRPMDeps(rpm['id'], koji.DEP_ENHANCE)
values['enhances'].sort(key=_sortbyname)
headers = server.getRPMHeaders(rpm['id'], headers=['summary', 'description', 'license'])
values['summary'] = koji.fixEncoding(str(headers.get('summary')))
values['description'] = koji.fixEncoding(str(headers.get('description')))
values['license'] = koji.fixEncoding(str(headers.get('license')))
values['summary'] = koji.fixEncoding(headers.get('summary'))
values['description'] = koji.fixEncoding(headers.get('description'))
values['license'] = koji.fixEncoding(headers.get('license'))
buildroots = kojiweb.util.paginateMethod(server, values, 'listBuildroots', kw={'rpmID': rpm['id']},
start=buildrootStart, dataName='buildroots', prefix='buildroot',
order=buildrootOrder)

3
www/lib/kojiweb/util.py
View file

@ -531,9 +531,6 @@ def escapeHTML(value):
return value
value = koji.fixEncoding(value)
if six.PY3:
# it is bytes now, so decode to str
value = value.decode()
return value.replace('&', '&').\
replace('<', '&lt;').\
replace('>', '&gt;')