From e0ba3d148d0ec6ccfa4602d4141dd0e6ee69652a Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Feb 28 2019 14:27:55 +0000
Subject: preserve downloadTaskOutput return type


---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index a4630ab..1998c6d 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -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)
 
diff --git a/koji/__init__.py b/koji/__init__.py
index 89e6581..f93d9ea 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -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'))