Sorted imports.

37 files changed, 196 insertions, 147 deletions

diff --git a/tests/oauth1/rfc5849/endpoints/test_access_token.py b/tests/oauth1/rfc5849/endpoints/test_access_token.py
index 8ea8ece..3499fdb 100644
--- a/tests/oauth1/rfc5849/endpoints/test_access_token.py
+++ b/tests/oauth1/rfc5849/endpoints/test_access_token.py
@@ -1,12 +1,13 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from mock import MagicMock, ANY
-from ....unittest import TestCase
+from mock import ANY, MagicMock
 
-from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1 import RequestValidator
+from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1.rfc5849.endpoints import AccessTokenEndpoint
 
+from ....unittest import TestCase
+
 
 class AccessTokenEndpointTest(TestCase):
 
@@ -90,4 +91,3 @@ class AccessTokenEndpointTest(TestCase):
              request_token=self.client.resource_owner_key)
         self.validator.invalidate_request_token.assert_called_once_with(
                 self.client.client_key, self.client.resource_owner_key, ANY)
-
diff --git a/tests/oauth1/rfc5849/endpoints/test_authorization.py b/tests/oauth1/rfc5849/endpoints/test_authorization.py
index e7ddceb..022e8e9 100644
--- a/tests/oauth1/rfc5849/endpoints/test_authorization.py
+++ b/tests/oauth1/rfc5849/endpoints/test_authorization.py
@@ -1,12 +1,13 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from mock import MagicMock
-from ....unittest import TestCase
 
 from oauthlib.oauth1 import RequestValidator
 from oauthlib.oauth1.rfc5849 import errors
 from oauthlib.oauth1.rfc5849.endpoints import AuthorizationEndpoint
 
+from ....unittest import TestCase
+
 
 class AuthorizationEndpointTest(TestCase):
 
diff --git a/tests/oauth1/rfc5849/endpoints/test_base.py b/tests/oauth1/rfc5849/endpoints/test_base.py
index 9c51f73..8c41cf2 100644
--- a/tests/oauth1/rfc5849/endpoints/test_base.py
+++ b/tests/oauth1/rfc5849/endpoints/test_base.py
@@ -1,15 +1,17 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from mock import MagicMock
 from re import sub
-from ....unittest import TestCase
+
+from mock import MagicMock
 
 from oauthlib.common import safe_string_equals
 from oauthlib.oauth1 import Client, RequestValidator
-from oauthlib.oauth1.rfc5849 import errors, SIGNATURE_RSA, SIGNATURE_HMAC
-from oauthlib.oauth1.rfc5849 import SIGNATURE_PLAINTEXT
-from oauthlib.oauth1.rfc5849.endpoints import RequestTokenEndpoint, BaseEndpoint
+from oauthlib.oauth1.rfc5849 import (SIGNATURE_HMAC, SIGNATURE_PLAINTEXT,
+                                     SIGNATURE_RSA, errors)
+from oauthlib.oauth1.rfc5849.endpoints import (BaseEndpoint,
+                                               RequestTokenEndpoint)
 
+from ....unittest import TestCase
 
 URLENCODED = {"Content-Type": "application/x-www-form-urlencoded"}
 
diff --git a/tests/oauth1/rfc5849/endpoints/test_request_token.py b/tests/oauth1/rfc5849/endpoints/test_request_token.py
index 773dedf..5c9ae88 100644
--- a/tests/oauth1/rfc5849/endpoints/test_request_token.py
+++ b/tests/oauth1/rfc5849/endpoints/test_request_token.py
@@ -1,12 +1,13 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from mock import MagicMock, ANY
-from ....unittest import TestCase
+from mock import ANY, MagicMock
 
-from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1 import RequestValidator
+from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1.rfc5849.endpoints import RequestTokenEndpoint
 
+from ....unittest import TestCase
+
 
 class RequestTokenEndpointTest(TestCase):
 
