From 24f9cb60ba2cc969f53d5a0346e3b6e1c83bed8b Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Mar 04 2019 14:28:39 +0000
Subject: use base64encode most places


---

diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py
index 1ff464d..4b8bce2 100644
--- a/cli/koji_cli/commands.py
+++ b/cli/koji_cli/commands.py
@@ -35,7 +35,7 @@ except ImportError:  # pragma: no cover
         yumcomps = None
 
 import koji
-from koji.util import md5_constructor, to_list
+from koji.util import md5_constructor, to_list, base64encode
 from koji_cli.lib import _, OptionParser, activate_session, parse_arches, \
         _unique_path, _running_in_bg, _progress_callback, watch_tasks, \
         arg_filter, linked_upload, list_task_output_all_volumes, \
@@ -1471,7 +1471,7 @@ def handle_import_sig(goptions, session, args):
                 continue
         print(_("Importing signature [key %s] from %s...") % (sigkey, path))
         if not options.test:
-            session.addRPMSig(rinfo['id'], base64.encodestring(sighdr))
+            session.addRPMSig(rinfo['id'], base64encode(sighdr))
         print(_("Writing signed copy"))
         if not options.test:
             session.writeSignedRPM(rinfo['id'], sigkey)
diff --git a/hub/kojihub.py b/hub/kojihub.py
index 1998c6d..7a78ec6 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -58,6 +58,7 @@ import koji.policy
 import koji.xmlrpcplus
 import koji.tasks
 from koji.context import context
+from koji.util import base64encode
 from koji.util import dslice
 from koji.util import md5_constructor
 from koji.util import move_and_symlink
@@ -9222,10 +9223,8 @@ class RootExports(object):
             elif offset != None and offset < 0:
                 f.seek(offset, 2)
             contents = f.read(size)
-        if six.PY2:
-            return base64.encodestring(contents)
-        else:
-            return base64.encodestring(contents).decode()
+        return base64encode(contents)
+
 
     listTaskOutput = staticmethod(list_task_output)
 
diff --git a/koji/__init__.py b/koji/__init__.py
index f93d9ea..b348e8d 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -2775,7 +2775,7 @@ class ClientSession(object):
             contents = fo.read(blocksize)
             md5sum.update(contents)
             size = len(contents)
-            data = base64.encodestring(contents)
+            data = util.base64encode(contents)
             if size == 0:
                 # end of file, use offset = -1 to finalize upload
                 offset = -1
diff --git a/koji/daemon.py b/koji/daemon.py
index 5cb255e..0e614c5 100644
--- a/koji/daemon.py
+++ b/koji/daemon.py
@@ -27,12 +27,11 @@ import koji.tasks
 import koji.xmlrpcplus
 from koji.tasks import safe_rmtree
 from koji.util import md5_constructor, adler32_constructor, parseStatus, \
-                      dslice, to_list
+                      dslice, to_list, base64encode
 import os
 import signal
 import logging
 from fnmatch import fnmatch
-import base64
 import time
 import subprocess
 import sys
@@ -61,7 +60,7 @@ def incremental_upload(session, fname, fd, path, retries=5, logger=None):
         if size == 0:
             break
 
-        data = base64.encodestring(contents)
+        data = base64encode(contents)
         digest = md5_constructor(contents).hexdigest()
         del contents
 
diff --git a/tests/test_cli/test_import_sig.py b/tests/test_cli/test_import_sig.py
index c29fa54..2321a41 100644
--- a/tests/test_cli/test_import_sig.py
+++ b/tests/test_cli/test_import_sig.py
@@ -12,6 +12,7 @@ except ImportError:
     import unittest
 
 from mock import call
+from koji.util import base64encode
 from koji_cli.commands import handle_import_sig
 from . import utils
 
@@ -227,7 +228,7 @@ class TestImportSIG(utils.CliTestCase):
 
         add_sig_calls, write_sig_calls = [], []
         for i in range(0, 3):
-            add_sig_calls.append(call(rinfo[i]['id'], base64.encodestring(sighdr[i])))
+            add_sig_calls.append(call(rinfo[i]['id'], base64encode(sighdr[i])))
             write_sig_calls.append(call(rinfo[i]['id'], fake_sigkey))
 
         # Run