Upgrade Python syntax with pyupgrade

9 files changed, 22 insertions, 22 deletions

diff --git a/tests/oauth2/rfc6749/clients/test_base.py b/tests/oauth2/rfc6749/clients/test_base.py
index d48a944..4fbada9 100644
--- a/tests/oauth2/rfc6749/clients/test_base.py
+++ b/tests/oauth2/rfc6749/clients/test_base.py
@@ -295,11 +295,11 @@ class ClientTest(TestCase):
         u, h, b = client.prepare_refresh_token_request(url, token, scope=scope)
         self.assertEqual(u, url)
         self.assertEqual(h, {'Content-Type': 'application/x-www-form-urlencoded'})
-        self.assertFormBodyEqual(b, 'grant_type=refresh_token&scope=%s&refresh_token=%s' % (scope, token))
+        self.assertFormBodyEqual(b, 'grant_type=refresh_token&scope={}&refresh_token={}'.format(scope, token))
 
         # provide scope while init
         client = Client(self.client_id, scope=scope)
         u, h, b = client.prepare_refresh_token_request(url, token, scope=scope)
         self.assertEqual(u, url)
         self.assertEqual(h, {'Content-Type': 'application/x-www-form-urlencoded'})
-        self.assertFormBodyEqual(b, 'grant_type=refresh_token&scope=%s&refresh_token=%s' % (scope, token))
+        self.assertFormBodyEqual(b, 'grant_type=refresh_token&scope={}&refresh_token={}'.format(scope, token))
diff --git a/tests/oauth2/rfc6749/clients/test_legacy_application.py b/tests/oauth2/rfc6749/clients/test_legacy_application.py
index 21af4a3..01e46e4 100644
--- a/tests/oauth2/rfc6749/clients/test_legacy_application.py
+++ b/tests/oauth2/rfc6749/clients/test_legacy_application.py
@@ -32,7 +32,7 @@ class LegacyApplicationClientTest(TestCase):
     password = "user_password"
     body = "not=empty"
 
