Ran isort

Author: rohe

.gitignore

@@ -89,7 +89,6 @@ ENV/
 .ropeproject
 /.project
 /.pydevproject
-.isort.cfg
 .isort.cfg~
 draft/eval.py
 draft/idfed.xml

.isort.cfg

@@ -0,0 +1,5 @@
+[settings]
+force_single_line = 1
+known_first_party = oic
+known_third_party = jwkest,pytest
+default_section = THIRDPARTY

.travis.yml

@@ -3,6 +3,7 @@ language: python
 sudo: false
 
 python:
+  - "3.7"
   - "3.6"
   - "3.5"
 
@@ -14,8 +15,8 @@ env:
 
 matrix:
   include:
-    - python: 3.6
-      env: TOXENV=py36
+    - python: 3.7
+      env: TOXENV=py37
 
 script:
   - tox -e $TOXENV

mypy.ini

@@ -0,0 +1,32 @@
+[mypy]
+check_untyped_defs = True
+
+[mypy-jwkest.*]
+ignore_missing_imports = True
+
+[mypy-saml2.*]
+ignore_missing_imports = True
+
+[mypy-ldap.*]
+ignore_missing_imports = True
+
+[mypy-cryptography.*]
+ignore_missing_imports = True
+
+[mypy-defusedxml.*]
+ignore_missing_imports = True
+
+[mypy-pytest.*]
+ignore_missing_imports = True
+
+[mypy-responses.*]
+ignore_missing_imports = True
+
+[mypy-freezegun.*]
+ignore_missing_imports = True
+
+[mypy-testfixtures.*]
+ignore_missing_imports = True
+
+[mypy-mako.*]
+ignore_missing_imports = True

setup.py

