From 22636ed0f6ff45bb88e9d5ef037f3154852057a9b7b02253123af846994fd7ba Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 6 Jun 2021 12:53:31 +0000 Subject: [PATCH 1/2] - update to 3.1.1: * #753: Fix acceptance of valid IPv6 addresses in URI validation * #730: Base OAuth2 Client now has a consistent way of managing the `scope`: it consistently relies on the `scope` provided in the constructor if any, except if overridden temporarily in a method call. Note that in particular providing a non-None `scope` in `prepare_authorization_request` or `prepare_refresh_token` does not override anymore `self.scope` forever, it is just used temporarily. * #726: MobileApplicationClient.prepare_request_uri and MobileApplicationClient.parse_request_uri_response, ServiceApplicationClient.prepare_request_body, and WebApplicationClient.prepare_request_uri now correctly use the default `scope` provided in constructor. * #725: LegacyApplicationClient.prepare_request_body now correctly uses the default `scope` provided in constructor * #711: client_credentials grant: fix log message * #746: OpenID Connect Hybrid - fix nonce not passed to add_id_token * #756: Different prompt values are now handled according to spec (e.g. prompt=none) * #759: OpenID Connect - fix Authorization: Basic parsing * #716: improved skeleton validator for public vs private client * #720: replace mock library with standard unittest.mock * #727: build isort integration * #734: python2 code removal * #735, #750: add python3.8 support * #749: bump minimum versions of pyjwt and cryptography - drop o_switch_to_unitest_mock.patch (upstream) OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-oauthlib?expand=0&rev=52 --- oauthlib-3.1.0.tar.gz | 3 --- oauthlib-3.1.1.tar.gz | 3 +++ python-oauthlib.changes | 27 +++++++++++++++++++++++++++ python-oauthlib.spec | 4 +--- 4 files changed, 31 insertions(+), 6 deletions(-) delete mode 100644 oauthlib-3.1.0.tar.gz create mode 100644 oauthlib-3.1.1.tar.gz diff --git a/oauthlib-3.1.0.tar.gz b/oauthlib-3.1.0.tar.gz deleted file mode 100644 index 4c44818..0000000 --- a/oauthlib-3.1.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bee41cc35fcca6e988463cacc3bcb8a96224f470ca547e697b604cc697b2f889 -size 155362 diff --git a/oauthlib-3.1.1.tar.gz b/oauthlib-3.1.1.tar.gz new file mode 100644 index 0000000..72bd90a --- /dev/null +++ b/oauthlib-3.1.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8f0215fcc533dd8dd1bee6f4c412d4f0cd7297307d43ac61666389e3bc3198a3 +size 161395 diff --git a/python-oauthlib.changes b/python-oauthlib.changes index 2e039ad..45e8070 100644 --- a/python-oauthlib.changes +++ b/python-oauthlib.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sun Jun 6 12:48:39 UTC 2021 - Dirk Müller + +- update to 3.1.1: + * #753: Fix acceptance of valid IPv6 addresses in URI validation + * #730: Base OAuth2 Client now has a consistent way of managing the `scope`: it consistently + relies on the `scope` provided in the constructor if any, except if overridden temporarily + in a method call. Note that in particular providing a non-None `scope` in + `prepare_authorization_request` or `prepare_refresh_token` does not override anymore + `self.scope` forever, it is just used temporarily. + * #726: MobileApplicationClient.prepare_request_uri and MobileApplicationClient.parse_request_uri_response, + ServiceApplicationClient.prepare_request_body, + and WebApplicationClient.prepare_request_uri now correctly use the default `scope` provided in + constructor. + * #725: LegacyApplicationClient.prepare_request_body now correctly uses the default `scope` provided in constructor + * #711: client_credentials grant: fix log message + * #746: OpenID Connect Hybrid - fix nonce not passed to add_id_token + * #756: Different prompt values are now handled according to spec (e.g. prompt=none) + * #759: OpenID Connect - fix Authorization: Basic parsing + * #716: improved skeleton validator for public vs private client + * #720: replace mock library with standard unittest.mock + * #727: build isort integration + * #734: python2 code removal + * #735, #750: add python3.8 support + * #749: bump minimum versions of pyjwt and cryptography +- drop o_switch_to_unitest_mock.patch (upstream) + ------------------------------------------------------------------- Tue May 25 11:02:47 UTC 2021 - pgajdos@suse.com diff --git a/python-oauthlib.spec b/python-oauthlib.spec index 88dd562..17f6247 100644 --- a/python-oauthlib.spec +++ b/python-oauthlib.spec @@ -19,14 +19,13 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 Name: python-oauthlib -Version: 3.1.0 +Version: 3.1.1 Release: 0 Summary: A Generic Implementation of the OAuth Request-Signing Logic 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 -Patch0: o_switch_to_unitest_mock.patch BuildRequires: %{python_module PyJWT >= 1.0.0} BuildRequires: %{python_module blinker} BuildRequires: %{python_module cryptography} @@ -59,7 +58,6 @@ veneer on top of OAuthLib and get OAuth support for very little effort. %prep %setup -q -n oauthlib-%{version} -%patch0 -p1 %build %python_build From c66a92c59f6ab645616b413060583f7cec7ea563e7d311f49a4970caaaac4585 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 6 Jun 2021 19:29:20 +0000 Subject: [PATCH 2/2] Actually remove o_switch_to_unitest_mock.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-oauthlib?expand=0&rev=53 --- o_switch_to_unitest_mock.patch | 432 --------------------------------- 1 file changed, 432 deletions(-) delete mode 100644 o_switch_to_unitest_mock.patch diff --git a/o_switch_to_unitest_mock.patch b/o_switch_to_unitest_mock.patch deleted file mode 100644 index da830fa..0000000 --- a/o_switch_to_unitest_mock.patch +++ /dev/null @@ -1,432 +0,0 @@ -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 -