diff --git a/tests/oauth1/rfc5849/endpoints/test_resource.py b/tests/oauth1/rfc5849/endpoints/test_resource.py
index f14049b..b71412a 100644
--- a/tests/oauth1/rfc5849/endpoints/test_resource.py
+++ b/tests/oauth1/rfc5849/endpoints/test_resource.py
@@ -1,12 +1,13 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from mock import MagicMock, ANY
-from ....unittest import TestCase
+from mock import ANY, MagicMock
 
-from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1 import RequestValidator
+from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1.rfc5849.endpoints import ResourceEndpoint
 
+from ....unittest import TestCase
+
 
 class ResourceEndpointTest(TestCase):
 
diff --git a/tests/oauth1/rfc5849/endpoints/test_signature_only.py b/tests/oauth1/rfc5849/endpoints/test_signature_only.py
index 2fb18e7..1d758b1 100644
--- a/tests/oauth1/rfc5849/endpoints/test_signature_only.py
+++ b/tests/oauth1/rfc5849/endpoints/test_signature_only.py
@@ -1,12 +1,13 @@
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-from mock import MagicMock, ANY
-from ....unittest import TestCase
+from mock import ANY, MagicMock
 
-from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1 import RequestValidator
+from oauthlib.oauth1.rfc5849 import Client
 from oauthlib.oauth1.rfc5849.endpoints import SignatureOnlyEndpoint
 
+from ....unittest import TestCase
+
 
 class SignatureOnlyEndpointTest(TestCase):
 
diff --git a/tests/oauth1/rfc5849/test_client.py b/tests/oauth1/rfc5849/test_client.py
index f20bfa7..dcb4c3d 100644
--- a/tests/oauth1/rfc5849/test_client.py
+++ b/tests/oauth1/rfc5849/test_client.py
@@ -2,9 +2,10 @@
 from __future__ import absolute_import, unicode_literals
 
 from oauthlib.common import Request
-from oauthlib.oauth1 import SIGNATURE_RSA, SIGNATURE_PLAINTEXT
-from oauthlib.oauth1 import SIGNATURE_TYPE_BODY, SIGNATURE_TYPE_QUERY
+from oauthlib.oauth1 import (SIGNATURE_PLAINTEXT, SIGNATURE_RSA,
+                             SIGNATURE_TYPE_BODY, SIGNATURE_TYPE_QUERY)
 from oauthlib.oauth1.rfc5849 import Client, bytes_type
+
 from ...unittest import TestCase
 
 
diff --git a/tests/oauth1/rfc5849/test_parameters.py b/tests/oauth1/rfc5849/test_parameters.py
index 2caf299..ae72fd7 100644
--- a/tests/oauth1/rfc5849/test_parameters.py
+++ b/tests/oauth1/rfc5849/test_parameters.py
@@ -1,8 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
+
 from oauthlib.common import urlencode
-from oauthlib.oauth1.rfc5849.parameters import (_append_params, prepare_headers,
-    prepare_form_encoded_body, prepare_request_uri_query)
+from oauthlib.oauth1.rfc5849.parameters import (_append_params,
+                                                prepare_form_encoded_body,
+                                                prepare_headers,
+                                                prepare_request_uri_query)
+
 from ...unittest import TestCase
 
 
diff --git a/tests/oauth1/rfc5849/test_request_validator.py b/tests/oauth1/rfc5849/test_request_validator.py
index e068c28..88bbcdc 100644
--- a/tests/oauth1/rfc5849/test_request_validator.py
+++ b/tests/oauth1/rfc5849/test_request_validator.py
@@ -1,9 +1,10 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ...unittest import TestCase
 
 from oauthlib.oauth1 import RequestValidator
 
+from ...unittest import TestCase
+
 
 class RequestValidatorTests(TestCase):
 
diff --git a/tests/oauth1/rfc5849/test_signatures.py b/tests/oauth1/rfc5849/test_signatures.py
index 6508267..48609e5 100644
--- a/tests/oauth1/rfc5849/test_signatures.py
+++ b/tests/oauth1/rfc5849/test_signatures.py
@@ -1,20 +1,25 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
+from oauthlib.common import unicode_type
+from oauthlib.oauth1.rfc5849.signature import (collect_parameters,
+                                               construct_base_string,
+                                               normalize_base_string_uri,
+                                               normalize_parameters,
+                                               sign_hmac_sha1,
+                                               sign_hmac_sha1_with_client,
+                                               sign_plaintext,
+                                               sign_plaintext_with_client,
+                                               sign_rsa_sha1,
+                                               sign_rsa_sha1_with_client)
+
+from ...unittest import TestCase
+
 try:
     from urllib import quote
 except ImportError:
     from urllib.parse import quote
 
