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

preserve downloadTaskOutput return type

Browse source
This commit is contained in:
Mike McLean 2019-02-27 15:44:00 -05:00
parent 4222b097c1
commit e0ba3d148d
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hub/kojihub.py
View file

@ -9222,7 +9222,10 @@ class RootExports(object):
elif offset != None and offset < 0:
f.seek(offset, 2)
contents = f.read(size)
return base64.encodestring(contents)
if six.PY2:
return base64.encodestring(contents)
else:
return base64.encodestring(contents).decode()
listTaskOutput = staticmethod(list_task_output)

2
koji/__init__.py
View file

@ -2827,8 +2827,6 @@ class ClientSession(object):
if volume and volume != 'DEFAULT':
dlopts['volume'] = volume
result = self.callMethod('downloadTaskOutput', taskID, fileName, **dlopts)
# py3 doesn't return encodable string
result = str(result)
return base64.decodestring(result.encode('ascii'))