diff --git a/tests/oauth1/rfc5849/test_client.py b/tests/oauth1/rfc5849/test_client.py index cad0623f..f20bfa7a 100644 --- a/tests/oauth1/rfc5849/test_client.py +++ b/tests/oauth1/rfc5849/test_client.py @@ -133,7 +133,7 @@ def test_register_method(self): u, h, b = client.sign('http://example.com') - self.assertEquals(h['Authorization'], ( + self.assertEqual(h['Authorization'], ( 'OAuth oauth_nonce="abc", oauth_timestamp="1234567890", ' 'oauth_version="1.0", oauth_signature_method="PIZZA", ' 'oauth_consumer_key="client_key", ' diff --git a/tests/oauth1/rfc5849/test_signatures.py b/tests/oauth1/rfc5849/test_signatures.py index 51e01ef6..65082676 100644 --- a/tests/oauth1/rfc5849/test_signatures.py +++ b/tests/oauth1/rfc5849/test_signatures.py @@ -142,13 +142,13 @@ def test_normalize_base_string_uri(self): # test a URI with the default port uri = "http://www.example.com:80/" - self.assertEquals(normalize_base_string_uri(uri), - "http://www.example.com/") + self.assertEqual(normalize_base_string_uri(uri), + "http://www.example.com/") # test a URI missing a path uri = "http://www.example.com" - self.assertEquals(normalize_base_string_uri(uri), - "http://www.example.com/") + self.assertEqual(normalize_base_string_uri(uri), + "http://www.example.com/") # test a relative URI uri = "/a-host-relative-uri" @@ -158,14 +158,14 @@ def test_normalize_base_string_uri(self): # test overriding the URI's netloc with a host argument uri = "http://www.example.com/a-path" host = "alternatehost.example.com" - self.assertEquals(normalize_base_string_uri(uri, host), - "http://alternatehost.example.com/a-path") + self.assertEqual(normalize_base_string_uri(uri, host), + "http://alternatehost.example.com/a-path") def test_collect_parameters(self): """We check against parameters multiple times in case things change after more parameters are added. """ - self.assertEquals(collect_parameters(), []) + self.assertEqual(collect_parameters(), []) # Check against uri_query parameters = collect_parameters(uri_query=self.uri_query) @@ -241,8 +241,8 @@ def test_sign_hmac_sha1(self): sign = sign_hmac_sha1(self.control_base_string, self.client_secret.decode('utf-8'), self.resource_owner_secret.decode('utf-8')) - self.assertEquals(len(sign), 28) - self.assertEquals(sign, self.control_signature) + self.assertEqual(len(sign), 28) + self.assertEqual(sign, self.control_signature) def test_sign_hmac_sha1_with_client(self): self.assertRaises(ValueError, @@ -254,8 +254,8 @@ def test_sign_hmac_sha1_with_client(self): sign = sign_hmac_sha1_with_client( self.control_base_string, self.client) - self.assertEquals(len(sign), 28) - self.assertEquals(sign, self.control_signature) + self.assertEqual(len(sign), 28) + self.assertEqual(sign, self.control_signature) control_base_string_rsa_sha1 = ( @@ -309,9 +309,9 @@ def test_sign_rsa_sha1(self): control_signature = self.control_signature_rsa_sha1 sign = sign_rsa_sha1(base_string, private_key) - self.assertEquals(sign, control_signature) + self.assertEqual(sign, control_signature) sign = sign_rsa_sha1(base_string.decode('utf-8'), private_key) - self.assertEquals(sign, control_signature) + self.assertEqual(sign, control_signature) def test_sign_rsa_sha1_with_client(self): @@ -323,13 +323,13 @@ def test_sign_rsa_sha1_with_client(self): sign = sign_rsa_sha1_with_client(base_string, self.client) - self.assertEquals(sign, control_signature) + self.assertEqual(sign, control_signature) self.client.decode() ## Decode `rsa_private_key` from UTF-8 sign = sign_rsa_sha1_with_client(base_string, self.client) - self.assertEquals(sign, control_signature) + self.assertEqual(sign, control_signature) control_signature_plaintext = ( @@ -343,7 +343,7 @@ def test_sign_plaintext(self): self.resource_owner_secret) sign = sign_plaintext(self.client_secret.decode('utf-8'), self.resource_owner_secret.decode('utf-8')) - self.assertEquals(sign, self.control_signature_plaintext) + self.assertEqual(sign, self.control_signature_plaintext) def test_sign_plaintext_with_client(self): @@ -354,5 +354,4 @@ def test_sign_plaintext_with_client(self): sign = sign_plaintext_with_client(None, self.client) - self.assertEquals(sign, self.control_signature_plaintext) - + self.assertEqual(sign, self.control_signature_plaintext)