--- /dev/null
+--- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_access_token.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_access_token.py 2021-01-19 22:40:03.003939701 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-from mock import ANY, MagicMock
++try:
++ from mock import ANY, MagicMock
++except ImportError:
++ from unittest.mock import ANY, MagicMock
+
+ from oauthlib.oauth1 import RequestValidator
+ from oauthlib.oauth1.rfc5849 import Client
+--- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_authorization.py.orig 2021-01-19 22:40:27.960471167 +0100
++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_authorization.py 2021-01-19 22:40:30.890455294 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-from mock import MagicMock
++try:
++ from mock import MagicMock
++except ImportError:
++ from unittest.mock import MagicMock
+
+ from oauthlib.oauth1 import RequestValidator
+ from oauthlib.oauth1.rfc5849 import errors
+--- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_base.py.orig 2021-01-19 22:40:51.857008375 +0100
++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_base.py 2021-01-19 22:40:54.676993098 +0100
+@@ -2,7 +2,10 @@
+
+ from re import sub
+
+-from mock import MagicMock
++try:
++ from mock import MagicMock
++except ImportError:
++ from unittest.mock import MagicMock
+
+ from oauthlib.common import CaseInsensitiveDict, safe_string_equals
+ from oauthlib.oauth1 import Client, RequestValidator
+--- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_request_token.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_request_token.py 2021-01-19 22:41:10.330241630 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-from mock import ANY, MagicMock
++try:
++ from mock import ANY, MagicMock
++except ImportError:
++ from unittest.mock import ANY, MagicMock
+
+ from oauthlib.oauth1 import RequestValidator
+ from oauthlib.oauth1.rfc5849 import Client
+--- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_resource.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_resource.py 2021-01-19 22:41:22.446842656 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-from mock import ANY, MagicMock
++try:
++ from mock import ANY, MagicMock
++except ImportError:
++ from unittest.mock import ANY, MagicMock
+
+ from oauthlib.oauth1 import RequestValidator
+ from oauthlib.oauth1.rfc5849 import Client
+--- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_signature_only.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_signature_only.py 2021-01-19 22:41:31.180128677 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-from mock import ANY, MagicMock
++try:
++ from mock import ANY, MagicMock
++except ImportError:
++ from unittest.mock import ANY, MagicMock
+
+ from oauthlib.oauth1 import RequestValidator
+ from oauthlib.oauth1.rfc5849 import Client
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/test_parameters.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_parameters.py 2021-01-19 22:42:03.646619457 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-from mock import patch
++try:
++ from mock import patch
++except ImportError:
++ from unittest.mock import patch
+
+ from oauthlib import signals
+ from oauthlib.oauth2.rfc6749.errors import *
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/test_server.py.orig 2021-01-19 22:42:27.483156991 +0100
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_server.py 2021-01-19 22:42:30.473140792 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib import common
+ from oauthlib.oauth2.rfc6749 import errors, tokens
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/test_tokens.py.orig 2021-01-19 22:42:40.903084289 +0100
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_tokens.py 2021-01-19 22:42:43.576403139 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749.tokens import (
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_backend_application.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_backend_application.py 2021-01-19 22:43:18.329548199 +0100
+@@ -3,7 +3,10 @@
+
+ import os
+
+-from mock import patch
++try:
++ from mock import patch
++except ImportError:
++ from unittest.mock import patch
+
+ from oauthlib import signals
+ from oauthlib.oauth2 import BackendApplicationClient
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_legacy_application.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_legacy_application.py 2021-01-19 22:43:29.019490286 +0100
+@@ -3,7 +3,10 @@
+
+ import os
+
+-from mock import patch
++try:
++ from mock import patch
++except ImportError:
++ from unittest.mock import patch
+
+ from oauthlib import signals
+ from oauthlib.oauth2 import LegacyApplicationClient
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_mobile_application.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_mobile_application.py 2021-01-19 22:43:40.542761193 +0100
+@@ -3,7 +3,10 @@
+
+ import os
+
+-from mock import patch
++try:
++ from mock import patch
++except ImportError:
++ from unittest.mock import patch
+
+ from oauthlib import signals
+ from oauthlib.oauth2 import MobileApplicationClient
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_service_application.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_service_application.py 2021-01-19 22:43:53.589357180 +0100
+@@ -5,7 +5,10 @@
+ from time import time
+
+ import jwt
+-from mock import patch
++try:
++ from mock import patch
++except ImportError:
++ from unittest.mock import patch
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2 import ServiceApplicationClient
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_web_application.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_web_application.py 2021-01-19 22:44:01.972645097 +0100
+@@ -5,7 +5,10 @@
+ import os
+ import warnings
+
+-from mock import patch
++try:
++ from mock import patch
++except ImportError:
++ from unittest.mock import patch
+
+ from oauthlib import common, signals
+ from oauthlib.oauth2 import (BackendApplicationClient, Client,
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_client_authentication.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_client_authentication.py 2021-01-19 22:44:33.512474231 +0100
+@@ -13,7 +13,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+ MobileApplicationServer, RequestValidator,
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py 2021-01-19 22:44:44.342415560 +0100
+@@ -7,7 +7,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2 import (MobileApplicationServer, RequestValidator,
+ WebApplicationServer)
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_error_responses.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_error_responses.py 2021-01-19 22:44:51.862374821 +0100
+@@ -4,7 +4,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import urlencode
+ from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py 2021-01-19 22:44:58.605671623 +0100
+@@ -2,7 +2,10 @@
+ """
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+ MobileApplicationServer, RequestValidator,
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py 2021-01-20 06:29:03.418156665 +0100
+@@ -3,7 +3,10 @@
+
+ from json import loads
+
+-from mock import MagicMock
++try:
++ from mock import MagicMock
++except ImportError:
++ from unittest.mock import MagicMock
+
+ from oauthlib.common import urlencode
+ from oauthlib.oauth2 import RequestValidator, IntrospectEndpoint
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py 2021-01-20 06:29:27.541359312 +0100
+@@ -4,7 +4,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+ MobileApplicationServer, RequestValidator,
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py 2021-01-20 06:29:59.414519974 +0100
+@@ -3,7 +3,10 @@
+
+ from json import loads
+
+-from mock import MagicMock
++try:
++ from mock import MagicMock
++except ImportError:
++ from unittest.mock import MagicMock
+
+ from oauthlib.common import urlencode
+ from oauthlib.oauth2 import RequestValidator, RevocationEndpoint
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_scope_handling.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_scope_handling.py 2021-01-20 06:30:23.811054473 +0100
+@@ -7,7 +7,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer,
+ MobileApplicationServer, RequestValidator, Server,
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_authorization_code.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_authorization_code.py 2021-01-20 06:30:47.664258582 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749 import errors
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_client_credentials.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_client_credentials.py 2021-01-20 06:30:56.990874722 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_implicit.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_implicit.py 2021-01-20 06:31:14.254114533 +0100
+@@ -1,7 +1,10 @@
+ # -*- coding: utf-8 -*-
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_refresh_token.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_refresh_token.py 2021-01-20 06:31:22.744068539 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749 import errors
+--- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py 2021-01-20 06:31:30.267361115 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749 import errors
+--- oauthlib-3.1.0/tests/openid/connect/core/test_server.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/test_server.py 2021-01-20 06:32:04.097177843 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2.rfc6749 import errors
+ from oauthlib.oauth2.rfc6749.endpoints.authorization import AuthorizationEndpoint
+--- oauthlib-3.1.0/tests/openid/connect/core/test_tokens.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/test_tokens.py 2021-01-20 06:32:14.287122640 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.openid.connect.core.tokens import JWTToken
+
+--- oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_claims_handling.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_claims_handling.py 2021-01-20 06:32:35.520340943 +0100
+@@ -8,7 +8,10 @@
+ """
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.openid import RequestValidator
+ from oauthlib.openid.connect.core.endpoints.pre_configured import Server
+--- oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py 2021-01-20 06:32:41.513641807 +0100
+@@ -1,6 +1,9 @@
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2 import InvalidRequestError
+ from oauthlib.oauth2.rfc6749.endpoints.authorization import \
+--- oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py 2021-01-20 06:32:50.640259031 +0100
+@@ -1,7 +1,10 @@
+ # -*- coding: utf-8 -*-
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+ import json
+
+ from oauthlib.openid import RequestValidator
+--- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_authorization_code.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_authorization_code.py 2021-01-20 06:33:04.566850251 +0100
+@@ -3,7 +3,10 @@
+
+ import json
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749.tokens import BearerToken
+--- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_base.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_base.py 2021-01-20 06:33:09.870154854 +0100
+@@ -1,5 +1,8 @@
+ # -*- coding: utf-8 -*-
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+ import time
+
+ from oauthlib.common import Request
+--- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_dispatchers.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_dispatchers.py 2021-01-20 06:33:17.646779391 +0100
+@@ -1,6 +1,9 @@
+ # -*- coding: utf-8 -*-
+ from __future__ import absolute_import, unicode_literals
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+
+--- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_hybrid.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_hybrid.py 2021-01-20 06:33:28.630053223 +0100
+@@ -1,7 +1,10 @@
+ # -*- coding: utf-8 -*-
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.oauth2.rfc6749 import errors
+ from oauthlib.oauth2.rfc6749.tokens import BearerToken
+--- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_implicit.py.orig 2019-08-06 16:49:50.000000000 +0200
++++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_implicit.py 2021-01-20 06:33:34.116690166 +0100
+@@ -1,7 +1,10 @@
+ # -*- coding: utf-8 -*-
+ from __future__ import absolute_import, unicode_literals
+
+-import mock
++try:
++ import mock
++except ImportError:
++ from unittest import mock
+
+ from oauthlib.common import Request
+ from oauthlib.oauth2.rfc6749 import errors
projects / packages / python-oauthlib.git / blobdiff