From 394c019f88e4decaec45b54f94f6a8a4c77d1b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 16 Mar 2020 12:27:34 +0100 Subject: Use unittest.mock instead of external mock Replace the use of external 'mock' package with built-in Python unittest.mock (present since py3.3). This also fixes all test failures for me. --- requirements-test.txt | 1 - 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/oauth2/rfc6749/clients/test_backend_application.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_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_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 +- tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py | 2 +- tests/oauth2/rfc6749/test_parameters.py | 2 +- tests/oauth2/rfc6749/test_server.py | 2 +- tests/oauth2/rfc6749/test_tokens.py | 2 +- tests/openid/connect/core/endpoints/test_claims_handling.py | 2 +- .../connect/core/endpoints/test_openid_connect_params_handling.py | 2 +- tests/openid/connect/core/endpoints/test_userinfo_endpoint.py | 2 +- tests/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_hybrid.py | 2 +- tests/openid/connect/core/grant_types/test_implicit.py | 2 +- tests/openid/connect/core/test_server.py | 2 +- tests/openid/connect/core/test_tokens.py | 2 +- 38 files changed, 37 insertions(+), 38 deletions(-) diff --git a/requirements-test.txt b/requirements-test.txt index 64485a6..6d8d6e9 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,4 +1,3 @@ -r requirements.txt -mock>=2.0 pytest>=4.0 pytest-cov>=2.6 diff --git a/tests/oauth1/rfc5849/endpoints/test_access_token.py b/tests/oauth1/rfc5849/endpoints/test_access_token.py index 9ba8a3e..05d62fc 100644 --- a/tests/oauth1/rfc5849/endpoints/test_access_token.py +++ b/tests/oauth1/rfc5849/endpoints/test_access_token.py @@ -1,4 +1,4 @@ -from mock import ANY, MagicMock +from unittest.mock import ANY, MagicMock from oauthlib.oauth1 import RequestValidator from oauthlib.oauth1.rfc5849 import Client diff --git a/tests/oauth1/rfc5849/endpoints/test_authorization.py b/tests/oauth1/rfc5849/endpoints/test_authorization.py index 178bddf..a9b2fc0 100644 --- a/tests/oauth1/rfc5849/endpoints/test_authorization.py +++ b/tests/oauth1/rfc5849/endpoints/test_authorization.py @@ -1,4 +1,4 @@ -from mock import MagicMock +from unittest.mock import MagicMock from oauthlib.oauth1 import RequestValidator from oauthlib.oauth1.rfc5849 import errors diff --git a/tests/oauth1/rfc5849/endpoints/test_base.py b/tests/oauth1/rfc5849/endpoints/test_base.py index de6c1a4..6fc991a 100644 --- a/tests/oauth1/rfc5849/endpoints/test_base.py +++ b/tests/oauth1/rfc5849/endpoints/test_base.py @@ -1,6 +1,6 @@ from re import sub -from mock import MagicMock +from unittest.mock import MagicMock from oauthlib.common import CaseInsensitiveDict, safe_string_equals from oauthlib.oauth1 import Client, RequestValidator diff --git a/tests/oauth1/rfc5849/endpoints/test_request_token.py b/tests/oauth1/rfc5849/endpoints/test_request_token.py index ece36bd..e16ea7b 100644 --- a/tests/oauth1/rfc5849/endpoints/test_request_token.py +++ b/tests/oauth1/rfc5849/endpoints/test_request_token.py @@ -1,4 +1,4 @@ -from mock import ANY, MagicMock +from unittest.mock import ANY, MagicMock from oauthlib.oauth1 import RequestValidator from oauthlib.oauth1.rfc5849 import Client diff --git a/tests/oauth1/rfc5849/endpoints/test_resource.py b/tests/oauth1/rfc5849/endpoints/test_resource.py index 41c9aee..2aeb1c8 100644 --- a/tests/oauth1/rfc5849/endpoints/test_resource.py +++ b/tests/oauth1/rfc5849/endpoints/test_resource.py @@ -1,4 +1,4 @@ -from mock import ANY, MagicMock +from unittest.mock import ANY, MagicMock from oauthlib.oauth1 import RequestValidator from oauthlib.oauth1.rfc5849 import Client diff --git a/tests/oauth1/rfc5849/endpoints/test_signature_only.py b/tests/oauth1/rfc5849/endpoints/test_signature_only.py index 9804137..2ff1073 100644 --- a/tests/oauth1/rfc5849/endpoints/test_signature_only.py +++ b/tests/oauth1/rfc5849/endpoints/test_signature_only.py @@ -1,4 +1,4 @@ -from mock import ANY, MagicMock +from unittest.mock import ANY, MagicMock from oauthlib.oauth1 import RequestValidator from oauthlib.oauth1.rfc5849 import Client diff --git a/tests/oauth2/rfc6749/clients/test_backend_application.py b/tests/oauth2/rfc6749/clients/test_backend_application.py index 8d80b39..b05786a 100644 --- a/tests/oauth2/rfc6749/clients/test_backend_application.py +++ b/tests/oauth2/rfc6749/clients/test_backend_application.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os -from mock import patch +from unittest.mock import patch from oauthlib import signals from oauthlib.oauth2 import BackendApplicationClient diff --git a/tests/oauth2/rfc6749/clients/test_legacy_application.py b/tests/oauth2/rfc6749/clients/test_legacy_application.py index 34ea108..1daf2a3 100644 --- a/tests/oauth2/rfc6749/clients/test_legacy_application.py +++ b/tests/oauth2/rfc6749/clients/test_legacy_application.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os -from mock import patch +from unittest.mock import patch from oauthlib import signals from oauthlib.oauth2 import LegacyApplicationClient diff --git a/tests/oauth2/rfc6749/clients/test_mobile_application.py b/tests/oauth2/rfc6749/clients/test_mobile_application.py index e2bdebe..2fb839e 100644 --- a/tests/oauth2/rfc6749/clients/test_mobile_application.py +++ b/tests/oauth2/rfc6749/clients/test_mobile_application.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import os -from mock import patch +from unittest.mock import patch from oauthlib import signals from oauthlib.oauth2 import MobileApplicationClient diff --git a/tests/oauth2/rfc6749/clients/test_service_application.py b/tests/oauth2/rfc6749/clients/test_service_application.py index ba9406b..6f48e23 100644 --- a/tests/oauth2/rfc6749/clients/test_service_application.py +++ b/tests/oauth2/rfc6749/clients/test_service_application.py @@ -3,7 +3,7 @@ import os from time import time import jwt -from mock import patch +from unittest.mock import patch from oauthlib.common import Request from oauthlib.oauth2 import ServiceApplicationClient diff --git a/tests/oauth2/rfc6749/clients/test_web_application.py b/tests/oauth2/rfc6749/clients/test_web_application.py index e3382c8..719a07d 100644 --- a/tests/oauth2/rfc6749/clients/test_web_application.py +++ b/tests/oauth2/rfc6749/clients/test_web_application.py @@ -2,7 +2,7 @@ import os import warnings -from mock import patch +from unittest.mock import patch from oauthlib import common, signals from oauthlib.oauth2 import (BackendApplicationClient, Client, diff --git a/tests/oauth2/rfc6749/endpoints/test_client_authentication.py b/tests/oauth2/rfc6749/endpoints/test_client_authentication.py index 48b5485..69cb7ee 100644 --- a/tests/oauth2/rfc6749/endpoints/test_client_authentication.py +++ b/tests/oauth2/rfc6749/endpoints/test_client_authentication.py @@ -11,7 +11,7 @@ prevents this check from being circumvented with a client form parameter. """ import json -import mock +from unittest import mock from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, MobileApplicationServer, RequestValidator, diff --git a/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py b/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py index bda71f7..9a76da9 100644 --- a/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py +++ b/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py @@ -5,7 +5,7 @@ uri and the Implicit Grant will need to preserve state. """ import json -import mock +from unittest import mock from oauthlib.oauth2 import (MobileApplicationServer, RequestValidator, WebApplicationServer) diff --git a/tests/oauth2/rfc6749/endpoints/test_error_responses.py b/tests/oauth2/rfc6749/endpoints/test_error_responses.py index cdf2b63..aac66df 100644 --- a/tests/oauth2/rfc6749/endpoints/test_error_responses.py +++ b/tests/oauth2/rfc6749/endpoints/test_error_responses.py @@ -2,7 +2,7 @@ """ import json -import mock +from unittest import mock from oauthlib.common import urlencode from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, diff --git a/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py b/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py index 6895dcd..936a129 100644 --- a/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py +++ b/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py @@ -1,6 +1,6 @@ """Ensure extra credentials can be supplied for inclusion in tokens. """ -import mock +from unittest import mock from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, MobileApplicationServer, RequestValidator, diff --git a/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py index 0942d96..3c67673 100644 --- a/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py +++ b/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from json import loads -from mock import MagicMock +from unittest.mock import MagicMock from oauthlib.common import urlencode from oauthlib.oauth2 import RequestValidator, IntrospectEndpoint diff --git a/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py b/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py index 9e9d836..6280cac 100644 --- a/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py +++ b/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py @@ -2,7 +2,7 @@ """ import json -import mock +from unittest import mock from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, MobileApplicationServer, RequestValidator, diff --git a/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py b/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py index 0e3b2e1..6bfba9a 100644 --- a/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py +++ b/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from json import loads -from mock import MagicMock +from unittest.mock import MagicMock from oauthlib.common import urlencode from oauthlib.oauth2 import RequestValidator, RevocationEndpoint diff --git a/tests/oauth2/rfc6749/endpoints/test_scope_handling.py b/tests/oauth2/rfc6749/endpoints/test_scope_handling.py index 65e0e3c..0bf760b 100644 --- a/tests/oauth2/rfc6749/endpoints/test_scope_handling.py +++ b/tests/oauth2/rfc6749/endpoints/test_scope_handling.py @@ -5,7 +5,7 @@ need to be persisted temporarily in an authorization code. """ import json -import mock +from unittest import mock from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, MobileApplicationServer, RequestValidator, Server, diff --git a/tests/oauth2/rfc6749/grant_types/test_authorization_code.py b/tests/oauth2/rfc6749/grant_types/test_authorization_code.py index 4ed9086..a9e384f 100644 --- a/tests/oauth2/rfc6749/grant_types/test_authorization_code.py +++ b/tests/oauth2/rfc6749/grant_types/test_authorization_code.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749 import errors diff --git a/tests/oauth2/rfc6749/grant_types/test_client_credentials.py b/tests/oauth2/rfc6749/grant_types/test_client_credentials.py index d994278..0a45ef6 100644 --- a/tests/oauth2/rfc6749/grant_types/test_client_credentials.py +++ b/tests/oauth2/rfc6749/grant_types/test_client_credentials.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant diff --git a/tests/oauth2/rfc6749/grant_types/test_implicit.py b/tests/oauth2/rfc6749/grant_types/test_implicit.py index ffd766a..4a0313d 100644 --- a/tests/oauth2/rfc6749/grant_types/test_implicit.py +++ b/tests/oauth2/rfc6749/grant_types/test_implicit.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant diff --git a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py index 074f359..0d0fd37 100644 --- a/tests/oauth2/rfc6749/grant_types/test_refresh_token.py +++ b/tests/oauth2/rfc6749/grant_types/test_refresh_token.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749 import errors 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 4e93015..42f0aa6 100644 --- a/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py +++ b/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749 import errors diff --git a/tests/oauth2/rfc6749/test_parameters.py b/tests/oauth2/rfc6749/test_parameters.py index e9b3621..4380447 100644 --- a/tests/oauth2/rfc6749/test_parameters.py +++ b/tests/oauth2/rfc6749/test_parameters.py @@ -1,4 +1,4 @@ -from mock import patch +from unittest.mock import patch from oauthlib import signals from oauthlib.oauth2.rfc6749.errors import * diff --git a/tests/oauth2/rfc6749/test_server.py b/tests/oauth2/rfc6749/test_server.py index 9288e49..e6ad5cd 100644 --- a/tests/oauth2/rfc6749/test_server.py +++ b/tests/oauth2/rfc6749/test_server.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib import common from oauthlib.oauth2.rfc6749 import errors, tokens diff --git a/tests/oauth2/rfc6749/test_tokens.py b/tests/oauth2/rfc6749/test_tokens.py index 61a23cb..8402133 100644 --- a/tests/oauth2/rfc6749/test_tokens.py +++ b/tests/oauth2/rfc6749/test_tokens.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749.tokens import ( diff --git a/tests/openid/connect/core/endpoints/test_claims_handling.py b/tests/openid/connect/core/endpoints/test_claims_handling.py index 943210c..1fe86ef 100644 --- a/tests/openid/connect/core/endpoints/test_claims_handling.py +++ b/tests/openid/connect/core/endpoints/test_claims_handling.py @@ -6,7 +6,7 @@ The claims parameter is an optional query param for the Authorization Request en request the claims should be transferred (via the oauthlib request) to be persisted with the Access Token when it is created. """ -import mock +from unittest import mock from oauthlib.openid import RequestValidator from oauthlib.openid.connect.core.endpoints.pre_configured import Server 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 26ff46b..98482e2 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 @@ -1,4 +1,4 @@ -import mock +from unittest import mock from oauthlib.oauth2 import InvalidRequestError from oauthlib.oauth2.rfc6749.endpoints.authorization import \ diff --git a/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py b/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py index 9edc970..dd48bdd 100644 --- a/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py +++ b/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock import json from oauthlib.openid import RequestValidator 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 b6bb99c..829af92 100644 --- a/tests/openid/connect/core/grant_types/test_authorization_code.py +++ b/tests/openid/connect/core/grant_types/test_authorization_code.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749.tokens import BearerToken diff --git a/tests/openid/connect/core/grant_types/test_base.py b/tests/openid/connect/core/grant_types/test_base.py index d506b7e..786b24b 100644 --- a/tests/openid/connect/core/grant_types/test_base.py +++ b/tests/openid/connect/core/grant_types/test_base.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock import time from oauthlib.common import Request diff --git a/tests/openid/connect/core/grant_types/test_dispatchers.py b/tests/openid/connect/core/grant_types/test_dispatchers.py index 2fc4ae6..d423915 100644 --- a/tests/openid/connect/core/grant_types/test_dispatchers.py +++ b/tests/openid/connect/core/grant_types/test_dispatchers.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock from oauthlib.common import Request diff --git a/tests/openid/connect/core/grant_types/test_hybrid.py b/tests/openid/connect/core/grant_types/test_hybrid.py index 3347031..53175df 100644 --- a/tests/openid/connect/core/grant_types/test_hybrid.py +++ b/tests/openid/connect/core/grant_types/test_hybrid.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock from oauthlib.oauth2.rfc6749 import errors from oauthlib.oauth2.rfc6749.tokens import BearerToken diff --git a/tests/openid/connect/core/grant_types/test_implicit.py b/tests/openid/connect/core/grant_types/test_implicit.py index c8fefd4..b914eb6 100644 --- a/tests/openid/connect/core/grant_types/test_implicit.py +++ b/tests/openid/connect/core/grant_types/test_implicit.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import mock +from unittest import mock from oauthlib.common import Request from oauthlib.oauth2.rfc6749 import errors diff --git a/tests/openid/connect/core/test_server.py b/tests/openid/connect/core/test_server.py index 681748f..bb3cc3c 100644 --- a/tests/openid/connect/core/test_server.py +++ b/tests/openid/connect/core/test_server.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import json -import mock +from unittest import mock from oauthlib.oauth2.rfc6749 import errors from oauthlib.oauth2.rfc6749.endpoints.authorization import AuthorizationEndpoint diff --git a/tests/openid/connect/core/test_tokens.py b/tests/openid/connect/core/test_tokens.py index f1a6688..5889df5 100644 --- a/tests/openid/connect/core/test_tokens.py +++ b/tests/openid/connect/core/test_tokens.py @@ -1,4 +1,4 @@ -import mock +from unittest import mock from oauthlib.openid.connect.core.tokens import JWTToken -- cgit v1.2.1