From 94f116e898c6a4961e305fa6c6ce06443d6cb91d Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Jun 16 2017 08:16:07 +0000
Subject: watch-logs: fix py3 encoding issues


---

diff --git a/cli/koji_cli/lib.py b/cli/koji_cli/lib.py
index a11d1fa..7bd61f8 100644
--- a/cli/koji_cli/lib.py
+++ b/cli/koji_cli/lib.py
@@ -374,7 +374,7 @@ def watch_logs(session, tasklist, opts, poll_interval):
                                 sys.stdout.write("\n")
                             sys.stdout.write("==> %s <==\n" % currlog)
                             lastlog = currlog
-                        sys.stdout.write(contents)
+                        sys.stdout.write(contents.decode('utf8'))
 
         if not tasklist:
             break
diff --git a/koji/__init__.py b/koji/__init__.py
index 9e1e5ce..2b9fe24 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -2680,7 +2680,8 @@ class ClientSession(object):
         if volume and volume != 'DEFAULT':
             dlopts['volume'] = volume
         result = self.callMethod('downloadTaskOutput', taskID, fileName, **dlopts)
-        return base64.decodestring(result)
+        return base64.decodestring(result.encode('ascii'))
+
 
 class DBHandler(logging.Handler):
     """