Update oauthlib-3.1.1

lib/oauthlib/oauth2/rfc6749/utils.py

@@ -1,31 +1,22 @@
-# -*- coding: utf-8 -*-
 """
 oauthlib.utils
 ~~~~~~~~~~~~~~
 
 This module contains utility methods used by various parts of the OAuth 2 spec.
 """
-from __future__ import absolute_import, unicode_literals
-
-import os
 import datetime
-try:
-    from urllib import quote
-except ImportError:
-    from urllib.parse import quote
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
-from oauthlib.common import unicode_type, urldecode
+import os
+from urllib.parse import quote, urlparse
+
+from oauthlib.common import urldecode
 
 
 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)
 
@@ -33,7 +24,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:
@@ -72,7 +63,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'~')
 
@@ -82,7 +73,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):