SG-29997 Removing Python 2 code

shotgun_api3/lib/httplib2/__init__.py

@@ -1,5 +1,3 @@
-from .. import six
-
 # Define all here to keep linters happy.  It should be overwritten by the code
 # below, but if in the future __all__ is not defined in httplib2 this will keep
 # things from breaking.
@@ -9,24 +7,13 @@
 # current python version.  httplib2 supports python 2/3 by forking the code rather
 # than with a single cross-compatible module. Rather than modify third party code,
 # we'll just import the appropriate branch here.
-if six.PY3:
-    # Generate ssl_error_classes
-    import ssl as __ssl
-    ssl_error_classes = (__ssl.SSLError, __ssl.CertificateError)
-    del __ssl
-
-    # get the python3 fork of httplib2
-    from . import python3 as __httplib2_compat
-
-
-else:
-    # Generate ssl_error_classes
-    from .python2 import SSLHandshakeError as __SSLHandshakeError  # TODO: shouldn't rely on this. not public
-    ssl_error_classes = (__SSLHandshakeError,)
-    del __SSLHandshakeError
+# Generate ssl_error_classes
+import ssl as __ssl
+ssl_error_classes = (__ssl.SSLError, __ssl.CertificateError)
+del __ssl
 
-    # get the python2 fork of httplib2
-    from . import python2 as __httplib2_compat
+# get the python3 fork of httplib2
+from . import python3 as __httplib2_compat
 
 # Import all of the httplib2 module.  Note that we can't use a star import because
 # we need to import *everything*, not just what exists in __all__.

shotgun_api3/lib/sgsix.py

@@ -29,33 +29,24 @@
 """
 
 # This module contains addtional functions and variables to supplement the six
-# module for python 2/3 compatibility.
+# module.
 
-from . import six
 import io
 import sys
 
 # For python 3, the `file` type no longer exists, and open() returns an
 # io.IOBase instance. We add file_types to allow comparison across python
 # versions.  See https://stackoverflow.com/questions/36321030#36321030
 #
-# This means that to test if a variable contains a file in both Python 2 and 3
-# you can use an isinstance test like:
-#     isinstance(value, sgsix.file_types)
-if six.PY3:
-    file_types = (io.IOBase, )
-else:
-    file_types = (file, io.IOBase)  # noqa warning for undefined `file` in python 3
+# This means that to test if a variable contains a file in Python3
+
+file_types = (io.IOBase, )
 
 # For python-api calls that result in an SSL error, the exception raised is
-# different on Python 2 and 3. Store the approriate exception class in a
-# variable to allow easier exception handling across Python 2/3.
-if six.PY3:
-    import ssl
-    ShotgunSSLError = ssl.SSLError
-else:
-    from .httplib2 import SSLHandshakeError
-    ShotgunSSLError = SSLHandshakeError
+# different on Python 3. Store the approriate exception class in a
+# variable to allow easier exception handling across Python 3.
+import ssl
+ShotgunSSLError = ssl.SSLError
 
 
 def normalize_platform(platform, python2=True):
@@ -85,3 +76,48 @@ def normalize_platform(platform, python2=True):
 # sgsix.platform will mimick the python2 sys.platform behavior to ensure
 # compatibility with existing comparisons and dict keys.
 platform = normalize_platform(sys.platform)
+
+
+def ensure_binary(s, encoding='utf-8', errors='strict'):
+    """
+    Coerce **s** to bytes.
+
+    For Python 3:
+      - `str` -> encoded to `bytes`
+      - `bytes` -> `bytes`
+    """
+    if isinstance(s, str):
+        return s.encode(encoding, errors)
+    elif isinstance(s, bytes):
+        return s
+    else:
+        raise TypeError(f"not expecting type '{type(s)}'")
+
+
+def ensure_text(s, encoding='utf-8', errors='strict'):
+    """Coerce *s* to str.
+
+    For Python 3:
+      - `str` -> `str`
+      - `bytes` -> decoded to `str`
+    """
+    if isinstance(s, bytes):
+        return s.decode(encoding, errors)
+    elif isinstance(s, str):
+        return s
+    else:
+        raise TypeError(f"not expecting type '{type(s)}'")
+
+
+def ensure_str(s, encoding='utf-8', errors='strict'):
+    """Coerce *s* to `str`.
+
+    For Python 3:
+      - `str` -> `str`
+      - `bytes` -> decoded to `str`
+    """
+    if not isinstance(s, (str, bytes)):
+        raise TypeError(f"not expecting type '{type(s)}'")
+    if isinstance(s, bytes):
+        s = s.decode(encoding, errors)
+    return s