From dc1720eef33a61a29b4f172943a72d642629df03ecb3d114e16192f89a9c14d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 29 Apr 2020 12:29:07 +0000 Subject: [PATCH] Accepting request 798900 from home:glaubitz:branches:devel:languages:python - Add patch to switch from external mock to unittest.mock + o_switch_to_unitest_mock.patch OBS-URL: https://build.opensuse.org/request/show/798900 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-oauthlib?expand=0&rev=46 --- o_switch_to_unitest_mock.patch | 432 +++++++++++++++++++++++++++++++++ python-oauthlib.changes | 6 + python-oauthlib.spec | 5 +- 3 files changed, 441 insertions(+), 2 deletions(-) create mode 100644 o_switch_to_unitest_mock.patch diff --git a/o_switch_to_unitest_mock.patch b/o_switch_to_unitest_mock.patch new file mode 100644 index 0000000..da830fa --- /dev/null +++ b/o_switch_to_unitest_mock.patch @@ -0,0 +1,432 @@ +diff -Nru oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_access_token.py oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_access_token.py +--- oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_access_token.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_access_token.py 2020-04-29 14:14:19.155418175 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-from mock import ANY, MagicMock ++from unittest.mock import ANY, MagicMock + + from oauthlib.oauth1 import RequestValidator + from oauthlib.oauth1.rfc5849 import Client +diff -Nru oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_authorization.py oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_authorization.py +--- oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_authorization.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_authorization.py 2020-04-29 14:14:19.147418149 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-from mock import MagicMock ++from unittest.mock import MagicMock + + from oauthlib.oauth1 import RequestValidator + from oauthlib.oauth1.rfc5849 import errors +diff -Nru oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_base.py oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_base.py +--- oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_base.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_base.py 2020-04-29 14:14:19.151418163 +0200 +@@ -2,7 +2,7 @@ + + 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 -Nru oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_request_token.py oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_request_token.py +--- oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_request_token.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_request_token.py 2020-04-29 14:14:19.151418163 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-from mock import ANY, MagicMock ++from unittest.mock import ANY, MagicMock + + from oauthlib.oauth1 import RequestValidator + from oauthlib.oauth1.rfc5849 import Client +diff -Nru oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_resource.py oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_resource.py +--- oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_resource.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_resource.py 2020-04-29 14:14:19.151418163 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-from mock import ANY, MagicMock ++from unittest.mock import ANY, MagicMock + + from oauthlib.oauth1 import RequestValidator + from oauthlib.oauth1.rfc5849 import Client +diff -Nru oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_signature_only.py oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_signature_only.py +--- oauthlib-3.1.0.orig/tests/oauth1/rfc5849/endpoints/test_signature_only.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_signature_only.py 2020-04-29 14:14:19.151418163 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-from mock import ANY, MagicMock ++from unittest.mock import ANY, MagicMock + + from oauthlib.oauth1 import RequestValidator + from oauthlib.oauth1.rfc5849 import Client +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_backend_application.py oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_backend_application.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_backend_application.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_backend_application.py 2020-04-29 14:14:19.135418111 +0200 +@@ -3,7 +3,7 @@ + + import os + +-from mock import patch ++from unittest.mock import patch + + from oauthlib import signals + from oauthlib.oauth2 import BackendApplicationClient +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_legacy_application.py oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_legacy_application.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_legacy_application.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_legacy_application.py 2020-04-29 14:14:19.131418098 +0200 +@@ -3,7 +3,7 @@ + + import os + +-from mock import patch ++from unittest.mock import patch + + from oauthlib import signals + from oauthlib.oauth2 import LegacyApplicationClient +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_mobile_application.py oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_mobile_application.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_mobile_application.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_mobile_application.py 2020-04-29 14:14:19.135418111 +0200 +@@ -3,7 +3,7 @@ + + import os + +-from mock import patch ++from unittest.mock import patch + + from oauthlib import signals + from oauthlib.oauth2 import MobileApplicationClient +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_service_application.py oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_service_application.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_service_application.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_service_application.py 2020-04-29 14:14:19.131418098 +0200 +@@ -5,7 +5,7 @@ + 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 -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_web_application.py oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_web_application.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/clients/test_web_application.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_web_application.py 2020-04-29 14:14:19.131418098 +0200 +@@ -5,7 +5,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 -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_client_authentication.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_client_authentication.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_client_authentication.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_client_authentication.py 2020-04-29 14:14:19.103418008 +0200 +@@ -13,7 +13,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, + MobileApplicationServer, RequestValidator, +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py 2020-04-29 14:14:19.111418034 +0200 +@@ -7,7 +7,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.oauth2 import (MobileApplicationServer, RequestValidator, + WebApplicationServer) +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_error_responses.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_error_responses.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_error_responses.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_error_responses.py 2020-04-29 14:14:19.115418046 +0200 +@@ -4,7 +4,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.common import urlencode + from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py 2020-04-29 14:14:19.123418072 +0200 +@@ -2,7 +2,7 @@ + """ + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, + MobileApplicationServer, RequestValidator, +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py 2020-04-29 14:14:19.119418060 +0200 +@@ -3,7 +3,7 @@ + + 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 -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py 2020-04-29 14:14:19.107418020 +0200 +@@ -4,7 +4,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, + MobileApplicationServer, RequestValidator, +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py 2020-04-29 14:14:19.111418034 +0200 +@@ -3,7 +3,7 @@ + + 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 -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_scope_handling.py oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_scope_handling.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/endpoints/test_scope_handling.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_scope_handling.py 2020-04-29 14:14:19.119418060 +0200 +@@ -7,7 +7,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, + MobileApplicationServer, RequestValidator, Server, +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_authorization_code.py oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_authorization_code.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_authorization_code.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_authorization_code.py 2020-04-29 14:14:19.139418124 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749 import errors +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_client_credentials.py oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_client_credentials.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_client_credentials.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_client_credentials.py 2020-04-29 14:14:19.143418137 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_implicit.py oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_implicit.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_implicit.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_implicit.py 2020-04-29 14:14:19.143418137 +0200 +@@ -1,7 +1,7 @@ + # -*- coding: utf-8 -*- + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_refresh_token.py oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_refresh_token.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_refresh_token.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_refresh_token.py 2020-04-29 14:14:19.139418124 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749 import errors +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py 2020-04-29 14:14:19.139418124 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749 import errors +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/test_parameters.py oauthlib-3.1.0/tests/oauth2/rfc6749/test_parameters.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/test_parameters.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_parameters.py 2020-04-29 14:14:19.127418085 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-from mock import patch ++from unittest.mock import patch + + from oauthlib import signals + from oauthlib.oauth2.rfc6749.errors import * +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/test_server.py oauthlib-3.1.0/tests/oauth2/rfc6749/test_server.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/test_server.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_server.py 2020-04-29 14:14:19.123418072 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib import common + from oauthlib.oauth2.rfc6749 import errors, tokens +diff -Nru oauthlib-3.1.0.orig/tests/oauth2/rfc6749/test_tokens.py oauthlib-3.1.0/tests/oauth2/rfc6749/test_tokens.py +--- oauthlib-3.1.0.orig/tests/oauth2/rfc6749/test_tokens.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_tokens.py 2020-04-29 14:14:19.127418085 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749.tokens import ( +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/endpoints/test_claims_handling.py oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_claims_handling.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/endpoints/test_claims_handling.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_claims_handling.py 2020-04-29 14:14:19.055417852 +0200 +@@ -8,7 +8,7 @@ + """ + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.openid import RequestValidator + from oauthlib.openid.connect.core.endpoints.pre_configured import Server +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py 2020-04-29 14:14:19.067417890 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.oauth2 import InvalidRequestError + from oauthlib.oauth2.rfc6749.endpoints.authorization import \ +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py 2020-04-29 14:14:19.059417864 +0200 +@@ -1,7 +1,7 @@ + # -*- coding: utf-8 -*- + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + import json + + from oauthlib.openid import RequestValidator +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_authorization_code.py oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_authorization_code.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_authorization_code.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_authorization_code.py 2020-04-29 14:14:19.091417969 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749.tokens import BearerToken +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_base.py oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_base.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_base.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_base.py 2020-04-29 14:14:19.087417955 +0200 +@@ -1,5 +1,5 @@ + # -*- coding: utf-8 -*- +-import mock ++from unittest import mock + import time + + from oauthlib.common import Request +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_dispatchers.py oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_dispatchers.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_dispatchers.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_dispatchers.py 2020-04-29 14:14:19.083417943 +0200 +@@ -1,6 +1,6 @@ + # -*- coding: utf-8 -*- + from __future__ import absolute_import, unicode_literals +-import mock ++from unittest import mock + + from oauthlib.common import Request + +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_hybrid.py oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_hybrid.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_hybrid.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_hybrid.py 2020-04-29 14:14:19.083417943 +0200 +@@ -1,7 +1,7 @@ + # -*- coding: utf-8 -*- + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.oauth2.rfc6749 import errors + from oauthlib.oauth2.rfc6749.tokens import BearerToken +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_implicit.py oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_implicit.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/grant_types/test_implicit.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_implicit.py 2020-04-29 14:14:19.091417969 +0200 +@@ -1,7 +1,7 @@ + # -*- coding: utf-8 -*- + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.common import Request + from oauthlib.oauth2.rfc6749 import errors +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/test_server.py oauthlib-3.1.0/tests/openid/connect/core/test_server.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/test_server.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/test_server.py 2020-04-29 14:14:19.075417916 +0200 +@@ -3,7 +3,7 @@ + + import json + +-import mock ++from unittest import mock + + from oauthlib.oauth2.rfc6749 import errors + from oauthlib.oauth2.rfc6749.endpoints.authorization import AuthorizationEndpoint +diff -Nru oauthlib-3.1.0.orig/tests/openid/connect/core/test_tokens.py oauthlib-3.1.0/tests/openid/connect/core/test_tokens.py +--- oauthlib-3.1.0.orig/tests/openid/connect/core/test_tokens.py 2019-08-06 16:49:50.000000000 +0200 ++++ oauthlib-3.1.0/tests/openid/connect/core/test_tokens.py 2020-04-29 14:14:19.079417930 +0200 +@@ -1,6 +1,6 @@ + from __future__ import absolute_import, unicode_literals + +-import mock ++from unittest import mock + + from oauthlib.openid.connect.core.tokens import JWTToken + diff --git a/python-oauthlib.changes b/python-oauthlib.changes index e28fe82..2517584 100644 --- a/python-oauthlib.changes +++ b/python-oauthlib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 29 12:15:23 UTC 2020 - John Paul Adrian Glaubitz + +- Add patch to switch from external mock to unittest.mock + + o_switch_to_unitest_mock.patch + ------------------------------------------------------------------- Wed Sep 11 11:02:36 UTC 2019 - Tomáš Chvátal diff --git a/python-oauthlib.spec b/python-oauthlib.spec index 0ccb2d9..fcb3e7d 100644 --- a/python-oauthlib.spec +++ b/python-oauthlib.spec @@ -1,7 +1,7 @@ # # spec file for package python-oauthlib # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,10 @@ License: BSD-3-Clause Group: Development/Languages/Python URL: https://github.com/oauthlib/oauthlib Source: https://files.pythonhosted.org/packages/source/o/oauthlib/oauthlib-%{version}.tar.gz +Patch: o_switch_to_unitest_mock.patch BuildRequires: %{python_module PyJWT >= 1.0.0} BuildRequires: %{python_module blinker} BuildRequires: %{python_module cryptography} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pyasn1} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -58,6 +58,7 @@ veneer on top of OAuthLib and get OAuth support for very little effort. %prep %setup -q -n oauthlib-%{version} +%patch0 -p1 %build %python_build