-from oauthlib.oauth1.rfc5849.signature import collect_parameters
-from oauthlib.oauth1.rfc5849.signature import construct_base_string
-from oauthlib.oauth1.rfc5849.signature import normalize_base_string_uri
-from oauthlib.oauth1.rfc5849.signature import normalize_parameters
-from oauthlib.oauth1.rfc5849.signature import sign_hmac_sha1, sign_hmac_sha1_with_client
-from oauthlib.oauth1.rfc5849.signature import sign_rsa_sha1, sign_rsa_sha1_with_client
-from oauthlib.oauth1.rfc5849.signature import sign_plaintext, sign_plaintext_with_client
-from oauthlib.common import unicode_type
-from ...unittest import TestCase
 
 
 class SignatureTests(TestCase):
diff --git a/tests/oauth1/rfc5849/test_utils.py b/tests/oauth1/rfc5849/test_utils.py
index 4e24889..5a889e8 100644
--- a/tests/oauth1/rfc5849/test_utils.py
+++ b/tests/oauth1/rfc5849/test_utils.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from oauthlib.oauth1.rfc5849.utils import *
+
 from oauthlib.common import unicode_type
+from oauthlib.oauth1.rfc5849.utils import *
+
 from ...unittest import TestCase
 
 
diff --git a/tests/oauth2/rfc6749/clients/test_backend_application.py b/tests/oauth2/rfc6749/clients/test_backend_application.py
index 7c8ebbb..6b342f0 100644
--- a/tests/oauth2/rfc6749/clients/test_backend_application.py
+++ b/tests/oauth2/rfc6749/clients/test_backend_application.py
@@ -5,8 +5,8 @@ import os
 
 from mock import patch
 
-from oauthlib.oauth2 import BackendApplicationClient
 from oauthlib import signals
+from oauthlib.oauth2 import BackendApplicationClient
 
 from ....unittest import TestCase
 
diff --git a/tests/oauth2/rfc6749/clients/test_base.py b/tests/oauth2/rfc6749/clients/test_base.py
index 800dc6e..c788bc1 100644
--- a/tests/oauth2/rfc6749/clients/test_base.py
+++ b/tests/oauth2/rfc6749/clients/test_base.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import datetime
+
 from oauthlib import common
+from oauthlib.oauth2 import Client, InsecureTransportError
 from oauthlib.oauth2.rfc6749 import utils
-from oauthlib.oauth2 import Client
-from oauthlib.oauth2 import InsecureTransportError
-from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, URI_QUERY, BODY
+from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, BODY, URI_QUERY
+
+from ....unittest import TestCase
 
 
 class ClientTest(TestCase):
diff --git a/tests/oauth2/rfc6749/clients/test_service_application.py b/tests/oauth2/rfc6749/clients/test_service_application.py
index de57291..2dc633a 100644
--- a/tests/oauth2/rfc6749/clients/test_service_application.py
+++ b/tests/oauth2/rfc6749/clients/test_service_application.py
@@ -119,4 +119,3 @@ mfvGGg3xNjTMO7IdrwIDAQAB
         token = client.parse_request_body_response(self.token_json, scope="invalid")
         self.assertTrue(token.scope_changed)
         del os.environ['OAUTHLIB_RELAX_TOKEN_SCOPE']
-
diff --git a/tests/oauth2/rfc6749/clients/test_web_application.py b/tests/oauth2/rfc6749/clients/test_web_application.py
index a78e8f8..85b247d 100644
--- a/tests/oauth2/rfc6749/clients/test_web_application.py
+++ b/tests/oauth2/rfc6749/clients/test_web_application.py
@@ -7,13 +7,11 @@ import os
 from mock import patch
 
 from oauthlib import common, signals
