From 0b5a0d691f696f455991488a78deb788a772fb29 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Feb 19 2019 17:47:00 +0000
Subject: only adjust the request encoding on py3


---

diff --git a/koji/__init__.py b/koji/__init__.py
index 3b750a6..f93d9ea 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -2426,17 +2426,14 @@ class ClientSession(object):
         else:
             handler = self.baseurl
         request = dumps(args, name, allow_none=1)
-        try:
-            request.encode('latin-1')
-        except UnicodeEncodeError:
-            # if string is not converted to UTF, requests will raise an error
-            # on identical check before sending data
-            # py3 string throws UnicodeEncodeError
-            request = request.encode('utf-8')
-        except UnicodeDecodeError:
-            # py2 string throws UnicodeDecodeError, but it is already meant
-            # to sent as-is
-            pass
+        if six.PY3:
+            try:
+                request.encode('latin-1')
+            except UnicodeEncodeError:
+                # if string is not converted to UTF, requests will raise an error
+                # on identical check before sending data
+                # py3 string throws UnicodeEncodeError
+                request = request.encode('utf-8')
         headers = [
             # connection class handles Host
             ('User-Agent', 'koji/1'),