Drop support for legacy Python 2.7

15 files changed, 18 insertions, 77 deletions

diff --git a/oauthlib/common.py b/oauthlib/common.py
index 52a3567..f4571ca 100644
--- a/oauthlib/common.py
+++ b/oauthlib/common.py
@@ -12,9 +12,12 @@ import collections
 import datetime
 import logging
 import re
-import sys
 import time
+import urllib.parse as urlparse
 from . import get_debug
+from urllib.parse import quote as _quote
+from urllib.parse import unquote as _unquote
+from urllib.parse import urlencode as _urlencode
 
 try:
     from secrets import randbits
@@ -22,18 +25,6 @@ try:
 except ImportError:
     from random import getrandbits as randbits
     from random import SystemRandom
-try:
-    from urllib import quote as _quote
-    from urllib import unquote as _unquote
-    from urllib import urlencode as _urlencode
-except ImportError:
-    from urllib.parse import quote as _quote
-    from urllib.parse import unquote as _unquote
-    from urllib.parse import urlencode as _urlencode
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
 
 UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz'
                                'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
diff --git a/oauthlib/oauth1/rfc5849/__init__.py b/oauthlib/oauth1/rfc5849/__init__.py
index cdc96e8..da9b1ac 100644
--- a/oauthlib/oauth1/rfc5849/__init__.py
+++ b/oauthlib/oauth1/rfc5849/__init__.py
@@ -12,11 +12,7 @@ import hashlib
 import logging
 log = logging.getLogger(__name__)
 
-import sys
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+import urllib.parse as urlparse
 
 from oauthlib.common import Request, urlencode, generate_nonce
 from oauthlib.common import generate_timestamp, to_unicode
diff --git a/oauthlib/oauth1/rfc5849/endpoints/authorization.py b/oauthlib/oauth1/rfc5849/endpoints/authorization.py
index b465946..945da74 100644
--- a/oauthlib/oauth1/rfc5849/endpoints/authorization.py
+++ b/oauthlib/oauth1/rfc5849/endpoints/authorization.py
@@ -12,11 +12,7 @@ from oauthlib.common import Request, add_params_to_uri
 
 from .. import errors
 from .base import BaseEndpoint
-
-try:
-    from urllib import urlencode
-except ImportError:
-    from urllib.parse import urlencode
+from urllib.parse import urlencode
 
 
 class AuthorizationEndpoint(BaseEndpoint):
diff --git a/oauthlib/oauth1/rfc5849/parameters.py b/oauthlib/oauth1/rfc5849/parameters.py
index 569a136..95e07d5 100644
--- a/oauthlib/oauth1/rfc5849/parameters.py
+++ b/oauthlib/oauth1/rfc5849/parameters.py
@@ -13,10 +13,7 @@ from oauthlib.common import extract_params, urlencode
 
 from . import utils
 
-try:
-    from urlparse import urlparse, urlunparse
-except ImportError:  # noqa
-    from urllib.parse import urlparse, urlunparse
+from urllib.parse import urlparse, urlunparse
 
 
 # TODO: do we need filter_params now that oauth_params are handled by Request?
diff --git a/oauthlib/oauth1/rfc5849/signature.py b/oauthlib/oauth1/rfc5849/signature.py
index 78de755..ea6ab39 100644
--- a/oauthlib/oauth1/rfc5849/signature.py
+++ b/oauthlib/oauth1/rfc5849/signature.py
@@ -29,13 +29,10 @@ import hmac
 import logging
 
 from oauthlib.common import extract_params, safe_string_equals, urldecode
+import urllib.parse as urlparse
 
 from . import utils
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
 
 log = logging.getLogger(__name__)
 
diff --git a/oauthlib/oauth1/rfc5849/utils.py b/oauthlib/oauth1/rfc5849/utils.py
index 83df65c..2dfc1f7 100644
--- a/oauthlib/oauth1/rfc5849/utils.py
+++ b/oauthlib/oauth1/rfc5849/utils.py
@@ -10,10 +10,7 @@ from __future__ import absolute_import, unicode_literals
 
 from oauthlib.common import quote, unquote
 
-try:
-    import urllib2
-except ImportError:
-    import urllib.request as urllib2
+import urllib.request as urllib2
 
 
 UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz'
diff --git a/oauthlib/oauth2/rfc6749/parameters.py b/oauthlib/oauth2/rfc6749/parameters.py
index a3f9dd0..2bca4d2 100644
--- a/oauthlib/oauth2/rfc6749/parameters.py
+++ b/oauthlib/oauth2/rfc6749/parameters.py
@@ -15,6 +15,7 @@ import time
 
 from oauthlib.common import add_params_to_qs, add_params_to_uri
 from oauthlib.signals import scope_changed
