Merge pull request #101 from blag/flake8-fixes

Fix all flake8 issues except for E501 (line too long)

Author: mpdavis

jose/__init__.py

@@ -5,7 +5,7 @@
 __copyright__ = 'Copyright 2016 Michael Davis'
 
 
-from .exceptions import JOSEError
-from .exceptions import JWSError
-from .exceptions import ExpiredSignatureError
-from .exceptions import JWTError
+from .exceptions import JOSEError  # noqa: F401
+from .exceptions import JWSError  # noqa: F401
+from .exceptions import ExpiredSignatureError  # noqa: F401
+from .exceptions import JWTError  # noqa: F401

jose/backends/__init__.py

@@ -1,13 +1,13 @@
 
 try:
-    from jose.backends.pycrypto_backend import RSAKey
+    from jose.backends.pycrypto_backend import RSAKey  # noqa: F401
 except ImportError:
     try:
-        from jose.backends.cryptography_backend import CryptographyRSAKey as RSAKey
+        from jose.backends.cryptography_backend import CryptographyRSAKey as RSAKey  # noqa: F401
     except ImportError:
-        from jose.backends.rsa_backend import RSAKey
+        from jose.backends.rsa_backend import RSAKey  # noqa: F401
 
 try:
-    from jose.backends.cryptography_backend import CryptographyECKey as ECKey
+    from jose.backends.cryptography_backend import CryptographyECKey as ECKey  # noqa: F401
 except ImportError:
-    from jose.backends.ecdsa_backend import ECDSAECKey as ECKey
+    from jose.backends.ecdsa_backend import ECDSAECKey as ECKey  # noqa: F401

jose/backends/cryptography_backend.py

@@ -93,7 +93,7 @@ def sign(self, msg):
         if self.hash_alg.digest_size * 8 > self.prepared_key.curve.key_size:
             raise TypeError("this curve (%s) is too short "
                             "for your digest (%d)" % (self.prepared_key.curve.name,
-                                                      8*self.hash_alg.digest_size))
+                                                      8 * self.hash_alg.digest_size))
         signature = self.prepared_key.sign(msg, ec.ECDSA(self.hash_alg()))
         order = (2 ** self.prepared_key.curve.key_size) - 1
         return sigencode_string(*sigdecode_der(signature, order), order=order)
@@ -104,7 +104,7 @@ def verify(self, msg, sig):
         try:
             self.prepared_key.verify(signature, msg, ec.ECDSA(self.hash_alg()))
             return True
-        except:
+        except Exception:
             return False
 
     def is_public(self):

jose/backends/ecdsa_backend.py

@@ -96,7 +96,7 @@ def sign(self, msg):
     def verify(self, msg, sig):
         try:
             return self.prepared_key.verify(sig, msg, hashfunc=self.hash_alg, sigdecode=ecdsa.util.sigdecode_string)
-        except:
+        except Exception:
             return False
 
     def is_public(self):

jose/backends/pycrypto_backend.py

@@ -23,7 +23,6 @@
     _RSAKey = RSA.RsaKey
 else:
     _RSAKey = RSA._RSAobj
-    
 
 
 class RSAKey(Key):

jose/backends/rsa_backend.py

@@ -17,14 +17,15 @@
 # to enable pure python rsa module to be in compliance with section 6.3.1 of RFC7518
 # which requires only private exponent (d) for private key.
 
+
 def _gcd(a, b):
     """Calculate the Greatest Common Divisor of a and b.
 
     Unless b==0, the result will have the same sign as b (so that when
     b is divided by it, the result comes out positive).
     """
     while b:
-        a, b = b, a%b
+        a, b = b, (a % b)
     return a
 
 
@@ -138,7 +139,7 @@ def _process_jwk(self, jwk_dict):
         e = base64_to_long(jwk_dict.get('e'))
         n = base64_to_long(jwk_dict.get('n'))
 
-        if not 'd' in jwk_dict:
+        if 'd' not in jwk_dict:
             return pyrsa.PublicKey(e=e, n=n)
         else:
             d = base64_to_long(jwk_dict.get('d'))
@@ -159,8 +160,6 @@ def _process_jwk(self, jwk_dict):
                 p, q = _rsa_recover_prime_factors(n, e, d)
                 return pyrsa.PrivateKey(n=n, e=e, d=d, p=p, q=q)
 