-    body_up = "not=empty&grant_type=password&username=%s&password=%s" % (username, password)
+    body_up = "not=empty&grant_type=password&username={}&password={}".format(username, password)
     body_kwargs = body_up + "&some=providers&require=extra+arguments"
 
     token_json = ('{   "access_token":"2YotnFZFEjr1zCsicMWpAA",'
@@ -105,8 +105,8 @@ class LegacyApplicationClientTest(TestCase):
 
         # scenario 1, default behavior to not include `client_id`
         r1 = client.prepare_request_body(username=self.username, password=self.password)
-        self.assertIn(r1, ('grant_type=password&username=%s&password=%s' % (self.username, self.password, ),
-                           'grant_type=password&password=%s&username=%s' % (self.password, self.username, ),
+        self.assertIn(r1, ('grant_type=password&username={}&password={}'.format(self.username, self.password),
+                           'grant_type=password&password={}&username={}'.format(self.password, self.username),
                           ))
 
         # scenario 2, include `client_id` in the body
diff --git a/tests/oauth2/rfc6749/clients/test_web_application.py b/tests/oauth2/rfc6749/clients/test_web_application.py
index 092f93e..f7fbb02 100644
--- a/tests/oauth2/rfc6749/clients/test_web_application.py
+++ b/tests/oauth2/rfc6749/clients/test_web_application.py
@@ -46,7 +46,7 @@ class WebApplicationClientTest(TestCase):
     code = "zzzzaaaa"
     body = "not=empty"
 
-    body_code = "not=empty&grant_type=authorization_code&code=%s&client_id=%s" % (code, client_id)
+    body_code = "not=empty&grant_type=authorization_code&code={}&client_id={}".format(code, client_id)
     body_redirect = body_code + "&redirect_uri=http%3A%2F%2Fmy.page.com%2Fcallback"
     body_kwargs = body_code + "&some=providers&require=extra+arguments"
 
diff --git a/tests/oauth2/rfc6749/test_parameters.py b/tests/oauth2/rfc6749/test_parameters.py
index 48b7eac..5e449f4 100644
--- a/tests/oauth2/rfc6749/test_parameters.py
+++ b/tests/oauth2/rfc6749/test_parameters.py
@@ -77,9 +77,9 @@ class ParameterTests(TestCase):
     error_invalid = 'https://client.example.com/cb?error=invalid_request&state=xyz'
 
     implicit_base = 'https://example.com/cb#access_token=2YotnFZFEjr1zCsicMWpAA&scope=abc&'
-    implicit_response = implicit_base + 'state={0}&token_type=example&expires_in=3600'.format(state)
-    implicit_notype = implicit_base + 'state={0}&expires_in=3600'.format(state)
-    implicit_wrongstate = implicit_base + 'state={0}&token_type=exampleexpires_in=3600'.format('invalid')
+    implicit_response = implicit_base + 'state={}&token_type=example&expires_in=3600'.format(state)
+    implicit_notype = implicit_base + 'state={}&expires_in=3600'.format(state)
+    implicit_wrongstate = implicit_base + 'state={}&token_type=exampleexpires_in=3600'.format('invalid')
     implicit_nostate = implicit_base + 'token_type=example&expires_in=3600'
     implicit_notoken = 'https://example.com/cb#state=xyz&token_type=example&expires_in=3600'
 
@@ -244,7 +244,7 @@ class ParameterTests(TestCase):
             for scope in new + old:
                 self.assertIn(scope, message)
             self.assertEqual(old, ['aaa'])
-            self.assertEqual(set(new), set(['abc', 'def']))
+            self.assertEqual(set(new), {'abc', 'def'})
         finally:
             signals.scope_changed.disconnect(record_scope_change)
         del os.environ['OAUTHLIB_RELAX_TOKEN_SCOPE']
@@ -278,7 +278,7 @@ class ParameterTests(TestCase):
             for scope in new + old:
                 self.assertIn(scope, message)
             self.assertEqual(old, ['aaa'])
-            self.assertEqual(set(new), set(['abc', 'def']))
+            self.assertEqual(set(new), {'abc', 'def'})
         finally:
             signals.scope_changed.disconnect(record_scope_change)
         del os.environ['OAUTHLIB_RELAX_TOKEN_SCOPE']
diff --git a/tests/openid/connect/core/grant_types/test_authorization_code.py b/tests/openid/connect/core/grant_types/test_authorization_code.py
index b721a19..76a4e97 100644
--- a/tests/openid/connect/core/grant_types/test_authorization_code.py
+++ b/tests/openid/connect/core/grant_types/test_authorization_code.py
@@ -24,7 +24,7 @@ class OpenIDAuthCodeInterferenceTest(AuthorizationCodeGrantTest):
     """Test that OpenID don't interfere with normal OAuth 2 flows."""
 
     def setUp(self):
-        super(OpenIDAuthCodeInterferenceTest, self).setUp()
+        super().setUp()
         self.auth = AuthorizationCodeGrant(request_validator=self.mock_validator)
 
 
diff --git a/tests/openid/connect/core/grant_types/test_dispatchers.py b/tests/openid/connect/core/grant_types/test_dispatchers.py
index 9e45d65..53625b2 100644
--- a/tests/openid/connect/core/grant_types/test_dispatchers.py
+++ b/tests/openid/connect/core/grant_types/test_dispatchers.py
@@ -72,7 +72,7 @@ class DispatcherTest(TestCase):
 class AuthTokenGrantDispatcherOpenIdTest(DispatcherTest):
 
     def setUp(self):
-        super(AuthTokenGrantDispatcherOpenIdTest, self).setUp()
+        super().setUp()
         self.request_validator.get_authorization_code_scopes.return_value = ('hello', 'openid')
         self.dispatcher = AuthorizationTokenGrantDispatcher(
             self.request_validator,
@@ -89,7 +89,7 @@ class AuthTokenGrantDispatcherOpenIdTest(DispatcherTest):
 class AuthTokenGrantDispatcherOpenIdWithoutCodeTest(DispatcherTest):
 
     def setUp(self):
-        super(AuthTokenGrantDispatcherOpenIdWithoutCodeTest, self).setUp()
+        super().setUp()
         self.request.decoded_body = (
             ("client_id", "me"),
             ("code", ""),
@@ -111,7 +111,7 @@ class AuthTokenGrantDispatcherOpenIdWithoutCodeTest(DispatcherTest):
 class AuthTokenGrantDispatcherOAuthTest(DispatcherTest):
 
     def setUp(self):
-        super(AuthTokenGrantDispatcherOAuthTest, self).setUp()
+        super().setUp()
         self.request_validator.get_authorization_code_scopes.return_value = ('hello', 'world')
         self.dispatcher = AuthorizationTokenGrantDispatcher(
             self.request_validator,
diff --git a/tests/openid/connect/core/grant_types/test_hybrid.py b/tests/openid/connect/core/grant_types/test_hybrid.py
index 0aa0add..08dcc13 100644
--- a/tests/openid/connect/core/grant_types/test_hybrid.py
+++ b/tests/openid/connect/core/grant_types/test_hybrid.py
@@ -15,14 +15,14 @@ class OpenIDHybridInterferenceTest(AuthorizationCodeGrantTest):
     """Test that OpenID don't interfere with normal OAuth 2 flows."""
 
     def setUp(self):
-        super(OpenIDHybridInterferenceTest, self).setUp()
+        super().setUp()
         self.auth = HybridGrant(request_validator=self.mock_validator)
 
 
 class OpenIDHybridCodeTokenTest(OpenIDAuthCodeTest):
 
     def setUp(self):
-        super(OpenIDHybridCodeTokenTest, self).setUp()
+        super().setUp()
         self.request.response_type = 'code token'
         self.request.nonce = None
         self.auth = HybridGrant(request_validator=self.mock_validator)
@@ -45,7 +45,7 @@ class OpenIDHybridCodeTokenTest(OpenIDAuthCodeTest):
 class OpenIDHybridCodeIdTokenTest(OpenIDAuthCodeTest):
 
     def setUp(self):
-        super(OpenIDHybridCodeIdTokenTest, self).setUp()
+        super().setUp()
         self.mock_validator.get_code_challenge.return_value = None
         self.request.response_type = 'code id_token'
         self.request.nonce = 'zxc'
@@ -70,7 +70,7 @@ class OpenIDHybridCodeIdTokenTest(OpenIDAuthCodeTest):
 class OpenIDHybridCodeIdTokenTokenTest(OpenIDAuthCodeTest):
 
     def setUp(self):
-        super(OpenIDHybridCodeIdTokenTokenTest, self).setUp()
+        super().setUp()
         self.mock_validator.get_code_challenge.return_value = None
         self.request.response_type = 'code id_token token'
         self.request.nonce = 'xyz'
diff --git a/tests/openid/connect/core/grant_types/test_implicit.py b/tests/openid/connect/core/grant_types/test_implicit.py
index 1ee805c..e94ad30 100644
--- a/tests/openid/connect/core/grant_types/test_implicit.py
+++ b/tests/openid/connect/core/grant_types/test_implicit.py
@@ -17,7 +17,7 @@ class OpenIDImplicitInterferenceTest(ImplicitGrantTest):
     """Test that OpenID don't interfere with normal OAuth 2 flows."""
 
     def setUp(self):
-        super(OpenIDImplicitInterferenceTest, self).setUp()
+        super().setUp()
         self.auth = ImplicitGrant(request_validator=self.mock_validator)
 
 
@@ -114,7 +114,7 @@ class OpenIDImplicitTest(TestCase):
 
 class OpenIDImplicitNoAccessTokenTest(OpenIDImplicitTest):
     def setUp(self):
-        super(OpenIDImplicitNoAccessTokenTest, self).setUp()
+        super().setUp()
         self.request.response_type = 'id_token'
         token = 'MOCKED_TOKEN'
         self.url_query = 'https://a.b/cb?state=abc&id_token=%s' % token
diff --git a/tests/test_common.py b/tests/test_common.py
index c2c5e41..2a9a264 100644
--- a/tests/test_common.py
+++ b/tests/test_common.py
@@ -71,7 +71,7 @@ class ParameterTest(TestCase):
         self.assertEqual(extract_params([('')]), None)
 
     def test_add_params_to_uri(self):
-        correct = '%s?%s' % (URI, PARAMS_FORMENCODED)
+        correct = '{}?{}'.format(URI, PARAMS_FORMENCODED)
         self.assertURLEqual(add_params_to_uri(URI, PARAMS_DICT), correct)
         self.assertURLEqual(add_params_to_uri(URI, PARAMS_TWOTUPLE), correct)