Remove a couple of py2 references

adamjmcgrath · adamjmcgrath · commit b92344b8311c · 2023-01-19T14:58:11.000Z
diff --git a/EXAMPLES.md b/EXAMPLES.md
@@ -145,7 +145,7 @@ resets is exposed in the `reset_at` property. When the header is unset, this val
 
 ### Asynchronous environments
 
-This SDK provides async methods built on top of [asyncio](https://docs.python.org/3/library/asyncio.html). To make them available you must have Python >=3.6 and the [aiohttp](https://docs.aiohttp.org/en/stable/) module installed.
+This SDK provides async methods built on top of [asyncio](https://docs.python.org/3/library/asyncio.html). To make them available you must have the [aiohttp](https://docs.aiohttp.org/en/stable/) module installed.
 
 Then additional methods with the `_async` suffix will be added to modules created by the `management.Auth0` class or to classes that are passed to the `asyncify` method. For example:
 
diff --git a/auth0/authentication/token_verifier.py b/auth0/authentication/token_verifier.py
@@ -298,16 +298,8 @@ def verify(self, token, nonce=None, max_age=None, organization=None):
         return payload
 
     def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
-        try:
-            # on Python 2.7, 'str' keys as parsed as 'unicode'
-            # But 'unicode' was removed on Python 3.7
-            # noinspection PyUnresolvedReferences
-            ustr = unicode
-        except NameError:
-            ustr = str
-
         # Issuer
-        if "iss" not in payload or not isinstance(payload["iss"], (str, ustr)):
+        if "iss" not in payload or not isinstance(payload["iss"], str):
             raise TokenValidationError(
                 "Issuer (iss) claim must be a string present in the ID token"
             )
@@ -318,13 +310,13 @@ def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
             )
 
         # Subject
-        if "sub" not in payload or not isinstance(payload["sub"], (str, ustr)):
+        if "sub" not in payload or not isinstance(payload["sub"], str):
             raise TokenValidationError(
                 "Subject (sub) claim must be a string present in the ID token"
             )
 
         # Audience
-        if "aud" not in payload or not isinstance(payload["aud"], (str, ustr, list)):
+        if "aud" not in payload or not isinstance(payload["aud"], (str, list)):
             raise TokenValidationError(
                 "Audience (aud) claim must be a string or array of strings present in"
                 " the ID token"
@@ -336,7 +328,7 @@ def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
                 'Audience (aud) claim mismatch in the ID token; expected "{}" but was '
                 'not one of "{}"'.format(self.aud, payload_audiences)
             )
-        elif isinstance(payload["aud"], (str, ustr)) and payload["aud"] != self.aud:
+        elif isinstance(payload["aud"], str) and payload["aud"] != self.aud:
             raise TokenValidationError(
                 'Audience (aud) claim mismatch in the ID token; expected "{}" '
                 'but found "{}"'.format(self.aud, payload["aud"])
@@ -367,7 +359,7 @@ def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
 
         # Nonce
         if nonce:
-            if "nonce" not in payload or not isinstance(payload["nonce"], (str, ustr)):
+            if "nonce" not in payload or not isinstance(payload["nonce"], str):
                 raise TokenValidationError(
                     "Nonce (nonce) claim must be a string present in the ID token"
                 )
@@ -379,9 +371,7 @@ def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
 
         # Organization
         if organization:
-            if "org_id" not in payload or not isinstance(
-                payload["org_id"], (str, ustr)
-            ):
+            if "org_id" not in payload or not isinstance(payload["org_id"], str):
                 raise TokenValidationError(
                     "Organization (org_id) claim must be a string present in the ID"
                     " token"
@@ -394,7 +384,7 @@ def _verify_payload(self, payload, nonce=None, max_age=None, organization=None):
 
         # Authorized party
         if isinstance(payload["aud"], list) and len(payload["aud"]) > 1:
-            if "azp" not in payload or not isinstance(payload["azp"], (str, ustr)):
+            if "azp" not in payload or not isinstance(payload["azp"], str):
                 raise TokenValidationError(
                     "Authorized Party (azp) claim must be a string present in the ID"
                     " token when Audience (aud) claim has multiple values"