-from oauthlib.oauth2.rfc6749 import utils, errors
-from oauthlib.oauth2 import Client
-from oauthlib.oauth2 import WebApplicationClient
-from oauthlib.oauth2 import MobileApplicationClient
-from oauthlib.oauth2 import LegacyApplicationClient
-from oauthlib.oauth2 import BackendApplicationClient
-from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, URI_QUERY, BODY
+from oauthlib.oauth2 import (BackendApplicationClient, Client,
+                             LegacyApplicationClient, MobileApplicationClient,
+                             WebApplicationClient)
+from oauthlib.oauth2.rfc6749 import errors, utils
+from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, BODY, URI_QUERY
 
 from ....unittest import TestCase
 
diff --git a/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py
index 79124e3..4ad0ed9 100644
--- a/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py
+++ b/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py
@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
-from oauthlib.oauth2.rfc6749 import BaseEndpoint, catch_errors_and_unavailability
-from oauthlib.oauth2 import Server, RequestValidator, FatalClientError, OAuth2Error
+from oauthlib.oauth2 import (FatalClientError, OAuth2Error, RequestValidator,
+                             Server)
+from oauthlib.oauth2.rfc6749 import (BaseEndpoint,
+                                     catch_errors_and_unavailability)
+
+from ....unittest import TestCase
 
 
 class BaseEndpointTest(TestCase):
diff --git a/tests/oauth2/rfc6749/endpoints/test_claims_handling.py b/tests/oauth2/rfc6749/endpoints/test_claims_handling.py
index df1e76e..9795c80 100644
--- a/tests/oauth2/rfc6749/endpoints/test_claims_handling.py
+++ b/tests/oauth2/rfc6749/endpoints/test_claims_handling.py
@@ -10,11 +10,10 @@ from __future__ import absolute_import, unicode_literals
 
 import mock
 
-from .test_utils import get_query_credentials, get_fragment_credentials
-from ....unittest import TestCase
+from oauthlib.oauth2 import InvalidRequestError, RequestValidator, Server
 
-from oauthlib.oauth2 import RequestValidator, InvalidRequestError
-from oauthlib.oauth2 import Server
+from ....unittest import TestCase
+from .test_utils import get_fragment_credentials, get_query_credentials
 
 
 class TestClaimsHandling(TestCase):
@@ -104,4 +103,3 @@ class TestClaimsHandling(TestCase):
         error_desc = get_query_credentials(h['Location'])['error_description'][0]
         self.assertEqual(error, 'invalid_request')
         self.assertEqual(error_desc, "Malformed claims parameter")
-
diff --git a/tests/oauth2/rfc6749/endpoints/test_client_authentication.py b/tests/oauth2/rfc6749/endpoints/test_client_authentication.py
index fdd9665..e9a0673 100644
--- a/tests/oauth2/rfc6749/endpoints/test_client_authentication.py
+++ b/tests/oauth2/rfc6749/endpoints/test_client_authentication.py
@@ -10,15 +10,17 @@ on the request object with a client_id parameter. The client_id attribute
 prevents this check from being circumvented with a client form parameter.
 """
 from __future__ import absolute_import, unicode_literals
+
 import json
+
 import mock
 
-from .test_utils import get_fragment_credentials
-from ....unittest import TestCase
+from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+                             MobileApplicationServer, RequestValidator,
+                             WebApplicationServer)
 
-from oauthlib.oauth2 import RequestValidator
-from oauthlib.oauth2 import WebApplicationServer, MobileApplicationServer
-from oauthlib.oauth2 import LegacyApplicationServer, BackendApplicationServer
+from ....unittest import TestCase
+from .test_utils import get_fragment_credentials
 
 
 class ClientAuthenticationTest(TestCase):
diff --git a/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py b/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py
index 89350be..0eb719f 100644
--- a/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py
+++ b/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py
@@ -4,16 +4,18 @@ The Authorization Code Grant will need to preserve state as well as redirect
 uri and the Implicit Grant will need to preserve state.
 """
 from __future__ import absolute_import, unicode_literals
+
 import json
-import mock
 
-from .test_utils import get_query_credentials, get_fragment_credentials
-from ....unittest import TestCase
+import mock
 