@@ -26,6 +26,8 @@
     version = re.search(r'^__version__\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 
+tests_requires = ['responses', 'pytest']
+
 setup(
     name="cryptojwt",
     version=version,
@@ -41,10 +43,16 @@
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6"
+        "Programming Language :: Python :: 3.7"
     ],
     install_requires=["cryptography", "requests"],
     tests_require=['pytest'],
     zip_safe=False,
+    extras_require={
+        'testing': tests_requires,
+        'docs': ['Sphinx', 'sphinx-autobuild', 'alabaster'],
+        'quality': ['isort'],
+    },
     scripts=glob.glob('script/*.py'),
     entry_points={
          "console_scripts": [

src/cryptojwt/__init__.py

@@ -1,18 +1,18 @@
 """JSON Web Token"""
 import logging
 
-from .exception import BadSyntax
-from .utils import as_unicode
-from .utils import b64encode_item
-from .utils import b64d
-from .utils import split_token
-
+from cryptojwt.jwe.jwe import JWE
 from cryptojwt.jwk import JWK
 from cryptojwt.jws.jws import JWS
-from cryptojwt.jwe.jwe import JWE
 from cryptojwt.jwt import JWT
-from cryptojwt.key_jar import KeyJar
 from cryptojwt.key_bundle import KeyBundle
+from cryptojwt.key_jar import KeyJar
+
+from .exception import BadSyntax
+from .utils import as_unicode
+from .utils import b64d
+from .utils import b64encode_item
+from .utils import split_token
 
 try:
     from builtins import zip
@@ -31,4 +31,3 @@
               "iat": int, "jti": str, "typ": str}
 
 JWT_HEADERS = ["typ", "cty"]
-

src/cryptojwt/exception.py

@@ -105,4 +105,3 @@ class WrongUsage(JWKESTException):
 
 class HTTPException(JWKESTException):
     pass
-

src/cryptojwt/jwe/aes.py

@@ -3,16 +3,17 @@
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hmac
-from cryptography.hazmat.primitives.ciphers import algorithms
 from cryptography.hazmat.primitives.ciphers import Cipher
+from cryptography.hazmat.primitives.ciphers import algorithms
 from cryptography.hazmat.primitives.ciphers import modes
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 from cryptography.hazmat.primitives.padding import PKCS7
 
-from ..exception import VerificationError, Unsupported, MissingKey
-from .exception import UnsupportedBitLength
-
+from ..exception import MissingKey
+from ..exception import Unsupported
+from ..exception import VerificationError
 from . import Encrypter
+from .exception import UnsupportedBitLength
 from .utils import get_keys_seclen_dgst
 
 

src/cryptojwt/jwe/jwe.py

@@ -6,17 +6,16 @@
 from ..jwk.jwk import key_from_jwk_dict
 from ..jwk.rsa import RSAKey
 from ..jwx import JWx
-
 from .exception import DecryptionFailed
 from .exception import NoSuitableDecryptionKey
-from .exception import NoSuitableEncryptionKey
 from .exception import NoSuitableECDHKey
+from .exception import NoSuitableEncryptionKey
 from .exception import NotSupportedAlgorithm
 from .exception import WrongEncryptionAlgorithm
-from .jwenc import JWEnc
-from .jwe_rsa import JWE_RSA
-from .jwe_hmac import JWE_SYM
 from .jwe_ec import JWE_EC
+from .jwe_hmac import JWE_SYM
+from .jwe_rsa import JWE_RSA
+from .jwenc import JWEnc
 from .utils import alg2keytype
 
 logger = logging.getLogger(__name__)

src/cryptojwt/jwe/jwe_ec.py

@@ -2,23 +2,21 @@
 
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
-from cryptography.hazmat.primitives.keywrap import aes_key_wrap
 from cryptography.hazmat.primitives.keywrap import aes_key_unwrap
+from cryptography.hazmat.primitives.keywrap import aes_key_wrap
 
+from ..jwk.ec import NIST2SEC
+from ..jwk.ec import ECKey
+from ..utils import as_bytes
+from ..utils import as_unicode
+from ..utils import b64d
+from ..utils import b64e
 from . import KEY_LEN
 from .jwekey import JWEKey
 from .jwenc import JWEnc
 from .utils import concat_sha256
 from .utils import get_random_bytes
 
-from ..jwk.ec import NIST2SEC
-from ..jwk.ec import ECKey
-
-from ..utils import b64d
-from ..utils import b64e
-from ..utils import as_unicode
-from ..utils import as_bytes
-
 
 def ecdh_derive_key(key, epk, apu, apv, alg, dk_len):
     """

src/cryptojwt/jwe/jwe_hmac.py

@@ -5,13 +5,13 @@
 from cryptography.hazmat.primitives.keywrap import aes_key_unwrap
 from cryptography.hazmat.primitives.keywrap import aes_key_wrap
 
-from .jwekey import JWEKey
-from .jwenc import JWEnc
-
 from ..exception import MissingKey
 from ..exception import WrongNumberOfParts
 from ..jwk.hmac import SYMKey
-from ..utils import intarr2str, as_bytes
+from ..utils import as_bytes
+from ..utils import intarr2str
+from .jwekey import JWEKey
+from .jwenc import JWEnc
 
 logger = logging.getLogger(__name__)
 
@@ -97,4 +97,4 @@ def decrypt(self, token, key=None, cek=None):
         if "zip" in self and self["zip"] == "DEF":
             msg = zlib.decompress(msg)
 
-        return msg
+        return msg

src/cryptojwt/jwe/jwe_rsa.py

@@ -1,15 +1,14 @@
-import zlib
 import logging
+import zlib
 
+from ..utils import as_bytes
 from . import SUPPORTED
-from .exception import ParameterError
 from .exception import NotSupportedAlgorithm
+from .exception import ParameterError
 from .jwekey import JWEKey
 from .jwenc import JWEnc
 from .rsa import RSAEncrypter
 
-from ..utils import as_bytes
-
 logger = logging.getLogger(__name__)
 
 __author__ = 'Roland Hedberg'
@@ -116,4 +115,4 @@ def decrypt(self, token, key, cek=None):
         if "zip" in jwe.headers and jwe.headers["zip"] == "DEF":
             msg = zlib.decompress(msg)
 
-        return msg
+        return msg

src/cryptojwt/jwe/jwekey.py

@@ -1,5 +1,5 @@
+from ..jwx import JWx
 from . import KEY_LEN_BYTES
-
 from .aes import AES_CBCEncrypter
 from .aes import AES_GCMEncrypter
 from .exception import DecryptionFailed
@@ -8,8 +8,6 @@
 from .utils import get_random_bytes
 from .utils import split_ctx_and_tag
 
-from ..jwx import JWx
-
 
 class JWEKey(JWx):
     @staticmethod
@@ -84,4 +82,4 @@ def _decrypt(enc, key, ctxt, iv, tag, auth_data=b''):
         try:
             return aes.decrypt(ctxt, iv=iv, auth_data=auth_data, tag=tag)
         except DecryptionFailed:
-            raise
+            raise

src/cryptojwt/jwe/jwenc.py

@@ -1,8 +1,8 @@
 import logging
 
-from . import SUPPORTED
 from ..simple_jwt import SimpleJWT
 from ..utils import b64encode_item
+from . import SUPPORTED
 
 logger = logging.getLogger(__name__)
 
@@ -56,4 +56,4 @@ def is_jwe(self):
         return True
 
     def __len__(self):
-        return len(self.part)
+        return len(self.part)

src/cryptojwt/jwe/utils.py

@@ -1,6 +1,5 @@
 import os
 import struct
-
 from math import ceil
 
 from cryptography.hazmat.backends import default_backend
@@ -11,7 +10,6 @@
 
 from ..utils import b64e
 
-
 LENMET = {
     32: (16, SHA256),
     48: (24, SHA384),
@@ -37,8 +35,8 @@ def get_keys_seclen_dgst(key, iv):
     return ka, ke, seclen, hash_method
 
 
-def int2big_endian(n):
-    return [ord(c) for c in struct.pack('>I', n)]
+# def int2big_endian(n):
+#     return [ord(c) for c in struct.pack('>I', n)]
 
 
 # def party_value(pv):
@@ -119,4 +117,3 @@ def concat_sha256(secret, dk_len, other_info):
         digest.update(other_info)
         dkm += digest.finalize()
     return dkm[:dk_bytes]
-