Fixed linting errors

Author: alistairwatts

jose/backends/cryptography_backend.py

@@ -16,7 +16,15 @@
 
 from ..constants import ALGORITHMS
 from ..exceptions import JWEError, JWKError
-from ..utils import base64_to_long, base64url_decode, base64url_encode, ensure_binary, long_to_base64, is_pem_format, is_ssh_key
+from ..utils import (
+    base64_to_long,
+    base64url_decode,
+    base64url_encode,
+    ensure_binary,
+    is_pem_format,
+    is_ssh_key,
+    long_to_base64,
+)
 from .base import Key
 
 _binding = None

jose/utils.py

@@ -110,7 +110,8 @@ def ensure_binary(s):
 
 # The following was copied from PyJWT:
 #   https://github.com/jpadilla/pyjwt/commit/9c528670c455b8d948aff95ed50e22940d1ad3fc
-# Based on https://github.com/hynek/pem/blob/7ad94db26b0bc21d10953f5dbad3acfdfacf57aa/src/pem/_core.py#L224-L252
+# Based on:
+#   https://github.com/hynek/pem/blob/7ad94db26b0bc21d10953f5dbad3acfdfacf57aa/src/pem/_core.py#L224-L252
 _PEMS = {
     b"CERTIFICATE",
     b"TRUSTED CERTIFICATE",
@@ -130,15 +131,19 @@ def ensure_binary(s):
     b"X509 CRL",
 }
 _PEM_RE = re.compile(
-    b"----[- ]BEGIN ("
-    + b"|".join(re.escape(pem) for pem in _PEMS)
-    + b")[- ]----",
+    b"----[- ]BEGIN (" + b"|".join(re.escape(pem) for pem in _PEMS) + b")[- ]----",
 )
+
+
 def is_pem_format(key: bytes) -> bool:
     return bool(_PEM_RE.search(key))
-# Based on https://github.com/pyca/cryptography/blob/bcb70852d577b3f490f015378c75cba74986297b/src/cryptography/hazmat/primitives/serialization/ssh.py#L40-L46
+
+
+# Based on
+# https://github.com/pyca/cryptography/blob/bcb70852d577b3f490f015378c75cba74986297b
+#   /src/cryptography/hazmat/primitives/serialization/ssh.py#L40-L46
 _CERT_SUFFIX = b"[email protected]"
-_SSH_PUBKEY_RC = re.compile(br"\A(\S+)[ \t]+(\S+)")
+_SSH_PUBKEY_RC = re.compile(rb"\A(\S+)[ \t]+(\S+)")
 _SSH_KEY_FORMATS = [
     b"ssh-ed25519",
     b"ssh-rsa",
@@ -147,6 +152,8 @@ def is_pem_format(key: bytes) -> bool:
     b"ecdsa-sha2-nistp384",
     b"ecdsa-sha2-nistp521",
 ]
+
+
 def is_ssh_key(key: bytes) -> bool:
     if any(string_value in key for string_value in _SSH_KEY_FORMATS):
         return True

tests/algorithms/test_EC.py

@@ -1,6 +1,8 @@
+import base64
 import json
 import re
 
+from jose import jwt
 from jose.backends import ECKey
 from jose.constants import ALGORITHMS
 from jose.exceptions import JOSEError, JWKError
@@ -14,9 +16,11 @@
 
 try:
     from cryptography.hazmat.backends import default_backend as CryptographyBackend
+    from cryptography.hazmat.primitives import hashes, hmac, serialization
     from cryptography.hazmat.primitives.asymmetric import ec as CryptographyEc
 
     from jose.backends.cryptography_backend import CryptographyECKey
+
 except ImportError:
     CryptographyECKey = CryptographyEc = CryptographyBackend = None
 
@@ -228,26 +232,21 @@ def test_to_dict(self):
 @pytest.mark.cryptography
 @pytest.mark.skipif(CryptographyECKey is None, reason="pyca/cryptography backend not available")
 def test_incorrect_public_key_hmac_signing():
-    import base64
-    from cryptography.hazmat.primitives import hashes, hmac, serialization
-
-    from jose import jwt
-
     def b64(x):
-        return base64.urlsafe_b64encode(x).replace(b'=', b'')
+        return base64.urlsafe_b64encode(x).replace(b"=", b"")
 
     KEY = CryptographyEc.generate_private_key(CryptographyEc.SECP256R1)
     PUBKEY = KEY.public_key().public_bytes(
         encoding=serialization.Encoding.OpenSSH,
-        format=serialization.PublicFormat.OpenSSH
+        format=serialization.PublicFormat.OpenSSH,
     )
 
     # Create and sign the payload using a public key, but specify the "alg" in
     # the claims that a symmetric key was used.
-    payload = b64(b'{"alg":"HS256"}') + b'.' + b64(b'{"pwned":true}')
+    payload = b64(b'{"alg":"HS256"}') + b"." + b64(b'{"pwned":true}')
     hasher = hmac.HMAC(PUBKEY, hashes.SHA256())
     hasher.update(payload)
-    evil_token = payload + b'.' + b64(hasher.finalize())
+    evil_token = payload + b"." + b64(hasher.finalize())
 
     # Verify and decode the token using the public key. The custom algorithm
     # field is left unspecified. Decoding using a public key should be