Drop support for legacy Python 2.7

4 files changed, 15 insertions, 16 deletions

diff --git a/oauthlib/oauth2/rfc6749/endpoints/metadata.py b/oauthlib/oauth2/rfc6749/endpoints/metadata.py
index 936e878..d3ff1d7 100644
--- a/oauthlib/oauth2/rfc6749/endpoints/metadata.py
+++ b/oauthlib/oauth2/rfc6749/endpoints/metadata.py
@@ -13,7 +13,6 @@ import copy
 import json
 import logging
 
-from ....common import unicode_type
 from .base import BaseEndpoint, catch_errors_and_unavailability
 from .authorization import AuthorizationEndpoint
 from .introspect import IntrospectEndpoint
@@ -85,7 +84,7 @@ class MetadataEndpoint(BaseEndpoint):
             if not isinstance(array[key], list):
                 raise ValueError("key {}: {} must be an Array".format(key, array[key]))
             for elem in array[key]:
-                if not isinstance(elem, unicode_type):
+                if not isinstance(elem, str):
                     raise ValueError("array {}: {} must contains only string (not {})".format(key, array[key], elem))
 
     def validate_metadata_token(self, claims, endpoint):
diff --git a/oauthlib/oauth2/rfc6749/parameters.py b/oauthlib/oauth2/rfc6749/parameters.py
index 14d4c0d..b6249d8 100644
--- a/oauthlib/oauth2/rfc6749/parameters.py
+++ b/oauthlib/oauth2/rfc6749/parameters.py
@@ -13,7 +13,7 @@ import json
 import os
 import time
 
-from oauthlib.common import add_params_to_qs, add_params_to_uri, unicode_type
+from oauthlib.common import add_params_to_qs, add_params_to_uri
 from oauthlib.signals import scope_changed
 
 from .errors import (InsecureTransportError, MismatchingStateError,
@@ -82,7 +82,7 @@ def prepare_grant_uri(uri, client_id, response_type, redirect_uri=None,
 
     for k in kwargs:
         if kwargs[k]:
-            params.append((unicode_type(k), kwargs[k]))
+            params.append((str(k), kwargs[k]))
 
     return add_params_to_uri(uri, params)
 
@@ -146,18 +146,18 @@ def prepare_token_request(grant_type, body='', include_client_id=True, **kwargs)
     client_id = kwargs.pop('client_id', None)
     if include_client_id:
         if client_id is not None:
-            params.append((unicode_type('client_id'), client_id))
+            params.append((str('client_id'), client_id))
 
     # the kwargs iteration below only supports including boolean truth (truthy)
     # values, but some servers may require an empty string for `client_secret`
     client_secret = kwargs.pop('client_secret', None)
     if client_secret is not None:
-        params.append((unicode_type('client_secret'), client_secret))
+        params.append((str('client_secret'), client_secret))
 
     # this handles: `code`, `redirect_uri`, and other undocumented params
     for k in kwargs:
         if kwargs[k]:
-            params.append((unicode_type(k), kwargs[k]))
+            params.append((str(k), kwargs[k]))
 
     return add_params_to_qs(body, params)
 
@@ -209,7 +209,7 @@ def prepare_token_revocation_request(url, token, token_type_hint="access_token",
 
     for k in kwargs:
         if kwargs[k]:
-            params.append((unicode_type(k), kwargs[k]))
+            params.append((str(k), kwargs[k]))
 
     headers = {'Content-Type': 'application/x-www-form-urlencoded'}
 
diff --git a/oauthlib/oauth2/rfc6749/tokens.py b/oauthlib/oauth2/rfc6749/tokens.py
index 3587af4..5b99f0c 100644
--- a/oauthlib/oauth2/rfc6749/tokens.py
+++ b/oauthlib/oauth2/rfc6749/tokens.py
@@ -15,7 +15,7 @@ from binascii import b2a_base64
 import warnings
 
 from oauthlib import common
-from oauthlib.common import add_params_to_qs, add_params_to_uri, unicode_type
+from oauthlib.common import add_params_to_qs, add_params_to_uri
 
 from . import utils
 
@@ -158,7 +158,7 @@ def prepare_mac_header(token, uri, key, http_method,
     base_string = '\n'.join(base) + '\n'
 
     # hmac struggles with unicode strings - http://bugs.python.org/issue5285
-    if isinstance(key, unicode_type):
+    if isinstance(key, str):
         key = key.encode('utf-8')
     sign = hmac.new(key, base_string.encode('utf-8'), h)
     sign = b2a_base64(sign.digest())[:-1].decode('utf-8')
diff --git a/oauthlib/oauth2/rfc6749/utils.py b/oauthlib/oauth2/rfc6749/utils.py
index f67019d..7516c9e 100644
--- a/oauthlib/oauth2/rfc6749/utils.py
+++ b/oauthlib/oauth2/rfc6749/utils.py
@@ -10,7 +10,7 @@ from __future__ import absolute_import, unicode_literals
 import datetime
 import os
 
-from oauthlib.common import unicode_type, urldecode
+from oauthlib.common import urldecode
 
 try:
     from urllib import quote
@@ -24,10 +24,10 @@ except ImportError:
 
 def list_to_scope(scope):
     """Convert a list of scopes to a space separated string."""
-    if isinstance(scope, unicode_type) or scope is None:
+    if isinstance(scope, str) or scope is None:
         return scope
     elif isinstance(scope, (set, tuple, list)):
-        return " ".join([unicode_type(s) for s in scope])
+        return " ".join([str(s) for s in scope])
     else:
         raise ValueError("Invalid scope (%s), must be string, tuple, set, or list." % scope)
 
@@ -35,7 +35,7 @@ def list_to_scope(scope):
 def scope_to_list(scope):
     """Convert a space separated string to a list of scopes."""
     if isinstance(scope, (tuple, list, set)):
-        return [unicode_type(s) for s in scope]
+        return [str(s) for s in scope]
     elif scope is None:
         return None
     else:
@@ -74,7 +74,7 @@ def escape(u):
     TODO: verify whether this can in fact be used for OAuth 2
 
     """
-    if not isinstance(u, unicode_type):
+    if not isinstance(u, str):
         raise ValueError('Only unicode objects are escapable.')
     return quote(u.encode('utf-8'), safe=b'~')
 
@@ -84,7 +84,7 @@ def generate_age(issue_time):
     td = datetime.datetime.now() - issue_time
     age = (td.microseconds + (td.seconds + td.days * 24 * 3600)
            * 10 ** 6) / 10 ** 6
-    return unicode_type(age)
+    return str(age)
 
 
 def is_secure_transport(uri):