Drop support for legacy Python 2.7

8 files changed, 31 insertions, 57 deletions

diff --git a/oauthlib/common.py b/oauthlib/common.py
index 5aeb015..1462e75 100644
--- a/oauthlib/common.py
+++ b/oauthlib/common.py
@@ -51,17 +51,10 @@ always_safe = ('ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 
 log = logging.getLogger('oauthlib')
 
-PY3 = sys.version_info[0] == 3
-
-if PY3:
-    unicode_type = str
-else:
-    unicode_type = unicode
-
 
 # 'safe' must be bytes (Python 2.6 requires bytes, other versions allow either)
 def quote(s, safe=b'/'):
-    s = s.encode('utf-8') if isinstance(s, unicode_type) else s
+    s = s.encode('utf-8') if isinstance(s, str) else s
     s = _quote(s, safe)
     # PY3 always returns unicode.  PY2 may return either, depending on whether
     # it had to modify the string.
@@ -83,7 +76,7 @@ def unquote(s):
 def urlencode(params):
     utf8_params = encode_params_utf8(params)
     urlencoded = _urlencode(utf8_params)
-    if isinstance(urlencoded, unicode_type):  # PY3 returns unicode
+    if isinstance(urlencoded, str):
         return urlencoded
     else:
         return urlencoded.decode("utf-8")
@@ -96,8 +89,8 @@ def encode_params_utf8(params):
     encoded = []
     for k, v in params:
         encoded.append((
-            k.encode('utf-8') if isinstance(k, unicode_type) else k,
-            v.encode('utf-8') if isinstance(v, unicode_type) else v))
+            k.encode('utf-8') if isinstance(k, str) else k,
+            v.encode('utf-8') if isinstance(v, str) else v))
     return encoded
 
 
@@ -141,22 +134,6 @@ def urldecode(query):
     if INVALID_HEX_PATTERN.search(query):
         raise ValueError('Invalid hex encoding in query string.')
 
-    # We encode to utf-8 prior to parsing because parse_qsl behaves
-    # differently on unicode input in python 2 and 3.
-    # Python 2.7
-    # >>> urlparse.parse_qsl(u'%E5%95%A6%E5%95%A6')
-    # u'\xe5\x95\xa6\xe5\x95\xa6'
-    # Python 2.7, non unicode input gives the same
-    # >>> urlparse.parse_qsl('%E5%95%A6%E5%95%A6')
-    # '\xe5\x95\xa6\xe5\x95\xa6'
-    # but now we can decode it to unicode
-    # >>> urlparse.parse_qsl('%E5%95%A6%E5%95%A6').decode('utf-8')
-    # u'\u5566\u5566'
-    # Python 3.3 however
-    # >>> urllib.parse.parse_qsl(u'%E5%95%A6%E5%95%A6')
-    # u'\u5566\u5566'
-    query = query.encode(
-        'utf-8') if not PY3 and isinstance(query, unicode_type) else query
     # We want to allow queries such as "c2" whereas urlparse.parse_qsl
     # with the strict_parsing flag will not.
     params = urlparse.parse_qsl(query, keep_blank_values=True)
@@ -173,7 +150,7 @@ def extract_params(raw):
     empty list of parameters. Any other input will result in a return
     value of None.
     """
-    if isinstance(raw, (bytes, unicode_type)):
+    if isinstance(raw, (bytes, str)):
         try:
             params = urldecode(raw)
         except ValueError:
@@ -206,7 +183,7 @@ def generate_nonce():
     .. _`section 3.2.1`: https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-3.2.1
     .. _`section 3.3`: https://tools.ietf.org/html/rfc5849#section-3.3
     """
-    return unicode_type(unicode_type(randbits(64)) + generate_timestamp())
+    return str(str(randbits(64)) + generate_timestamp())
 
 
 def generate_timestamp():
