Sorted imports.

11 files changed, 59 insertions, 40 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