Handle deprecations

Author: jpadilla

jwt/api_jws.py

@@ -1,6 +1,5 @@
 import binascii
 import json
-import warnings
 
 from .algorithms import requires_cryptography  # NOQA
 from .algorithms import Algorithm, get_default_algorithms, has_crypto
@@ -132,7 +131,6 @@ def decode(
         self,
         jwt,  # type: str
         key="",  # type: str
-        verify=True,  # type: bool
         algorithms=None,  # type: List[str]
         options=None,  # type: Dict
         complete=False,  # type: bool
@@ -143,23 +141,14 @@ def decode(
         verify_signature = merged_options["verify_signature"]
 
         if verify_signature and not algorithms:
-            warnings.warn(
-                "It is strongly recommended that you pass in a "
+            raise DecodeError(
+                "It is required that you pass in a "
                 + 'value for the "algorithms" argument when calling decode(). '
-                + "This argument will be mandatory in a future version.",
-                DeprecationWarning,
             )
 
         payload, signing_input, header, signature = self._load(jwt)
 
-        if not verify:
-            warnings.warn(
-                "The verify parameter is deprecated. "
-                "Please use verify_signature in options instead.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-        elif verify_signature:
+        if verify_signature:
             self._verify_signature(
                 payload, signing_input, header, signature, key, algorithms
             )
@@ -225,13 +214,7 @@ def _load(self, jwt):
         return (payload, signing_input, header, signature)
 
     def _verify_signature(
-        self,
-        payload,
-        signing_input,
-        header,
-        signature,
-        key="",
-        algorithms=None,
+        self, payload, signing_input, header, signature, key, algorithms
     ):
 
         alg = header.get("alg")

jwt/api_jwt.py

@@ -1,5 +1,4 @@
 import json
-import warnings
 from calendar import timegm
 from datetime import datetime, timedelta
 
@@ -77,28 +76,25 @@ def decode(
         self,
         jwt,  # type: str
         key="",  # type: str
-        verify=True,  # type: bool
         algorithms=None,  # type: List[str]
         options=None,  # type: Dict
         complete=False,  # type: bool
         **kwargs
     ):
         # type: (...) -> Dict[str, Any]
 
-        if verify and not algorithms:
-            warnings.warn(
-                "It is strongly recommended that you pass in a "
-                + 'value for the "algorithms" argument when calling decode(). '
-                + "This argument will be mandatory in a future version.",
-                DeprecationWarning,
-            )
-
         payload, _, _, _ = self._load(jwt)
 
         if options is None:
-            options = {"verify_signature": verify}
+            options = {"verify_signature": True}
         else:
-            options.setdefault("verify_signature", verify)
+            options.setdefault("verify_signature", True)
+
+        if options["verify_signature"] and not algorithms:
+            raise DecodeError(
+                "It is required that you pass in a "
+                + 'value for the "algorithms" argument when calling decode(). '
+            )
 
         decoded = super(PyJWT, self).decode(
             jwt,
@@ -119,7 +115,7 @@ def decode(
         if not isinstance(payload, dict):
             raise DecodeError("Invalid payload string: must be a json object")
 
-        if verify:
+        if options["verify_signature"]:
             merged_options = merge_dict(self.options, options)
             self._validate_claims(payload, merged_options, **kwargs)
 
@@ -133,14 +129,6 @@ def _validate_claims(
         self, payload, options, audience=None, issuer=None, leeway=0, **kwargs
     ):
 
-        if "verify_expiration" in kwargs:
-            options["verify_exp"] = kwargs.get("verify_expiration", True)
-            warnings.warn(
-                "The verify_expiration parameter is deprecated. "
-                "Please use verify_exp in options instead.",
-                DeprecationWarning,
-            )
-
         if isinstance(leeway, timedelta):
             leeway = leeway.total_seconds()