diff options
author | Omer Katz <omerk@checkpoint.com> | 2017-09-17 14:14:31 +0300 |
---|---|---|
committer | Omer Katz <omerk@checkpoint.com> | 2017-09-17 14:14:31 +0300 |
commit | 0218f8da4f6405c6a38ea7e01feacf73b35dd698 (patch) | |
tree | 7497e617e696a96eb7d66fadf9c933394b12a05d /oauthlib/oauth1 | |
parent | c00a194e2986e75da4acf05ec413ab21cb6d46da (diff) | |
download | oauthlib-0218f8da4f6405c6a38ea7e01feacf73b35dd698.tar.gz |
Sorted imports.
Diffstat (limited to 'oauthlib/oauth1')
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/access_token.py | 2 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/authorization.py | 3 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/base.py | 9 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/pre_configured.py | 4 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/request_token.py | 2 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/resource.py | 2 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/endpoints/signature_only.py | 2 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/errors.py | 2 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/parameters.py | 6 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/request_validator.py | 3 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/signature.py | 8 | ||||
-rw-r--r-- | oauthlib/oauth1/rfc5849/utils.py | 3 |
12 files changed, 25 insertions, 21 deletions
diff --git a/oauthlib/oauth1/rfc5849/endpoints/access_token.py b/oauthlib/oauth1/rfc5849/endpoints/access_token.py index 567965a..12b901c 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/access_token.py +++ b/oauthlib/oauth1/rfc5849/endpoints/access_token.py @@ -14,8 +14,8 @@ import logging from oauthlib.common import urlencode -from .base import BaseEndpoint from .. import errors +from .base import BaseEndpoint log = logging.getLogger(__name__) diff --git a/oauthlib/oauth1/rfc5849/endpoints/authorization.py b/oauthlib/oauth1/rfc5849/endpoints/authorization.py index a93a517..1751a45 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/authorization.py +++ b/oauthlib/oauth1/rfc5849/endpoints/authorization.py @@ -10,8 +10,9 @@ from __future__ import absolute_import, unicode_literals from oauthlib.common import Request, add_params_to_uri -from .base import BaseEndpoint from .. import errors +from .base import BaseEndpoint + try: from urllib import urlencode except ImportError: diff --git a/oauthlib/oauth1/rfc5849/endpoints/base.py b/oauthlib/oauth1/rfc5849/endpoints/base.py index 42d9363..9d51e69 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/base.py +++ b/oauthlib/oauth1/rfc5849/endpoints/base.py @@ -12,12 +12,9 @@ import time from oauthlib.common import Request, generate_token -from .. import signature, utils, errors -from .. import CONTENT_TYPE_FORM_URLENCODED -from .. import SIGNATURE_HMAC, SIGNATURE_RSA -from .. import SIGNATURE_TYPE_AUTH_HEADER -from .. import SIGNATURE_TYPE_QUERY -from .. import SIGNATURE_TYPE_BODY +from .. import (CONTENT_TYPE_FORM_URLENCODED, SIGNATURE_HMAC, SIGNATURE_RSA, + SIGNATURE_TYPE_AUTH_HEADER, SIGNATURE_TYPE_BODY, + SIGNATURE_TYPE_QUERY, errors, signature, utils) class BaseEndpoint(object): diff --git a/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py b/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py index f0705a8..f89393a 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py +++ b/oauthlib/oauth1/rfc5849/endpoints/pre_configured.py @@ -1,7 +1,7 @@ from __future__ import absolute_import, unicode_literals -from . import RequestTokenEndpoint, AuthorizationEndpoint -from . import AccessTokenEndpoint, ResourceEndpoint +from . import (AccessTokenEndpoint, AuthorizationEndpoint, + RequestTokenEndpoint, ResourceEndpoint) class WebApplicationServer(RequestTokenEndpoint, AuthorizationEndpoint, diff --git a/oauthlib/oauth1/rfc5849/endpoints/request_token.py b/oauthlib/oauth1/rfc5849/endpoints/request_token.py index 4a76abc..515395b 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/request_token.py +++ b/oauthlib/oauth1/rfc5849/endpoints/request_token.py @@ -14,8 +14,8 @@ import logging from oauthlib.common import urlencode -from .base import BaseEndpoint from .. import errors +from .base import BaseEndpoint log = logging.getLogger(__name__) diff --git a/oauthlib/oauth1/rfc5849/endpoints/resource.py b/oauthlib/oauth1/rfc5849/endpoints/resource.py index 6021627..53f9562 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/resource.py +++ b/oauthlib/oauth1/rfc5849/endpoints/resource.py @@ -10,8 +10,8 @@ from __future__ import absolute_import, unicode_literals import logging -from .base import BaseEndpoint from .. import errors +from .base import BaseEndpoint log = logging.getLogger(__name__) diff --git a/oauthlib/oauth1/rfc5849/endpoints/signature_only.py b/oauthlib/oauth1/rfc5849/endpoints/signature_only.py index 32b8b74..4297770 100644 --- a/oauthlib/oauth1/rfc5849/endpoints/signature_only.py +++ b/oauthlib/oauth1/rfc5849/endpoints/signature_only.py @@ -10,8 +10,8 @@ from __future__ import absolute_import, unicode_literals import logging -from .base import BaseEndpoint from .. import errors +from .base import BaseEndpoint log = logging.getLogger(__name__) diff --git a/oauthlib/oauth1/rfc5849/errors.py b/oauthlib/oauth1/rfc5849/errors.py index 978035e..a5c59bd 100644 --- a/oauthlib/oauth1/rfc5849/errors.py +++ b/oauthlib/oauth1/rfc5849/errors.py @@ -8,7 +8,7 @@ defined error responses for all four core grant types. """ from __future__ import unicode_literals -from oauthlib.common import urlencode, add_params_to_uri +from oauthlib.common import add_params_to_uri, urlencode class OAuth1Error(Exception): diff --git a/oauthlib/oauth1/rfc5849/parameters.py b/oauthlib/oauth1/rfc5849/parameters.py index f0963ab..dcb23dc 100644 --- a/oauthlib/oauth1/rfc5849/parameters.py +++ b/oauthlib/oauth1/rfc5849/parameters.py @@ -9,12 +9,14 @@ This module contains methods related to `section 3.5`_ of the OAuth 1.0a spec. """ from __future__ import absolute_import, unicode_literals +from oauthlib.common import extract_params, urlencode + +from . import utils + try: from urlparse import urlparse, urlunparse except ImportError: from urllib.parse import urlparse, urlunparse -from . import utils -from oauthlib.common import extract_params, urlencode # TODO: do we need filter_params now that oauth_params are handled by Request? diff --git a/oauthlib/oauth1/rfc5849/request_validator.py b/oauthlib/oauth1/rfc5849/request_validator.py index ff6a73f..2ccb367 100644 --- a/oauthlib/oauth1/rfc5849/request_validator.py +++ b/oauthlib/oauth1/rfc5849/request_validator.py @@ -8,9 +8,10 @@ for signing and checking OAuth 1.0 RFC 5849 requests. """ from __future__ import absolute_import, unicode_literals -from . import SIGNATURE_METHODS, utils import sys +from . import SIGNATURE_METHODS, utils + class RequestValidator(object): diff --git a/oauthlib/oauth1/rfc5849/signature.py b/oauthlib/oauth1/rfc5849/signature.py index d2da319..10d057f 100644 --- a/oauthlib/oauth1/rfc5849/signature.py +++ b/oauthlib/oauth1/rfc5849/signature.py @@ -28,13 +28,15 @@ import hashlib import hmac import logging +from oauthlib.common import (bytes_type, extract_params, safe_string_equals, + unicode_type, urldecode) + +from . import utils + try: import urlparse except ImportError: import urllib.parse as urlparse -from . import utils -from oauthlib.common import urldecode, extract_params, safe_string_equals -from oauthlib.common import bytes_type, unicode_type log = logging.getLogger(__name__) diff --git a/oauthlib/oauth1/rfc5849/utils.py b/oauthlib/oauth1/rfc5849/utils.py index a58372e..979e5f6 100644 --- a/oauthlib/oauth1/rfc5849/utils.py +++ b/oauthlib/oauth1/rfc5849/utils.py @@ -8,12 +8,13 @@ spec. """ from __future__ import absolute_import, unicode_literals +from oauthlib.common import bytes_type, quote, unicode_type, unquote + try: import urllib2 except ImportError: import urllib.request as urllib2 -from oauthlib.common import quote, unquote, bytes_type, unicode_type UNICODE_ASCII_CHARACTER_SET = ('abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' |