11 files changed, 7 insertions, 34 deletions
diff --git a/tests/oauth1/rfc5849/endpoints/test_access_token.py b/tests/oauth1/rfc5849/endpoints/test_access_token.py
index 3499fdb..9ba8a3e 100644
--- a/tests/oauth1/rfc5849/endpoints/test_access_token.py
+++ b/tests/oauth1/rfc5849/endpoints/test_access_token.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from mock import ANY, MagicMock
 
 from oauthlib.oauth1 import RequestValidator
diff --git a/tests/oauth1/rfc5849/endpoints/test_authorization.py b/tests/oauth1/rfc5849/endpoints/test_authorization.py
index e9d3604..178bddf 100644
--- a/tests/oauth1/rfc5849/endpoints/test_authorization.py
+++ b/tests/oauth1/rfc5849/endpoints/test_authorization.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from mock import MagicMock
 
 from oauthlib.oauth1 import RequestValidator
diff --git a/tests/oauth1/rfc5849/endpoints/test_base.py b/tests/oauth1/rfc5849/endpoints/test_base.py
index 795ddee..de6c1a4 100644
--- a/tests/oauth1/rfc5849/endpoints/test_base.py
+++ b/tests/oauth1/rfc5849/endpoints/test_base.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from re import sub
 
 from mock import MagicMock
diff --git a/tests/oauth1/rfc5849/endpoints/test_request_token.py b/tests/oauth1/rfc5849/endpoints/test_request_token.py
index 5c9ae88..ece36bd 100644
--- a/tests/oauth1/rfc5849/endpoints/test_request_token.py
+++ b/tests/oauth1/rfc5849/endpoints/test_request_token.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from mock import ANY, MagicMock
 
 from oauthlib.oauth1 import RequestValidator
diff --git a/tests/oauth1/rfc5849/endpoints/test_resource.py b/tests/oauth1/rfc5849/endpoints/test_resource.py
index b71412a..41c9aee 100644
--- a/tests/oauth1/rfc5849/endpoints/test_resource.py
+++ b/tests/oauth1/rfc5849/endpoints/test_resource.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from mock import ANY, MagicMock
 
 from oauthlib.oauth1 import RequestValidator
diff --git a/tests/oauth1/rfc5849/endpoints/test_signature_only.py b/tests/oauth1/rfc5849/endpoints/test_signature_only.py
index 1d758b1..9804137 100644
--- a/tests/oauth1/rfc5849/endpoints/test_signature_only.py
+++ b/tests/oauth1/rfc5849/endpoints/test_signature_only.py
@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 from mock import ANY, MagicMock
 
 from oauthlib.oauth1 import RequestValidator
diff --git a/tests/oauth1/rfc5849/test_client.py b/tests/oauth1/rfc5849/test_client.py
index e1f83de..5c805a1 100644
--- a/tests/oauth1/rfc5849/test_client.py
+++ b/tests/oauth1/rfc5849/test_client.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from oauthlib.common import Request
 from oauthlib.oauth1 import (SIGNATURE_PLAINTEXT, SIGNATURE_HMAC_SHA1,
                              SIGNATURE_HMAC_SHA256, SIGNATURE_RSA,
@@ -163,7 +161,7 @@ class SignatureMethodTest(TestCase):
         Client.register_signature_method('PIZZA',
             lambda base_string, client: 'PIZZA')
 
-        self.assertTrue('PIZZA' in Client.SIGNATURE_METHODS)
+        self.assertIn('PIZZA', Client.SIGNATURE_METHODS)
 
         client = Client('client_key', signature_method='PIZZA',
             timestamp='1234567890', nonce='abc')
diff --git a/tests/oauth1/rfc5849/test_parameters.py b/tests/oauth1/rfc5849/test_parameters.py
index ae72fd7..3afbb3a 100644
--- a/tests/oauth1/rfc5849/test_parameters.py
+++ b/tests/oauth1/rfc5849/test_parameters.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from oauthlib.common import urlencode
 from oauthlib.oauth1.rfc5849.parameters import (_append_params,
                                                 prepare_form_encoded_body,
diff --git a/tests/oauth1/rfc5849/test_request_validator.py b/tests/oauth1/rfc5849/test_request_validator.py
index 88bbcdc..a3fe58f 100644
--- a/tests/oauth1/rfc5849/test_request_validator.py
+++ b/tests/oauth1/rfc5849/test_request_validator.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
 from oauthlib.oauth1 import RequestValidator
 
 from ...unittest import TestCase
diff --git a/tests/oauth1/rfc5849/test_signatures.py b/tests/oauth1/rfc5849/test_signatures.py
index 5ff0989..89219f7 100644
--- a/tests/oauth1/rfc5849/test_signatures.py
+++ b/tests/oauth1/rfc5849/test_signatures.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
-from oauthlib.common import unicode_type
 from oauthlib.oauth1.rfc5849.signature import (collect_parameters,
                                                signature_base_string,
                                                base_string_uri,
@@ -12,13 +9,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
 
 
 
@@ -241,7 +235,7 @@ class SignatureTests(TestCase):
         normalized = normalize_parameters(parameters)
 
         # Unicode everywhere and always
-        self.assertIsInstance(normalized, unicode_type)
+        self.assertIsInstance(normalized, str)
 
         # Lets see if things are in order
         # check to see that querystring keys come in alphanumeric order:
diff --git a/tests/oauth1/rfc5849/test_utils.py b/tests/oauth1/rfc5849/test_utils.py
index 5a889e8..ba8ed0e 100644
--- a/tests/oauth1/rfc5849/test_utils.py
+++ b/tests/oauth1/rfc5849/test_utils.py
@@ -1,7 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, unicode_literals
-
-from oauthlib.common import unicode_type
 from oauthlib.oauth1.rfc5849.utils import *
 
 from ...unittest import TestCase
@@ -102,12 +99,12 @@ class UtilsTests(TestCase):
     def test_escape(self):
         self.assertRaises(ValueError, escape, b"I am a string type. Not a unicode type.")
         self.assertEqual(escape("I am a unicode type."), "I%20am%20a%20unicode%20type.")
-        self.assertIsInstance(escape("I am a unicode type."), unicode_type)
+        self.assertIsInstance(escape("I am a unicode type."), str)
 
     def test_unescape(self):
         self.assertRaises(ValueError, unescape, b"I am a string type. Not a unicode type.")
         self.assertEqual(unescape("I%20am%20a%20unicode%20type."), 'I am a unicode type.')
-        self.assertIsInstance(unescape("I%20am%20a%20unicode%20type."), unicode_type)
+        self.assertIsInstance(unescape("I%20am%20a%20unicode%20type."), str)
 
     def test_parse_authorization_header(self):
         # make us some headers
@@ -122,8 +119,8 @@ class UtilsTests(TestCase):
 
         # are the internal components of each tuple unicode?
         for k, v in authorization_headers:
-            self.assertIsInstance(k, unicode_type)
-            self.assertIsInstance(v, unicode_type)
+            self.assertIsInstance(k, str)
+            self.assertIsInstance(v, str)
 
         # let's check the parsed headers created
         correct_headers = [