-from oauthlib.oauth2 import RequestValidator
-from oauthlib.oauth2 import WebApplicationServer, MobileApplicationServer
+from oauthlib.oauth2 import (MobileApplicationServer, RequestValidator,
+                             WebApplicationServer)
 from oauthlib.oauth2.rfc6749 import errors
 
+from ....unittest import TestCase
+from .test_utils import get_fragment_credentials, get_query_credentials
+
 
 class PreservationTest(TestCase):
 
diff --git a/tests/oauth2/rfc6749/endpoints/test_error_responses.py b/tests/oauth2/rfc6749/endpoints/test_error_responses.py
index e57aea6..875b3a5 100644
--- a/tests/oauth2/rfc6749/endpoints/test_error_responses.py
+++ b/tests/oauth2/rfc6749/endpoints/test_error_responses.py
@@ -1,16 +1,18 @@
 """Ensure the correct error responses are returned for all defined error types.
 """
 from __future__ import absolute_import, unicode_literals
+
 import json
-import mock
 
-from ....unittest import TestCase
+import mock
 
-from oauthlib.oauth2 import RequestValidator
-from oauthlib.oauth2 import WebApplicationServer, MobileApplicationServer
-from oauthlib.oauth2 import LegacyApplicationServer, BackendApplicationServer
+from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+                             MobileApplicationServer, RequestValidator,
+                             WebApplicationServer)
 from oauthlib.oauth2.rfc6749 import errors
 
+from ....unittest import TestCase
+
 
 class ErrorResponseTest(TestCase):
 
diff --git a/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py b/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py
index 72d1f58..a12fcd2 100644
--- a/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py
+++ b/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py
@@ -1,13 +1,14 @@
 """Ensure extra credentials can be supplied for inclusion in tokens.
 """
 from __future__ import absolute_import, unicode_literals
+
 import mock
 
-from ....unittest import TestCase
+from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+                             MobileApplicationServer, RequestValidator,
+                             WebApplicationServer)
 
-from oauthlib.oauth2 import RequestValidator
-from oauthlib.oauth2 import WebApplicationServer, MobileApplicationServer
-from oauthlib.oauth2 import LegacyApplicationServer, BackendApplicationServer
+from ....unittest import TestCase
 
 
 class ExtraCredentialsTest(TestCase):
diff --git a/tests/oauth2/rfc6749/endpoints/test_prompt_handling.py b/tests/oauth2/rfc6749/endpoints/test_prompt_handling.py
index b5a51eb..35e1508 100644
--- a/tests/oauth2/rfc6749/endpoints/test_prompt_handling.py
+++ b/tests/oauth2/rfc6749/endpoints/test_prompt_handling.py
@@ -1,16 +1,21 @@
 from __future__ import absolute_import, unicode_literals
+
+import mock
+
+from oauthlib.oauth2 import InvalidRequestError
+from oauthlib.oauth2.rfc6749.endpoints.authorization import \
+    AuthorizationEndpoint
+from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectAuthCode
+from oauthlib.oauth2.rfc6749.tokens import BearerToken
+
+from ....unittest import TestCase
+
 try:
     from urllib.parse import urlencode
 except ImportError:
     from urllib import urlencode
 
-import mock
 
-from ....unittest import TestCase
-from oauthlib.oauth2 import InvalidRequestError
-from oauthlib.oauth2.rfc6749.tokens import BearerToken
-from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectAuthCode
-from oauthlib.oauth2.rfc6749.endpoints.authorization import AuthorizationEndpoint
 
 
 class OpenIDConnectEndpointTest(TestCase):
diff --git a/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py b/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py
index 6b3137a..d30ec9d 100644
--- a/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py
+++ b/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py
@@ -1,15 +1,17 @@
 """Ensure all tokens are associated with a resource owner.
 """
 from __future__ import absolute_import, unicode_literals
+
 import json
+
 import mock
 
-from .test_utils import get_query_credentials, get_fragment_credentials
-from ....unittest import TestCase
+from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+                             MobileApplicationServer, RequestValidator,
+                             WebApplicationServer)
 
