Merge pull request #164 from blag/fix-bad-merge

Fix bad merge

Author: blag

jose/jwk.py

@@ -118,11 +118,8 @@ def __init__(self, key, algorithm):
 
     def _process_jwk(self, jwk_dict):
         if not jwk_dict.get('kty') == 'oct':
-            raise JWKError("Incorrect key type.  Expected: 'oct', Received: %s" % jwk_dict.get('kty'))
-
             raise JWKError("Incorrect key type. Expected: 'oct', Received: %s" % jwk_dict.get('kty'))
 
-
         k = jwk_dict.get('k')
         k = k.encode('utf-8')
         k = bytes(k)