@@ -218,7 +195,7 @@ def generate_timestamp():
     .. _`section 3.2.1`: https://tools.ietf.org/html/draft-ietf-oauth-v2-http-mac-01#section-3.2.1
     .. _`section 3.3`: https://tools.ietf.org/html/rfc5849#section-3.3
     """
-    return unicode_type(int(time.time()))
+    return str(int(time.time()))
 
 
 def generate_token(length=30, chars=UNICODE_ASCII_CHARACTER_SET):
@@ -305,11 +282,11 @@ def safe_string_equals(a, b):
 
 def to_unicode(data, encoding='UTF-8'):
     """Convert a number of different types of objects to unicode."""
-    if isinstance(data, unicode_type):
+    if isinstance(data, str):
         return data
 
     if isinstance(data, bytes):
-        return unicode_type(data, encoding=encoding)
+        return str(data, encoding=encoding)
 
     if hasattr(data, '__iter__'):
         try:
diff --git a/oauthlib/oauth1/rfc5849/signature.py b/oauthlib/oauth1/rfc5849/signature.py
index a60bee2..5b080aa 100644
--- a/oauthlib/oauth1/rfc5849/signature.py
+++ b/oauthlib/oauth1/rfc5849/signature.py
@@ -28,8 +28,7 @@ import hashlib
 import hmac
 import logging
 
-from oauthlib.common import (extract_params, safe_string_equals,
-                             unicode_type, urldecode)
+from oauthlib.common import extract_params, safe_string_equals, urldecode
 
 from . import utils
 
@@ -128,7 +127,7 @@ def base_string_uri(uri, host=None):
 
     The host argument overrides the netloc part of the uri argument.
     """
-    if not isinstance(uri, unicode_type):
+    if not isinstance(uri, str):
         raise ValueError('uri must be a unicode object.')
 
     # FIXME: urlparse does not support unicode
@@ -577,7 +576,7 @@ def sign_rsa_sha1(base_string, rsa_private_key):
     .. _`RFC3447, Section 8.2`: https://tools.ietf.org/html/rfc3447#section-8.2
 
     """
-    if isinstance(base_string, unicode_type):
+    if isinstance(base_string, str):
         base_string = base_string.encode('utf-8')
     # TODO: finish RSA documentation
     alg = _jwt_rs1_signing_algorithm()
diff --git a/oauthlib/oauth1/rfc5849/utils.py b/oauthlib/oauth1/rfc5849/utils.py
index 735f21d..a010aea 100644
--- a/oauthlib/oauth1/rfc5849/utils.py
+++ b/oauthlib/oauth1/rfc5849/utils.py
@@ -8,7 +8,7 @@ spec.
 """
 from __future__ import absolute_import, unicode_literals
 
-from oauthlib.common import quote, unicode_type, unquote
+from oauthlib.common import quote, unquote
 
 try:
     import urllib2
@@ -52,7 +52,7 @@ def escape(u):
     .. _`section 3.6`: https://tools.ietf.org/html/rfc5849#section-3.6
 
     """
-    if not isinstance(u, unicode_type):
+    if not isinstance(u, str):
         raise ValueError('Only unicode objects are escapable. ' +
                          'Got %r of type %s.' % (u, type(u)))
     # Letters, digits, and the characters '_.-' are already treated as safe
@@ -61,7 +61,7 @@ def escape(u):
 
 
 def unescape(u):
-    if not isinstance(u, unicode_type):
+    if not isinstance(u, str):
         raise ValueError('Only unicode objects are unescapable.')
     return unquote(u)
 
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):
diff --git a/oauthlib/openid/connect/core/endpoints/userinfo.py b/oauthlib/openid/connect/core/endpoints/userinfo.py
index 7a39f76..d7387fe 100644
--- a/oauthlib/openid/connect/core/endpoints/userinfo.py
+++ b/oauthlib/openid/connect/core/endpoints/userinfo.py
@@ -10,7 +10,6 @@ import json
 import logging
 
 from oauthlib.common import Request
-from oauthlib.common import unicode_type
 from oauthlib.oauth2.rfc6749.endpoints.base import BaseEndpoint
 from oauthlib.oauth2.rfc6749.endpoints.base import catch_errors_and_unavailability
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
@@ -55,7 +54,7 @@ class UserInfoEndpoint(BaseEndpoint):
                 log.error('Userinfo MUST have "sub" for %r.', request)
                 raise errors.ServerError(status_code=500)
             body = json.dumps(claims)
-        elif isinstance(claims, unicode_type):
+        elif isinstance(claims, str):
             resp_headers = {
                 'Content-Type': 'application/jwt'
             }