-
-
     def sign(self, msg):
         return pyrsa.sign(msg, self._prepared_key, self.hash_alg)
 

jose/jwk.py

@@ -10,12 +10,12 @@
 from jose.backends.base import Key
 
 try:
-    from jose.backends import RSAKey
+    from jose.backends import RSAKey  # noqa: F401
 except ImportError:
     pass
 
 try:
-    from jose.backends import ECKey
+    from jose.backends import ECKey  # noqa: F401
 except ImportError:
     pass
 
@@ -26,10 +26,10 @@ def get_key(algorithm):
     elif algorithm in ALGORITHMS.HMAC:
         return HMACKey
     elif algorithm in ALGORITHMS.RSA:
-        from jose.backends import RSAKey
+        from jose.backends import RSAKey  # noqa: F811
         return RSAKey
     elif algorithm in ALGORITHMS.EC:
-        from jose.backends import ECKey
+        from jose.backends import ECKey  # noqa: F811
         return ECKey
     return None
 

jose/jws.py

@@ -213,7 +213,7 @@ def _sig_matches_keys(keys, signing_input, signature, alg):
         try:
             if key.verify(signing_input, signature):
                 return True
-        except:
+        except Exception:
             pass
     return False
 
@@ -252,18 +252,18 @@ def _get_keys(key):
 
 def _verify_signature(signing_input, header, signature, key='', algorithms=None):
 
-        alg = header.get('alg')
-        if not alg:
-            raise JWSError('No algorithm was specified in the JWS header.')
+    alg = header.get('alg')
+    if not alg:
+        raise JWSError('No algorithm was specified in the JWS header.')
 
-        if algorithms is not None and alg not in algorithms:
-            raise JWSError('The specified alg value is not allowed')
+    if algorithms is not None and alg not in algorithms:
+        raise JWSError('The specified alg value is not allowed')
 
-        keys = _get_keys(key)
-        try:
-            if not _sig_matches_keys(keys, signing_input, signature, alg):
-                raise JWSSignatureError()
-        except JWSSignatureError:
-            raise JWSError('Signature verification failed.')
-        except JWSError:
-            raise JWSError('Invalid or unsupported algorithm: %s' % alg)
+    keys = _get_keys(key)
+    try:
+        if not _sig_matches_keys(keys, signing_input, signature, alg):
+            raise JWSSignatureError()
+    except JWSSignatureError:
+        raise JWSError('Signature verification failed.')
+    except JWSError:
+        raise JWSError('Invalid or unsupported algorithm: %s' % alg)

jose/jwt.py

@@ -1,5 +1,4 @@
 
-import binascii
 import json
 
 from calendar import timegm
@@ -170,7 +169,7 @@ def get_unverified_header(token):
     """
     try:
         headers = jws.get_unverified_headers(token)
-    except:
+    except Exception:
         raise JWTError('Error decoding token headers.')
 
     return headers
@@ -208,7 +207,7 @@ def get_unverified_claims(token):
     """
     try:
         claims = jws.get_unverified_claims(token)
-    except:
+    except Exception:
         raise JWTError('Error decoding token claims.')
 
     try:
@@ -386,6 +385,7 @@ def _validate_sub(claims, subject=None):
         if claims.get('sub') != subject:
             raise JWTClaimsError('Invalid subject')
 
+
 def _validate_jti(claims):
     """Validates that the 'jti' claim is valid.
 
@@ -435,7 +435,7 @@ def _validate_at_hash(claims, access_token, algorithm):
     except (TypeError, ValueError):
         msg = 'Unable to calculate at_hash to verify against token claims.'
         raise JWTClaimsError(msg)
-        
+
     if claims['at_hash'] != expected_hash:
         raise JWTClaimsError('at_hash claim does not match access_token.')
 

tests/algorithms/test_EC.py

@@ -107,8 +107,8 @@ def test_verify(self, Backend):
         signature = key.sign(msg)
         public_key = key.public_key()
 
-        assert public_key.verify(msg, signature) == True
-        assert public_key.verify(msg, b'not a signature') == False
+        assert bool(public_key.verify(msg, signature))
+        assert not bool(public_key.verify(msg, b'not a signature'))
 
     def assert_parameters(self, as_dict, private):
         assert isinstance(as_dict, dict)