Simplify Base64

shotgun_api3/shotgun.py

@@ -29,6 +29,7 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
 
+import base64
 import copy
 import datetime
 import json
@@ -59,11 +60,6 @@
 from .lib.httplib2 import Http, ProxyInfo, socks, ssl_error_classes
 from .lib.sgtimezone import SgTimezone
 
-if six.PY3:
-    from base64 import encodebytes as base64encode
-else:
-    from base64 import encodestring as base64encode
-
 
 LOG = logging.getLogger("shotgun_api3")
 """
@@ -709,13 +705,13 @@ def __init__(
         # and auth header
 
         # Do NOT self._split_url(self.base_url) here, as it contains the lower
-        # case version of the base_url argument. Doing so would base64encode
+        # case version of the base_url argument. Doing so would base64.encodebytes
         # the lowercase version of the credentials.
         auth, self.config.server = self._split_url(base_url)
         if auth:
-            auth = base64encode(urllib.parse.unquote(auth).encode("utf-8")).decode(
-                "utf-8"
-            )
+            auth = base64.encodebytes(
+                urllib.parse.unquote(auth).encode("utf-8")
+            ).decode("utf-8")
             self.config.authorization = "Basic " + auth.strip()
 
         # foo:bar@123.456.789.012:3456

tests/test_client.py

@@ -12,6 +12,7 @@
 CRUD functions. These tests always use a mock http connection so not not
 need a live server to run against."""
 
+import base64
 import datetime
 import json
 import os
@@ -32,17 +33,12 @@
 from shotgun_api3.shotgun import ServerCapabilities, SG_TIMEZONE
 from . import base
 
-if six.PY3:
-    from base64 import encodebytes as base64encode
-else:
-    from base64 import encodestring as base64encode
-
 
 def b64encode(val):
     if isinstance(val, str):
         val = val.encode("utf-8")
 
-    return base64encode(val).decode("utf-8")
+    return base64.encodebytes(val).decode("utf-8")
 
 
 class TestShotgunClient(base.MockTestBase):