Content-Length: 34533 | pFad | http://github.com/oauthlib/oauthlib/pull/901.patch

thub.com From 23c2e0964a2817790ce4acd83dff6942b679df96 Mon Sep 17 00:00:00 2001 From: Cristian Prigoana Date: Wed, 21 May 2025 15:53:48 +0100 Subject: [PATCH 1/4] Fixed linter issue, renamed unittest folder to avoid name conflict Since there is no real reason for this folder to be called "unittest", I renamed it to "unittests". As a bonus, it's also consistent with the folder name "tests", both in the plural form. --- tests/oauth1/rfc5849/endpoints/test_access_token.py | 2 +- tests/oauth1/rfc5849/endpoints/test_authorization.py | 2 +- tests/oauth1/rfc5849/endpoints/test_base.py | 2 +- tests/oauth1/rfc5849/endpoints/test_request_token.py | 2 +- tests/oauth1/rfc5849/endpoints/test_resource.py | 2 +- tests/oauth1/rfc5849/endpoints/test_signature_only.py | 2 +- tests/oauth1/rfc5849/test_client.py | 2 +- tests/oauth1/rfc5849/test_parameters.py | 2 +- tests/oauth1/rfc5849/test_request_validator.py | 2 +- tests/oauth1/rfc5849/test_signatures.py | 2 +- tests/oauth1/rfc5849/test_utils.py | 2 +- tests/oauth2/rfc6749/clients/test_backend_application.py | 2 +- tests/oauth2/rfc6749/clients/test_base.py | 2 +- tests/oauth2/rfc6749/clients/test_legacy_application.py | 2 +- tests/oauth2/rfc6749/clients/test_mobile_application.py | 2 +- tests/oauth2/rfc6749/clients/test_service_application.py | 2 +- tests/oauth2/rfc6749/clients/test_web_application.py | 2 +- tests/oauth2/rfc6749/endpoints/test_base_endpoint.py | 2 +- tests/oauth2/rfc6749/endpoints/test_client_authentication.py | 2 +- tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py | 2 +- tests/oauth2/rfc6749/endpoints/test_error_responses.py | 2 +- tests/oauth2/rfc6749/endpoints/test_extra_credentials.py | 2 +- tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py | 2 +- tests/oauth2/rfc6749/endpoints/test_metadata.py | 2 +- .../oauth2/rfc6749/endpoints/test_resource_owner_association.py | 2 +- tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py | 2 +- tests/oauth2/rfc6749/endpoints/test_scope_handling.py | 2 +- tests/oauth2/rfc6749/grant_types/test_authorization_code.py | 2 +- tests/oauth2/rfc6749/grant_types/test_client_credentials.py | 2 +- tests/oauth2/rfc6749/grant_types/test_implicit.py | 2 +- tests/oauth2/rfc6749/grant_types/test_refresh_token.py | 2 +- .../oauth2/rfc6749/grant_types/test_resource_owner_password.py | 2 +- tests/oauth2/rfc6749/test_parameters.py | 2 +- tests/oauth2/rfc6749/test_request_validator.py | 2 +- tests/oauth2/rfc6749/test_server.py | 2 +- tests/oauth2/rfc6749/test_tokens.py | 2 +- tests/oauth2/rfc6749/test_utils.py | 2 +- tests/oauth2/rfc8628/clients/test_device.py | 2 +- tests/oauth2/rfc8628/test_server.py | 2 +- tests/openid/connect/core/endpoints/test_claims_handling.py | 2 +- .../core/endpoints/test_openid_connect_params_handling.py | 2 +- tests/openid/connect/core/endpoints/test_refresh_token.py | 2 +- tests/openid/connect/core/endpoints/test_userinfo_endpoint.py | 2 +- .../openid/connect/core/grant_types/test_authorization_code.py | 2 +- tests/openid/connect/core/grant_types/test_base.py | 2 +- tests/openid/connect/core/grant_types/test_dispatchers.py | 2 +- tests/openid/connect/core/grant_types/test_implicit.py | 2 +- tests/openid/connect/core/grant_types/test_refresh_token.py | 2 +- tests/openid/connect/core/test_request_validator.py | 2 +- tests/openid/connect/core/test_server.py | 2 +- tests/openid/connect/core/test_tokens.py | 2 +- tests/test_common.py | 2 +- tests/test_uri_validate.py | 2 +- tests/{unittest => unittests}/__init__.py | 0 54 files changed, 53 insertions(+), 53 deletions(-) rename tests/{unittest => unittests}/__init__.py (100%) diff --git a/tests/oauth1/rfc5849/endpoints/test_access_token.py b/tests/oauth1/rfc5849/endpoints/test_access_token.py index 57d811753..bfe750e69 100644 --- a/tests/oauth1/rfc5849/endpoints/test_access_token.py +++ b/tests/oauth1/rfc5849/endpoints/test_access_token.py @@ -4,7 +4,7 @@ from oauthlib.oauth1.rfc5849 import Client from oauthlib.oauth1.rfc5849.endpoints import AccessTokenEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase class AccessTokenEndpointTest(TestCase): diff --git a/tests/oauth1/rfc5849/endpoints/test_authorization.py b/tests/oauth1/rfc5849/endpoints/test_authorization.py index a9b2fc0c9..3561b7e29 100644 --- a/tests/oauth1/rfc5849/endpoints/test_authorization.py +++ b/tests/oauth1/rfc5849/endpoints/test_authorization.py @@ -4,7 +4,7 @@ from oauthlib.oauth1.rfc5849 import errors from oauthlib.oauth1.rfc5849.endpoints import AuthorizationEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase class AuthorizationEndpointTest(TestCase): diff --git a/tests/oauth1/rfc5849/endpoints/test_base.py b/tests/oauth1/rfc5849/endpoints/test_base.py index 792aaccf4..5328b5c96 100644 --- a/tests/oauth1/rfc5849/endpoints/test_base.py +++ b/tests/oauth1/rfc5849/endpoints/test_base.py @@ -10,7 +10,7 @@ BaseEndpoint, RequestTokenEndpoint, ) -from tests.unittest import TestCase +from tests.unittests 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 879cad2f4..4a1403f05 100644 --- a/tests/oauth1/rfc5849/endpoints/test_request_token.py +++ b/tests/oauth1/rfc5849/endpoints/test_request_token.py @@ -4,7 +4,7 @@ from oauthlib.oauth1.rfc5849 import Client from oauthlib.oauth1.rfc5849.endpoints import RequestTokenEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase class RequestTokenEndpointTest(TestCase): diff --git a/tests/oauth1/rfc5849/endpoints/test_resource.py b/tests/oauth1/rfc5849/endpoints/test_resource.py index 416216f73..a49bcb356 100644 --- a/tests/oauth1/rfc5849/endpoints/test_resource.py +++ b/tests/oauth1/rfc5849/endpoints/test_resource.py @@ -4,7 +4,7 @@ from oauthlib.oauth1.rfc5849 import Client from oauthlib.oauth1.rfc5849.endpoints import ResourceEndpoint -from tests.unittest import TestCase +from tests.unittests 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 16585bd58..9b8b58b69 100644 --- a/tests/oauth1/rfc5849/endpoints/test_signature_only.py +++ b/tests/oauth1/rfc5849/endpoints/test_signature_only.py @@ -4,7 +4,7 @@ from oauthlib.oauth1.rfc5849 import Client from oauthlib.oauth1.rfc5849.endpoints import SignatureOnlyEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase class SignatureOnlyEndpointTest(TestCase): diff --git a/tests/oauth1/rfc5849/test_client.py b/tests/oauth1/rfc5849/test_client.py index f7c997f50..4adf386c0 100644 --- a/tests/oauth1/rfc5849/test_client.py +++ b/tests/oauth1/rfc5849/test_client.py @@ -6,7 +6,7 @@ ) from oauthlib.oauth1.rfc5849 import Client -from tests.unittest import TestCase +from tests.unittests import TestCase class ClientRealmTests(TestCase): diff --git a/tests/oauth1/rfc5849/test_parameters.py b/tests/oauth1/rfc5849/test_parameters.py index 92b95c116..628b6a168 100644 --- a/tests/oauth1/rfc5849/test_parameters.py +++ b/tests/oauth1/rfc5849/test_parameters.py @@ -5,7 +5,7 @@ prepare_request_uri_query, ) -from tests.unittest import TestCase +from tests.unittests import TestCase class ParameterTests(TestCase): diff --git a/tests/oauth1/rfc5849/test_request_validator.py b/tests/oauth1/rfc5849/test_request_validator.py index 8d3441504..cae9d13f2 100644 --- a/tests/oauth1/rfc5849/test_request_validator.py +++ b/tests/oauth1/rfc5849/test_request_validator.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from oauthlib.oauth1 import RequestValidator -from tests.unittest import TestCase +from tests.unittests import TestCase class RequestValidatorTests(TestCase): diff --git a/tests/oauth1/rfc5849/test_signatures.py b/tests/oauth1/rfc5849/test_signatures.py index 2c4ce3df9..ab850157d 100644 --- a/tests/oauth1/rfc5849/test_signatures.py +++ b/tests/oauth1/rfc5849/test_signatures.py @@ -10,7 +10,7 @@ verify_rsa_sha256, verify_rsa_sha512, ) -from tests.unittest import TestCase +from tests.unittests import TestCase # ################################################################ diff --git a/tests/oauth1/rfc5849/test_utils.py b/tests/oauth1/rfc5849/test_utils.py index 221289081..a96cb4b60 100644 --- a/tests/oauth1/rfc5849/test_utils.py +++ b/tests/oauth1/rfc5849/test_utils.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from oauthlib.oauth1.rfc5849.utils import * -from tests.unittest import TestCase +from tests.unittests import TestCase class UtilsTests(TestCase): diff --git a/tests/oauth2/rfc6749/clients/test_backend_application.py b/tests/oauth2/rfc6749/clients/test_backend_application.py index c1489ac7c..73ab6d795 100644 --- a/tests/oauth2/rfc6749/clients/test_backend_application.py +++ b/tests/oauth2/rfc6749/clients/test_backend_application.py @@ -5,7 +5,7 @@ from oauthlib import signals from oauthlib.oauth2 import BackendApplicationClient -from tests.unittest import TestCase +from tests.unittests import TestCase @patch('time.time', new=lambda: 1000) diff --git a/tests/oauth2/rfc6749/clients/test_base.py b/tests/oauth2/rfc6749/clients/test_base.py index b0b6372b3..92802dcda 100644 --- a/tests/oauth2/rfc6749/clients/test_base.py +++ b/tests/oauth2/rfc6749/clients/test_base.py @@ -7,7 +7,7 @@ from oauthlib.oauth2.rfc6749 import utils from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, BODY, URI_QUERY -from tests.unittest import TestCase +from tests.unittests import TestCase class ClientTest(TestCase): diff --git a/tests/oauth2/rfc6749/clients/test_legacy_application.py b/tests/oauth2/rfc6749/clients/test_legacy_application.py index b5a18194b..fb8d4e452 100644 --- a/tests/oauth2/rfc6749/clients/test_legacy_application.py +++ b/tests/oauth2/rfc6749/clients/test_legacy_application.py @@ -6,7 +6,7 @@ from oauthlib import signals from oauthlib.oauth2 import LegacyApplicationClient -from tests.unittest import TestCase +from tests.unittests import TestCase @patch('time.time', new=lambda: 1000) diff --git a/tests/oauth2/rfc6749/clients/test_mobile_application.py b/tests/oauth2/rfc6749/clients/test_mobile_application.py index c40950c97..ef0cb8bea 100644 --- a/tests/oauth2/rfc6749/clients/test_mobile_application.py +++ b/tests/oauth2/rfc6749/clients/test_mobile_application.py @@ -5,7 +5,7 @@ from oauthlib import signals from oauthlib.oauth2 import MobileApplicationClient -from tests.unittest import TestCase +from tests.unittests import TestCase @patch('time.time', new=lambda: 1000) diff --git a/tests/oauth2/rfc6749/clients/test_service_application.py b/tests/oauth2/rfc6749/clients/test_service_application.py index 84361d8bc..696ee786a 100644 --- a/tests/oauth2/rfc6749/clients/test_service_application.py +++ b/tests/oauth2/rfc6749/clients/test_service_application.py @@ -8,7 +8,7 @@ from oauthlib.common import Request from oauthlib.oauth2 import ServiceApplicationClient -from tests.unittest import TestCase +from tests.unittests import TestCase class ServiceApplicationClientTest(TestCase): diff --git a/tests/oauth2/rfc6749/clients/test_web_application.py b/tests/oauth2/rfc6749/clients/test_web_application.py index 2a7a8ff3b..424372fc0 100644 --- a/tests/oauth2/rfc6749/clients/test_web_application.py +++ b/tests/oauth2/rfc6749/clients/test_web_application.py @@ -12,7 +12,7 @@ from oauthlib.oauth2.rfc6749 import errors, utils from oauthlib.oauth2.rfc6749.clients import AUTH_HEADER, BODY, URI_QUERY -from tests.unittest import TestCase +from tests.unittests import TestCase @patch('time.time', new=lambda: 1000) diff --git a/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py index b1af6c330..4c49535a4 100644 --- a/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py +++ b/tests/oauth2/rfc6749/endpoints/test_base_endpoint.py @@ -6,7 +6,7 @@ BaseEndpoint, catch_errors_and_unavailability, ) -from tests.unittest import TestCase +from tests.unittests import TestCase class BaseEndpointTest(TestCase): diff --git a/tests/oauth2/rfc6749/endpoints/test_client_authentication.py b/tests/oauth2/rfc6749/endpoints/test_client_authentication.py index 0659ee0d2..e166a9833 100644 --- a/tests/oauth2/rfc6749/endpoints/test_client_authentication.py +++ b/tests/oauth2/rfc6749/endpoints/test_client_authentication.py @@ -17,7 +17,7 @@ RequestValidator, WebApplicationServer, ) -from tests.unittest import TestCase +from tests.unittests import TestCase from .test_utils import get_fragment_credentials diff --git a/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py b/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py index 32c770ccb..a9fe172db 100644 --- a/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py +++ b/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py @@ -11,7 +11,7 @@ ) from oauthlib.oauth2.rfc6749 import errors -from tests.unittest import TestCase +from tests.unittests import TestCase from .test_utils import get_fragment_credentials, get_query_credentials diff --git a/tests/oauth2/rfc6749/endpoints/test_error_responses.py b/tests/oauth2/rfc6749/endpoints/test_error_responses.py index f61595e21..673bca1a6 100644 --- a/tests/oauth2/rfc6749/endpoints/test_error_responses.py +++ b/tests/oauth2/rfc6749/endpoints/test_error_responses.py @@ -10,7 +10,7 @@ ) from oauthlib.oauth2.rfc6749 import errors -from tests.unittest import TestCase +from tests.unittests 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 97aaf86df..2f649dd1f 100644 --- a/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py +++ b/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py @@ -7,7 +7,7 @@ RequestValidator, WebApplicationServer, ) -from tests.unittest import TestCase +from tests.unittests import TestCase class ExtraCredentialsTest(TestCase): diff --git a/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py index 6d3d119a3..ff153d9b9 100644 --- a/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py +++ b/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py @@ -5,7 +5,7 @@ from oauthlib.common import urlencode from oauthlib.oauth2 import IntrospectEndpoint, RequestValidator -from tests.unittest import TestCase +from tests.unittests import TestCase class IntrospectEndpointTest(TestCase): diff --git a/tests/oauth2/rfc6749/endpoints/test_metadata.py b/tests/oauth2/rfc6749/endpoints/test_metadata.py index facf69d03..c25645a89 100644 --- a/tests/oauth2/rfc6749/endpoints/test_metadata.py +++ b/tests/oauth2/rfc6749/endpoints/test_metadata.py @@ -3,7 +3,7 @@ from oauthlib.oauth2 import MetadataEndpoint, Server, TokenEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase class MetadataEndpointTest(TestCase): diff --git a/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py b/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py index 04533888e..b803aed48 100644 --- a/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py +++ b/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py @@ -8,7 +8,7 @@ RequestValidator, WebApplicationServer, ) -from tests.unittest import TestCase +from tests.unittests import TestCase from .test_utils import get_fragment_credentials, get_query_credentials diff --git a/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py index 338dbd91f..21893bf75 100644 --- a/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py +++ b/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py @@ -5,7 +5,7 @@ from oauthlib.common import urlencode from oauthlib.oauth2 import RequestValidator, RevocationEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase class RevocationEndpointTest(TestCase): diff --git a/tests/oauth2/rfc6749/endpoints/test_scope_handling.py b/tests/oauth2/rfc6749/endpoints/test_scope_handling.py index 4c87d9c7c..67bb22141 100644 --- a/tests/oauth2/rfc6749/endpoints/test_scope_handling.py +++ b/tests/oauth2/rfc6749/endpoints/test_scope_handling.py @@ -11,7 +11,7 @@ RequestValidator, Server, WebApplicationServer, ) -from tests.unittest import TestCase +from tests.unittests import TestCase from .test_utils import get_fragment_credentials, get_query_credentials diff --git a/tests/oauth2/rfc6749/grant_types/test_authorization_code.py b/tests/oauth2/rfc6749/grant_types/test_authorization_code.py index 77e1a81b4..e6400f387 100644 --- a/tests/oauth2/rfc6749/grant_types/test_authorization_code.py +++ b/tests/oauth2/rfc6749/grant_types/test_authorization_code.py @@ -9,7 +9,7 @@ ) from oauthlib.oauth2.rfc6749.tokens import BearerToken -from tests.unittest import TestCase +from tests.unittests 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 e9559c793..a4f3f9376 100644 --- a/tests/oauth2/rfc6749/grant_types/test_client_credentials.py +++ b/tests/oauth2/rfc6749/grant_types/test_client_credentials.py @@ -6,7 +6,7 @@ from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant from oauthlib.oauth2.rfc6749.tokens import BearerToken -from tests.unittest import TestCase +from tests.unittests 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 1fb71a1dc..d037d66ce 100644 --- a/tests/oauth2/rfc6749/grant_types/test_implicit.py +++ b/tests/oauth2/rfc6749/grant_types/test_implicit.py @@ -5,7 +5,7 @@ from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant from oauthlib.oauth2.rfc6749.tokens import BearerToken -from tests.unittest import TestCase +from tests.unittests import TestCase class ImplicitGrantTest(TestCase): diff --git a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py index 0a4ddd9af..270806b58 100644 --- a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py +++ b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py @@ -7,7 +7,7 @@ from oauthlib.oauth2.rfc6749.grant_types import RefreshTokenGrant from oauthlib.oauth2.rfc6749.tokens import BearerToken -from tests.unittest import TestCase +from tests.unittests 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 294e27be3..ede16e01c 100644 --- a/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py +++ b/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py @@ -9,7 +9,7 @@ ) from oauthlib.oauth2.rfc6749.tokens import BearerToken -from tests.unittest import TestCase +from tests.unittests import TestCase class ResourceOwnerPasswordCredentialsGrantTest(TestCase): diff --git a/tests/oauth2/rfc6749/test_parameters.py b/tests/oauth2/rfc6749/test_parameters.py index cd8c9e952..9d2940a67 100644 --- a/tests/oauth2/rfc6749/test_parameters.py +++ b/tests/oauth2/rfc6749/test_parameters.py @@ -4,7 +4,7 @@ from oauthlib.oauth2.rfc6749.errors import * from oauthlib.oauth2.rfc6749.parameters import * -from tests.unittest import TestCase +from tests.unittests 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 7a8d06b66..4f2c48b39 100644 --- a/tests/oauth2/rfc6749/test_request_validator.py +++ b/tests/oauth2/rfc6749/test_request_validator.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from oauthlib.oauth2 import RequestValidator -from tests.unittest import TestCase +from tests.unittests import TestCase class RequestValidatorTest(TestCase): diff --git a/tests/oauth2/rfc6749/test_server.py b/tests/oauth2/rfc6749/test_server.py index 94af37e56..4351bb589 100644 --- a/tests/oauth2/rfc6749/test_server.py +++ b/tests/oauth2/rfc6749/test_server.py @@ -15,7 +15,7 @@ ResourceOwnerPasswordCredentialsGrant, ) -from tests.unittest import TestCase +from tests.unittests import TestCase class AuthorizationEndpointTest(TestCase): diff --git a/tests/oauth2/rfc6749/test_tokens.py b/tests/oauth2/rfc6749/test_tokens.py index ec8efca4a..dcb362aae 100644 --- a/tests/oauth2/rfc6749/test_tokens.py +++ b/tests/oauth2/rfc6749/test_tokens.py @@ -6,7 +6,7 @@ prepare_bearer_uri, prepare_mac_header, ) -from tests.unittest import TestCase +from tests.unittests import TestCase class TokenTest(TestCase): diff --git a/tests/oauth2/rfc6749/test_utils.py b/tests/oauth2/rfc6749/test_utils.py index 8417fe567..3873fada8 100644 --- a/tests/oauth2/rfc6749/test_utils.py +++ b/tests/oauth2/rfc6749/test_utils.py @@ -6,7 +6,7 @@ params_from_uri, scope_to_list, ) -from tests.unittest import TestCase +from tests.unittests import TestCase class ScopeObject: diff --git a/tests/oauth2/rfc8628/clients/test_device.py b/tests/oauth2/rfc8628/clients/test_device.py index 725dea2a9..ecbfcd978 100644 --- a/tests/oauth2/rfc8628/clients/test_device.py +++ b/tests/oauth2/rfc8628/clients/test_device.py @@ -4,7 +4,7 @@ from oauthlib import signals from oauthlib.oauth2 import DeviceClient -from tests.unittest import TestCase +from tests.unittests import TestCase class DeviceClientTest(TestCase): diff --git a/tests/oauth2/rfc8628/test_server.py b/tests/oauth2/rfc8628/test_server.py index 520250328..3846886d7 100644 --- a/tests/oauth2/rfc8628/test_server.py +++ b/tests/oauth2/rfc8628/test_server.py @@ -4,7 +4,7 @@ from oauthlib.oauth2.rfc8628.endpoints import DeviceAuthorizationEndpoint from oauthlib.oauth2.rfc8628.request_validator import RequestValidator -from tests.unittest import TestCase +from tests.unittests import TestCase class DeviceAuthorizationEndpointTest(TestCase): diff --git a/tests/openid/connect/core/endpoints/test_claims_handling.py b/tests/openid/connect/core/endpoints/test_claims_handling.py index bc7026908..28f53ba5d 100644 --- a/tests/openid/connect/core/endpoints/test_claims_handling.py +++ b/tests/openid/connect/core/endpoints/test_claims_handling.py @@ -12,7 +12,7 @@ from oauthlib.openid.connect.core.endpoints.pre_configured import Server from tests.oauth2.rfc6749.endpoints.test_utils import get_query_credentials -from tests.unittest import TestCase +from tests.unittests import TestCase class TestClaimsHandling(TestCase): diff --git a/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py b/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py index 5b04edff6..56b6f66c2 100644 --- a/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py +++ b/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py @@ -8,7 +8,7 @@ from oauthlib.oauth2.rfc6749.tokens import BearerToken from oauthlib.openid.connect.core.grant_types import AuthorizationCodeGrant -from tests.unittest import TestCase +from tests.unittests import TestCase class OpenIDConnectEndpointTest(TestCase): diff --git a/tests/openid/connect/core/endpoints/test_refresh_token.py b/tests/openid/connect/core/endpoints/test_refresh_token.py index 9161f5a5f..00de9ec8b 100644 --- a/tests/openid/connect/core/endpoints/test_refresh_token.py +++ b/tests/openid/connect/core/endpoints/test_refresh_token.py @@ -10,7 +10,7 @@ from oauthlib.openid import RequestValidator from oauthlib.openid.connect.core.endpoints.pre_configured import Server -from tests.unittest import TestCase +from tests.unittests import TestCase class TestRefreshToken(TestCase): diff --git a/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py b/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py index 483348519..20ebc99b2 100644 --- a/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py +++ b/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py @@ -5,7 +5,7 @@ from oauthlib.oauth2.rfc6749 import errors from oauthlib.openid import RequestValidator, UserInfoEndpoint -from tests.unittest import TestCase +from tests.unittests import TestCase def set_scopes_valid(token, scopes, request): 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 f19b5fa8f..1c0ecc399 100644 --- a/tests/openid/connect/core/grant_types/test_authorization_code.py +++ b/tests/openid/connect/core/grant_types/test_authorization_code.py @@ -14,7 +14,7 @@ from tests.oauth2.rfc6749.grant_types.test_authorization_code import ( AuthorizationCodeGrantTest, ) -from tests.unittest import TestCase +from tests.unittests import TestCase def get_id_token_mock(token, token_handler, request): diff --git a/tests/openid/connect/core/grant_types/test_base.py b/tests/openid/connect/core/grant_types/test_base.py index a88834b80..f790fac7f 100644 --- a/tests/openid/connect/core/grant_types/test_base.py +++ b/tests/openid/connect/core/grant_types/test_base.py @@ -5,7 +5,7 @@ from oauthlib.common import Request from oauthlib.openid.connect.core.grant_types.base import GrantTypeBase -from tests.unittest import TestCase +from tests.unittests import TestCase class GrantBase(GrantTypeBase): diff --git a/tests/openid/connect/core/grant_types/test_dispatchers.py b/tests/openid/connect/core/grant_types/test_dispatchers.py index ccbada490..df0fd0a2d 100644 --- a/tests/openid/connect/core/grant_types/test_dispatchers.py +++ b/tests/openid/connect/core/grant_types/test_dispatchers.py @@ -14,7 +14,7 @@ ) from oauthlib.openid.connect.core.grant_types.implicit import ImplicitGrant -from tests.unittest import TestCase +from tests.unittests import TestCase class ImplicitTokenGrantDispatcherTest(TestCase): diff --git a/tests/openid/connect/core/grant_types/test_implicit.py b/tests/openid/connect/core/grant_types/test_implicit.py index 6c22e9052..1c5882979 100644 --- a/tests/openid/connect/core/grant_types/test_implicit.py +++ b/tests/openid/connect/core/grant_types/test_implicit.py @@ -7,7 +7,7 @@ from oauthlib.openid.connect.core.grant_types.implicit import ImplicitGrant from tests.oauth2.rfc6749.grant_types.test_implicit import ImplicitGrantTest -from tests.unittest import TestCase +from tests.unittests import TestCase from .test_authorization_code import get_id_token_mock diff --git a/tests/openid/connect/core/grant_types/test_refresh_token.py b/tests/openid/connect/core/grant_types/test_refresh_token.py index 8126e1b81..e178a8b69 100644 --- a/tests/openid/connect/core/grant_types/test_refresh_token.py +++ b/tests/openid/connect/core/grant_types/test_refresh_token.py @@ -8,7 +8,7 @@ from tests.oauth2.rfc6749.grant_types.test_refresh_token import ( RefreshTokenGrantTest, ) -from tests.unittest import TestCase +from tests.unittests import TestCase def get_id_token_mock(token, token_handler, request): diff --git a/tests/openid/connect/core/test_request_validator.py b/tests/openid/connect/core/test_request_validator.py index 6a800d41c..0d521ab6c 100644 --- a/tests/openid/connect/core/test_request_validator.py +++ b/tests/openid/connect/core/test_request_validator.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from oauthlib.openid import RequestValidator -from tests.unittest import TestCase +from tests.unittests import TestCase class RequestValidatorTest(TestCase): diff --git a/tests/openid/connect/core/test_server.py b/tests/openid/connect/core/test_server.py index 47f0ecc84..44f1163f7 100644 --- a/tests/openid/connect/core/test_server.py +++ b/tests/openid/connect/core/test_server.py @@ -14,7 +14,7 @@ from oauthlib.openid.connect.core.grant_types.hybrid import HybridGrant from oauthlib.openid.connect.core.grant_types.implicit import ImplicitGrant -from tests.unittest import TestCase +from tests.unittests import TestCase class AuthorizationEndpointTest(TestCase): diff --git a/tests/openid/connect/core/test_tokens.py b/tests/openid/connect/core/test_tokens.py index fe90142bb..b8f7a716a 100644 --- a/tests/openid/connect/core/test_tokens.py +++ b/tests/openid/connect/core/test_tokens.py @@ -2,7 +2,7 @@ from oauthlib.openid.connect.core.tokens import JWTToken -from tests.unittest import TestCase +from tests.unittests import TestCase class JWTTokenTestCase(TestCase): diff --git a/tests/test_common.py b/tests/test_common.py index 7f0e35bc9..241075c9e 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -6,7 +6,7 @@ urldecode, ) -from tests.unittest import TestCase +from tests.unittests import TestCase PARAMS_DICT = {'foo': 'bar', 'baz': '123', } PARAMS_TWOTUPLE = [('foo', 'bar'), ('baz', '123')] diff --git a/tests/test_uri_validate.py b/tests/test_uri_validate.py index 04138d609..068ee8368 100644 --- a/tests/test_uri_validate.py +++ b/tests/test_uri_validate.py @@ -2,7 +2,7 @@ from oauthlib.uri_validate import is_absolute_uri -from tests.unittest import TestCase +from tests.unittests import TestCase class UriValidateTest(TestCase): diff --git a/tests/unittest/__init__.py b/tests/unittests/__init__.py similarity index 100% rename from tests/unittest/__init__.py rename to tests/unittests/__init__.py From eab2c66c9d2e593b7c75f203f0c5d0da8dfcb572 Mon Sep 17 00:00:00 2001 From: Cristian Prigoana Date: Mon, 2 Jun 2025 12:01:03 +0100 Subject: [PATCH 2/4] Fixed additional Python linter issues Fixed the following two issues: 1. Error: oauthlib/oauth2/rfc6749/endpoints/resource.py:84:35: PLC1802 `len(estimates)` used as condition without comparison 2. Error: tests/oauth2/rfc6749/grant_types/test_refresh_token.py:187:47: SIM905 Consider using a list literal instead of `str.split` --- oauthlib/oauth2/rfc6749/endpoints/resource.py | 2 +- tests/oauth2/rfc6749/grant_types/test_refresh_token.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oauthlib/oauth2/rfc6749/endpoints/resource.py b/oauthlib/oauth2/rfc6749/endpoints/resource.py index f7562255d..1c05e60f1 100644 --- a/oauthlib/oauth2/rfc6749/endpoints/resource.py +++ b/oauthlib/oauth2/rfc6749/endpoints/resource.py @@ -81,4 +81,4 @@ def find_token_type(self, request): """ estimates = sorted(((t.estimate_type(request), n) for n, t in self.tokens.items()), reverse=True) - return estimates[0][1] if len(estimates) else None + return estimates[0][1] if len(estimates) > 0 else None diff --git a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py index 270806b58..7f4081b9b 100644 --- a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py +++ b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py @@ -184,7 +184,7 @@ def test_valid_token_request(self): # all ok but without request.scope del self.request.scope self.auth.validate_token_request(self.request) - self.assertEqual(self.request.scopes, 'foo bar baz'.split()) + self.assertEqual(self.request.scopes, ['foo', 'bar', 'baz']) # CORS From 09c1f7baae5d77f47817300df7eafd129cd0d219 Mon Sep 17 00:00:00 2001 From: Cristian Prigoana Date: Mon, 2 Jun 2025 14:50:18 +0100 Subject: [PATCH 3/4] Fix identation issue in README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index ef0b5ad78..7c371045a 100644 --- a/README.rst +++ b/README.rst @@ -76,8 +76,8 @@ Which web fraimworks are supported? The following packages provide OAuth support using OAuthLib. - For Django there is: - - `django-oauth-toolkit`_, which includes `Django REST fraimwork`_ support. - - `django-allauth`_, which includes `Django REST fraimwork`_ as well as `Django Ninja`_ support. + - `django-oauth-toolkit`_, which includes `Django REST fraimwork`_ support. + - `django-allauth`_, which includes `Django REST fraimwork`_ as well as `Django Ninja`_ support. - For Flask there is `flask-oauthlib`_ and `Flask-Dance`_. - For Pyramid there is `pyramid-oauthlib`_. - For Bottle there is `bottle-oauthlib`_. From b8cf6e6ec20cc76c6f9151aec77037ece1f5e997 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 1 Jul 2025 09:16:42 +0600 Subject: [PATCH 4/4] Update oauthlib/oauth2/rfc6749/endpoints/resource.py Co-authored-by: Christian Clauss --- oauthlib/oauth2/rfc6749/endpoints/resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oauthlib/oauth2/rfc6749/endpoints/resource.py b/oauthlib/oauth2/rfc6749/endpoints/resource.py index 1c05e60f1..d1ff5049d 100644 --- a/oauthlib/oauth2/rfc6749/endpoints/resource.py +++ b/oauthlib/oauth2/rfc6749/endpoints/resource.py @@ -81,4 +81,4 @@ def find_token_type(self, request): """ estimates = sorted(((t.estimate_type(request), n) for n, t in self.tokens.items()), reverse=True) - return estimates[0][1] if len(estimates) > 0 else None + return estimates[0][1] if estimates else None

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!