+import urllib.parse as urlparse
 
 from .errors import (InsecureTransportError, MismatchingStateError,
                      MissingCodeError, MissingTokenError,
@@ -22,11 +23,6 @@ from .errors import (InsecureTransportError, MismatchingStateError,
 from .tokens import OAuth2Token
 from .utils import is_secure_transport, list_to_scope, scope_to_list
 
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
-
 
 def prepare_grant_uri(uri, client_id, response_type, redirect_uri=None,
                       scope=None, state=None, **kwargs):
diff --git a/oauthlib/oauth2/rfc6749/tokens.py b/oauthlib/oauth2/rfc6749/tokens.py
index 8873ed5..8e139f6 100644
--- a/oauthlib/oauth2/rfc6749/tokens.py
+++ b/oauthlib/oauth2/rfc6749/tokens.py
@@ -16,13 +16,10 @@ import warnings
 
 from oauthlib import common
 from oauthlib.common import add_params_to_qs, add_params_to_uri
+from urllib.parse import urlparse
 
 from . import utils
 
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
 
 
 class OAuth2Token(dict):
diff --git a/oauthlib/oauth2/rfc6749/utils.py b/oauthlib/oauth2/rfc6749/utils.py
index 7516c9e..efbf8aa 100644
--- a/oauthlib/oauth2/rfc6749/utils.py
+++ b/oauthlib/oauth2/rfc6749/utils.py
@@ -11,15 +11,8 @@ import datetime
 import os
 
 from oauthlib.common import urldecode
-
-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 urllib.parse import quote
+from urllib.parse import urlparse
 
 
 def list_to_scope(scope):
diff --git a/setup.py b/setup.py
index 0aebd6c..438b8ae 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,6 @@ try:
 except ImportError:
     pass
 
-import sys
 from os.path import dirname, join
 
 from setuptools import find_packages, setup
diff --git a/tests/oauth1/rfc5849/test_signatures.py b/tests/oauth1/rfc5849/test_signatures.py
index 4eb7ff3..48a17c4 100644
--- a/tests/oauth1/rfc5849/test_signatures.py
+++ b/tests/oauth1/rfc5849/test_signatures.py
@@ -11,13 +11,10 @@ from oauthlib.oauth1.rfc5849.signature import (collect_parameters,
                                                sign_plaintext_with_client,
                                                sign_rsa_sha1,
                                                sign_rsa_sha1_with_client)
+from urllib.parse import quote
 
 from ...unittest import TestCase
 
-try:
-    from urllib import quote
-except ImportError:
-    from urllib.parse import quote
 
 
 
diff --git a/tests/oauth2/rfc6749/clients/test_legacy_application.py b/tests/oauth2/rfc6749/clients/test_legacy_application.py
index 01e46e4..20fb24b 100644
--- a/tests/oauth2/rfc6749/clients/test_legacy_application.py
+++ b/tests/oauth2/rfc6749/clients/test_legacy_application.py
@@ -7,14 +7,10 @@ from mock import patch
 
 from oauthlib import signals
 from oauthlib.oauth2 import LegacyApplicationClient
+import urllib.parse as urlparse
 
 from ....unittest import TestCase
 
-# this is the same import method used in oauthlib/oauth2/rfc6749/parameters.py
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
 
 
 @patch('time.time', new=lambda: 1000)
diff --git a/tests/oauth2/rfc6749/clients/test_web_application.py b/tests/oauth2/rfc6749/clients/test_web_application.py
index f7fbb02..a4da237 100644
--- a/tests/oauth2/rfc6749/clients/test_web_application.py
+++ b/tests/oauth2/rfc6749/clients/test_web_application.py
@@ -13,14 +13,10 @@ from oauthlib.oauth2 import (BackendApplicationClient, Client,
                              WebApplicationClient)
 from oauthlib.oauth2.rfc6749 import errors, utils
 from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, BODY, URI_QUERY
+import urllib.parse as urlparse
 
 from ....unittest import TestCase
 
-# this is the same import method used in oauthlib/oauth2/rfc6749/parameters.py
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
 
 
 @patch('time.time', new=lambda: 1000)
diff --git a/tests/oauth2/rfc6749/endpoints/test_utils.py b/tests/oauth2/rfc6749/endpoints/test_utils.py
index 6b7cff8..5eae195 100644
--- a/tests/oauth2/rfc6749/endpoints/test_utils.py
+++ b/tests/oauth2/rfc6749/endpoints/test_utils.py
@@ -1,7 +1,4 @@
-try:
-    import urlparse
-except ImportError:
-    import urllib.parse as urlparse
+import urllib.parse as urlparse
 
 
 def get_query_credentials(uri):
diff --git a/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py b/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py
index 517239a..c8a707e 100644
--- a/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py
+++ b/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py
@@ -7,14 +7,10 @@ from oauthlib.oauth2.rfc6749.endpoints.authorization import \
     AuthorizationEndpoint
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 from oauthlib.openid.connect.core.grant_types import AuthorizationCodeGrant
+from urllib.parse import urlencode
 
 from tests.unittest import TestCase
 
-try:
-    from urllib.parse import urlencode
-except ImportError:
-    from urllib import urlencode
-
 
 class OpenIDConnectEndpointTest(TestCase):