get rid of six

Author: rohe

src/cryptojwt/jwe.py

@@ -9,7 +9,6 @@
 import struct
 import logging
 import zlib
-import six
 
 from math import ceil
 
@@ -522,7 +521,7 @@ def encrypt(self, key, iv="", cek="", **kwargs):
                 kek = key.key.encode('utf8')
             except AttributeError:
                 kek = key.key
-        elif isinstance(key, six.binary_type):
+        elif isinstance(key, bytes):
             kek = key
         else:
             kek = intarr2str(key)

src/cryptojwt/jwk.py

@@ -2,8 +2,6 @@
 import hashlib
 import logging
 import json
-import six
-import sys
 
 from cryptography import x509
 
@@ -21,17 +19,14 @@
 from cryptojwt import b64d
 from cryptojwt import b64e
 from cryptojwt import long_to_base64
-from cryptojwt.exception import UnknownAlgorithm, JWKException, HeaderError, \
-    JWKESTException
+from cryptojwt.exception import HeaderError
+from cryptojwt.exception import JWKESTException
+from cryptojwt.exception import JWKException
+from cryptojwt.exception import UnknownAlgorithm
 from cryptojwt.exception import DeSerializationNotPossible
 from cryptojwt.exception import SerializationNotPossible
 
-if sys.version > '3':
-    long = int
-else:
-    from __builtin__ import long
-
-__author__ = 'rohe0002'
+__author__ = 'roland hedberg'
 
 logger = logging.getLogger(__name__)
 
@@ -334,22 +329,22 @@ def __init__(self, kty="", alg="", use="", kid="", key=None, x5c=None,
         self.extra_args = kwargs
 
         # want kty, alg, use and kid to be strings
-        if isinstance(kty, six.string_types):
+        if isinstance(kty, str):
             self.kty = kty
         else:
             self.kty = as_unicode(kty)
 
-        if isinstance(alg, six.string_types):
+        if isinstance(alg, str):
             self.alg = alg
         else:
             self.alg = as_unicode(alg)
 
-        if isinstance(use, six.string_types):
+        if isinstance(use, str):
             self.use = use
         else:
             self.use = as_unicode(use)
 
-        if isinstance(kid, six.string_types):
+        if isinstance(kid, str):
             self.kid = kid
         else:
             self.kid = as_unicode(kid)
@@ -438,7 +433,7 @@ def verify(self):
                     return False
 
         if self.kid:
-            if not isinstance(self.kid, six.string_types):
+            if not isinstance(self.kid, str):
                 raise HeaderError("kid of wrong value type")
         return True
 
@@ -449,9 +444,8 @@ def __eq__(self, other):
         :param other: The other Key instance
         :return: True if they are the same otherwise False.
         """
-        try:
-            if self.__class__ != other.__class__:
-                return False
+        if self.__class__ != other.__class__:
+            return False
 
         if set(self.__dict__.keys()) != set(other.__dict__.keys()):
             return False
@@ -635,7 +629,7 @@ def deserialize(self):
                         continue
                     else:
                         try:
-                            val = long(deser(item))
+                            val = int(deser(item))
                         except Exception:
                             raise
                         else:

src/cryptojwt/jws.py

@@ -3,7 +3,7 @@
 import logging
 import struct
 import sys
-import six
+
 from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
@@ -361,7 +361,7 @@ def headers(self, extra=None):
             _header["jwk"] = extra["jwk"].serialize()
 
         if "kid" in self:
-            if not isinstance(self["kid"], six.string_types):
+            if not isinstance(self["kid"], str):
                 raise HeaderError("kid of wrong value type")
 
         return _header

src/cryptojwt/jwt.py

@@ -1,7 +1,7 @@
 import logging
-from datetime import datetime
 import json
 import uuid
+from datetime import datetime
 
 from cryptojwt import as_unicode
 from cryptojwt import jwe