-from oauthlib.oauth2 import RequestValidator
-from oauthlib.oauth2 import WebApplicationServer, MobileApplicationServer
-from oauthlib.oauth2 import LegacyApplicationServer, BackendApplicationServer
+from ....unittest import TestCase
+from .test_utils import get_fragment_credentials, get_query_credentials
 
 
 class ResourceOwnerAssociationTest(TestCase):
diff --git a/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py
index 46b909f..77f5662 100644
--- a/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py
+++ b/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py
@@ -2,6 +2,7 @@
 from __future__ import absolute_import, unicode_literals
 
 from json import loads
+
 from mock import MagicMock
 
 from oauthlib.common import urlencode
diff --git a/tests/oauth2/rfc6749/endpoints/test_scope_handling.py b/tests/oauth2/rfc6749/endpoints/test_scope_handling.py
index 3c3ee5e..87781b3 100644
--- a/tests/oauth2/rfc6749/endpoints/test_scope_handling.py
+++ b/tests/oauth2/rfc6749/endpoints/test_scope_handling.py
@@ -4,15 +4,17 @@ Fairly trivial in all grants except the Authorization Code Grant where scope
 need to be persisted temporarily in an authorization code.
 """
 from __future__ import absolute_import, unicode_literals
+
 import json
+
 import mock
 
-from .test_utils import get_query_credentials, get_fragment_credentials
-from ....unittest import TestCase
+from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+                             MobileApplicationServer, RequestValidator, Server,
+                             WebApplicationServer)
 
-from oauthlib.oauth2 import RequestValidator
-from oauthlib.oauth2 import WebApplicationServer, MobileApplicationServer
-from oauthlib.oauth2 import LegacyApplicationServer, BackendApplicationServer, Server
+from ....unittest import TestCase
+from .test_utils import get_fragment_credentials, get_query_credentials
 
 
 class TestScopeHandling(TestCase):
diff --git a/tests/oauth2/rfc6749/grant_types/test_authorization_code.py b/tests/oauth2/rfc6749/grant_types/test_authorization_code.py
index cf6a12e..704a254 100644
--- a/tests/oauth2/rfc6749/grant_types/test_authorization_code.py
+++ b/tests/oauth2/rfc6749/grant_types/test_authorization_code.py
@@ -1,14 +1,17 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import json
+
 import mock
+
 from oauthlib.common import Request
 from oauthlib.oauth2.rfc6749 import errors
 from oauthlib.oauth2.rfc6749.grant_types import AuthorizationCodeGrant
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 
+from ....unittest import TestCase
+
 
 class AuthorizationCodeGrantTest(TestCase):
 
diff --git a/tests/oauth2/rfc6749/grant_types/test_client_credentials.py b/tests/oauth2/rfc6749/grant_types/test_client_credentials.py
index 1698abf..edc6bfe 100644
--- a/tests/oauth2/rfc6749/grant_types/test_client_credentials.py
+++ b/tests/oauth2/rfc6749/grant_types/test_client_credentials.py
@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import json
+
 import mock
+
 from oauthlib.common import Request
 from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 
+from ....unittest import TestCase
+
 
 class ClientCredentialsGrantTest(TestCase):
 
diff --git a/tests/oauth2/rfc6749/grant_types/test_implicit.py b/tests/oauth2/rfc6749/grant_types/test_implicit.py
index 53f4ac3..0c18cab 100644
--- a/tests/oauth2/rfc6749/grant_types/test_implicit.py
+++ b/tests/oauth2/rfc6749/grant_types/test_implicit.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import mock
 
@@ -8,6 +7,8 @@ from oauthlib.common import Request
 from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 
+from ....unittest import TestCase
+
 
 class ImplicitGrantTest(TestCase):
 
diff --git a/tests/oauth2/rfc6749/grant_types/test_openid_connect.py b/tests/oauth2/rfc6749/grant_types/test_openid_connect.py
index a2f7726..f10d36c 100644
--- a/tests/oauth2/rfc6749/grant_types/test_openid_connect.py
+++ b/tests/oauth2/rfc6749/grant_types/test_openid_connect.py
@@ -1,16 +1,18 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import json
+
 import mock
+
 from oauthlib.common import Request
-from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectAuthCode
-from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectImplicit
-from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectHybrid
-from oauthlib.oauth2.rfc6749.grant_types import OIDCNoPrompt
+from oauthlib.oauth2.rfc6749.grant_types import (OIDCNoPrompt,
+                                                 OpenIDConnectAuthCode,
+                                                 OpenIDConnectHybrid,
+                                                 OpenIDConnectImplicit)
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
 
+from ....unittest import TestCase
 from .test_authorization_code import AuthorizationCodeGrantTest
 from .test_implicit import ImplicitGrantTest
 
diff --git a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py
index 5671155..21540a2 100644
--- a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py
+++ b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py
@@ -1,13 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import json
+
 import mock
+
 from oauthlib.common import Request
+from oauthlib.oauth2.rfc6749 import errors
 from oauthlib.oauth2.rfc6749.grant_types import RefreshTokenGrant
 from oauthlib.oauth2.rfc6749.tokens import BearerToken
-from oauthlib.oauth2.rfc6749 import errors
+
+from ....unittest import TestCase
 
 
 class RefreshTokenGrantTest(TestCase):
diff --git a/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py b/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py
index 006ed7c..82e0524 100644
--- a/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py
+++ b/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py
@@ -1,13 +1,17 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ....unittest import TestCase
 
 import json
+
 import mock
+
 from oauthlib.common import Request
-from oauthlib.oauth2.rfc6749.grant_types import ResourceOwnerPasswordCredentialsGrant
-from oauthlib.oauth2.rfc6749.tokens import BearerToken
 from oauthlib.oauth2.rfc6749 import errors
+from oauthlib.oauth2.rfc6749.grant_types import \
+    ResourceOwnerPasswordCredentialsGrant
+from oauthlib.oauth2.rfc6749.tokens import BearerToken
+
+from ....unittest import TestCase
 
 
 class ResourceOwnerPasswordCredentialsGrantTest(TestCase):
diff --git a/tests/oauth2/rfc6749/test_parameters.py b/tests/oauth2/rfc6749/test_parameters.py
index 4ae3bc6..2a9cbe8 100644
--- a/tests/oauth2/rfc6749/test_parameters.py
+++ b/tests/oauth2/rfc6749/test_parameters.py
@@ -1,10 +1,12 @@
-from __future__ import absolute_import, unicode_literals 
+from __future__ import absolute_import, unicode_literals
+
 from mock import patch
 
-from ...unittest import TestCase
-from oauthlib.oauth2.rfc6749.parameters import *
-from oauthlib.oauth2.rfc6749.errors import *
 from oauthlib import signals
+from oauthlib.oauth2.rfc6749.errors import *
+from oauthlib.oauth2.rfc6749.parameters import *
+
+from ...unittest import TestCase
 
 
 @patch('time.time', new=lambda: 1000)
diff --git a/tests/oauth2/rfc6749/test_request_validator.py b/tests/oauth2/rfc6749/test_request_validator.py
index 58b653a..9dde814 100644
--- a/tests/oauth2/rfc6749/test_request_validator.py
+++ b/tests/oauth2/rfc6749/test_request_validator.py
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ...unittest import TestCase
 
 from oauthlib.oauth2 import RequestValidator
 
+from ...unittest import TestCase
+
+
 class RequestValidatorTest(TestCase):
 
     def test_method_contracts(self):
diff --git a/tests/oauth2/rfc6749/test_server.py b/tests/oauth2/rfc6749/test_server.py
index aff0d84..305b795 100644
--- a/tests/oauth2/rfc6749/test_server.py
+++ b/tests/oauth2/rfc6749/test_server.py
@@ -1,22 +1,26 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from ...unittest import TestCase
+
 import json
+
 import jwt
 import mock
 
 from oauthlib import common
+from oauthlib.oauth2.rfc6749 import errors, tokens
 from oauthlib.oauth2.rfc6749.endpoints import Server
-from oauthlib.oauth2.rfc6749.endpoints.authorization import AuthorizationEndpoint
-from oauthlib.oauth2.rfc6749.endpoints.token import TokenEndpoint
+from oauthlib.oauth2.rfc6749.endpoints.authorization import \
+    AuthorizationEndpoint
 from oauthlib.oauth2.rfc6749.endpoints.resource import ResourceEndpoint
-from oauthlib.oauth2.rfc6749.grant_types import AuthorizationCodeGrant
-from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant
-from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectAuthCode
-from oauthlib.oauth2.rfc6749.grant_types import OpenIDConnectImplicit
-from oauthlib.oauth2.rfc6749.grant_types import ResourceOwnerPasswordCredentialsGrant
-from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant
-from oauthlib.oauth2.rfc6749 import tokens, errors
+from oauthlib.oauth2.rfc6749.endpoints.token import TokenEndpoint
+from oauthlib.oauth2.rfc6749.grant_types import (AuthorizationCodeGrant,
+                                                 ClientCredentialsGrant,
+                                                 ImplicitGrant,
+                                                 OpenIDConnectAuthCode,
+                                                 OpenIDConnectImplicit,
+                                                 ResourceOwnerPasswordCredentialsGrant)
+
+from ...unittest import TestCase
 
 
 class AuthorizationEndpointTest(TestCase):
diff --git a/tests/oauth2/rfc6749/test_tokens.py b/tests/oauth2/rfc6749/test_tokens.py
index c477f19..e2e558d 100644
--- a/tests/oauth2/rfc6749/test_tokens.py
+++ b/tests/oauth2/rfc6749/test_tokens.py
@@ -1,9 +1,9 @@
 from __future__ import absolute_import, unicode_literals
 
-from ...unittest import TestCase
-
 from oauthlib.oauth2.rfc6749.tokens import *
 
+from ...unittest import TestCase
+
 
 class TokenTest(TestCase):
 
diff --git a/tests/oauth2/rfc6749/test_utils.py b/tests/oauth2/rfc6749/test_utils.py
index 691de76..609162c 100644
--- a/tests/oauth2/rfc6749/test_utils.py
+++ b/tests/oauth2/rfc6749/test_utils.py
@@ -3,13 +3,12 @@ from __future__ import absolute_import, unicode_literals
 import datetime
 import os
 
-from ...unittest import TestCase
 from oauthlib.common import PY3
-from oauthlib.oauth2.rfc6749.utils import escape, host_from_uri
-from oauthlib.oauth2.rfc6749.utils import generate_age
-from oauthlib.oauth2.rfc6749.utils import is_secure_transport
-from oauthlib.oauth2.rfc6749.utils import params_from_uri
-from oauthlib.oauth2.rfc6749.utils import list_to_scope, scope_to_list
+from oauthlib.oauth2.rfc6749.utils import (escape, generate_age, host_from_uri,
+                                           is_secure_transport, list_to_scope,
+                                           params_from_uri, scope_to_list)
+
+from ...unittest import TestCase
 
 
 class ScopeObject:
@@ -105,6 +104,3 @@ class UtilsTests(TestCase):
         set_list_scopes = set(string_list_scopes)
         set_list = scope_to_list(set_list_scopes)
         self.assertEqual(sorted(set_list), sorted(string_list_scopes))
-
-
-
diff --git a/tests/test_common.py b/tests/test_common.py
index 4f95cd8..b0ea20d 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -1,20 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-import sys
 
-from .unittest import TestCase
+import sys
 
-from oauthlib.common import add_params_to_uri
-from oauthlib.common import CaseInsensitiveDict
-from oauthlib.common import extract_params
-from oauthlib.common import generate_client_id
-from oauthlib.common import generate_nonce
-from oauthlib.common import generate_timestamp
-from oauthlib.common import generate_token
-from oauthlib.common import Request
-from oauthlib.common import unicode_type
-from oauthlib.common import urldecode
+from oauthlib.common import (CaseInsensitiveDict, Request, add_params_to_uri,
+                             extract_params, generate_client_id,
+                             generate_nonce, generate_timestamp,
+                             generate_token, unicode_type, urldecode)
 
+from .unittest import TestCase
 
 if sys.version_info[0] == 3:
     bytes_type = bytes