diff options
| author | Hugo <hugovk@users.noreply.github.com> | 2019-08-15 00:01:16 +0300 |
|---|---|---|
| committer | Hugo <hugovk@users.noreply.github.com> | 2019-08-15 12:24:34 +0300 |
| commit | b41d4801dec588d82e6633869ac541e207598297 (patch) | |
| tree | ec7d832c34f6d9614a5429a0829c1916a90be92d /oauthlib/oauth1 | |
| parent | 81e37c08162124854822581e23ac2cd81fa43d4a (diff) | |
| download | oauthlib-b41d4801dec588d82e6633869ac541e207598297.tar.gz | |
Drop support for legacy Python 2.7
Diffstat (limited to 'oauthlib/oauth1')
| -rw-r--r-- | oauthlib/oauth1/rfc5849/__init__.py | 6 | ||||
| -rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/authorization.py | 6 | ||||
| -rw-r--r-- | oauthlib/oauth1/rfc5849/parameters.py | 5 | ||||
| -rw-r--r-- | oauthlib/oauth1/rfc5849/signature.py | 5 | ||||
| -rw-r--r-- | oauthlib/oauth1/rfc5849/utils.py | 5 |
5 files changed, 5 insertions, 22 deletions
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' |