migrate oci away from six

src/oci/_vendor/__init__.py

@@ -6,7 +6,6 @@
 from . import httpsig_cffi  # noqa: F401
 from . import jwt  # noqa: F401
 from . import idna  # noqa: F401
-from . import six  # noqa: F401
 from . import urllib3  # noqa: F401
 from . import requests  # noqa: F401
 from . import sseclient  # noqa: F401

src/oci/_vendor/httpsig_cffi/sign.py

@@ -5,7 +5,6 @@
 # Original Work: Copyright (c) 2012 Adam T. Lindsay (original author)
 
 import base64
-from oci._vendor import six
 
 from cryptography.hazmat.backends import default_backend  # noqa: F401
 from cryptography.hazmat.primitives import hashes, hmac, serialization  # noqa: F401
@@ -29,7 +28,7 @@ def __init__(self, secret, algorithm=None):
             algorithm = DEFAULT_SIGN_ALGORITHM
 
         assert algorithm in ALGORITHMS, "Unknown algorithm"  # noqa: F405
-        if isinstance(secret, six.string_types):
+        if isinstance(secret, str):
             secret = secret.encode("ascii")
 
         self._rsa_public = None
@@ -66,19 +65,19 @@ def algorithm(self):
         return '%s-%s' % (self.sign_algorithm, self.hash_algorithm)
 
     def _sign_rsa(self, data):
-        if isinstance(data, six.string_types):
+        if isinstance(data, str):
             data = data.encode("ascii")
         return self._rsa_private.sign(data, padding.PKCS1v15(), self._rsahash())
 
     def _sign_hmac(self, data):
-        if isinstance(data, six.string_types):
+        if isinstance(data, str):
             data = data.encode("ascii")
         hmac = self._hash.copy()
         hmac.update(data)
         return hmac.finalize()
 
     def _sign(self, data):
-        if isinstance(data, six.string_types):
+        if isinstance(data, str):
             data = data.encode("ascii")
 
         signed = None

src/oci/_vendor/httpsig_cffi/utils.py

@@ -8,7 +8,6 @@
 import struct
 import hashlib
 import base64
-from oci._vendor import six
 
 try:
     # Python 3
@@ -62,7 +61,7 @@ def generate_message(required_headers, headers, host=None, method=None, path=Non
 
 
 def parse_authorization_header(header):
-    if not isinstance(header, six.string_types):
+    if not isinstance(header, str):
         header = header.decode("ascii")  # HTTP headers cannot be Unicode.
 
     auth = header.split(" ", 1)
@@ -140,7 +139,7 @@ class CaseInsensitiveDict(dict):
     def __init__(self, d=None, **kwargs):
         super(CaseInsensitiveDict, self).__init__(**kwargs)
         if d:
-            self.update((k.lower(), v) for k, v in six.iteritems(d))
+            self.update((k.lower(), v) for k, v in d.items())
 
     def __setitem__(self, key, value):
         super(CaseInsensitiveDict, self).__setitem__(key.lower(), value)

src/oci/_vendor/httpsig_cffi/verify.py

@@ -7,7 +7,6 @@
 """
 Module to assist in verifying a signed header.
 """
-from oci._vendor import six
 
 from cryptography.hazmat.backends import default_backend  # noqa: 401
 from cryptography.hazmat.primitives import hashes, hmac, serialization  # noqa: 401
@@ -33,9 +32,9 @@ def _verify(self, data, signature):
         `signature` is a base64-encoded signature to verify against `data`
         """
 
-        if isinstance(data, six.string_types):
+        if isinstance(data, str):
             data = data.encode("ascii")
-        if isinstance(signature, six.string_types):
+        if isinstance(signature, str):
             signature = signature.encode("ascii")
 
         if self.sign_algorithm == 'rsa':