diff options
| author | Jonathan Huot <jonathan.huot@thomsonreuters.com> | 2019-03-05 10:24:17 +0100 |
|---|---|---|
| committer | Jonathan Huot <jonathan.huot@thomsonreuters.com> | 2019-03-05 10:24:17 +0100 |
| commit | 55b152c89879e0165ffc97039bf963905c27812d (patch) | |
| tree | 90a838a038bb33688cfc158877bea1a9325b0303 | |
| parent | 84cd5a4265c2670af5a4b7ad2143c47fa68582c1 (diff) | |
| parent | ff108214eeb8c5f996cff90b469344cfd8a9f5a7 (diff) | |
| download | oauthlib-55b152c89879e0165ffc97039bf963905c27812d.tar.gz | |
Merge branch 'master' into oidc-hashes
| -rw-r--r-- | oauthlib/common.py | 2 | ||||
| -rw-r--r-- | tests/openid/connect/core/endpoints/test_claims_handling.py | 2 | ||||
| -rw-r--r-- | tests/openid/connect/core/test_request_validator.py | 2 | ||||
| -rw-r--r-- | tests/openid/connect/core/test_tokens.py | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/oauthlib/common.py b/oauthlib/common.py index 970d7a5..96de1f1 100644 --- a/oauthlib/common.py +++ b/oauthlib/common.py @@ -172,7 +172,7 @@ def extract_params(raw): empty list of parameters. Any other input will result in a return value of None. """ - if isinstance(raw, bytes) or isinstance(raw, unicode_type): + if isinstance(raw, (bytes, unicode_type)): try: params = urldecode(raw) except ValueError: diff --git a/tests/openid/connect/core/endpoints/test_claims_handling.py b/tests/openid/connect/core/endpoints/test_claims_handling.py index 270ef69..5f39d96 100644 --- a/tests/openid/connect/core/endpoints/test_claims_handling.py +++ b/tests/openid/connect/core/endpoints/test_claims_handling.py @@ -10,7 +10,7 @@ from __future__ import absolute_import, unicode_literals import mock -from oauthlib.oauth2 import RequestValidator +from oauthlib.openid import RequestValidator from oauthlib.openid.connect.core.endpoints.pre_configured import Server from tests.unittest import TestCase diff --git a/tests/openid/connect/core/test_request_validator.py b/tests/openid/connect/core/test_request_validator.py index 1e71fb1..e20e88f 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 __future__ import absolute_import, unicode_literals -from oauthlib.openid.connect.core.request_validator import RequestValidator +from oauthlib.openid import RequestValidator from tests.unittest import TestCase diff --git a/tests/openid/connect/core/test_tokens.py b/tests/openid/connect/core/test_tokens.py index 1fcfb51..fde89d6 100644 --- a/tests/openid/connect/core/test_tokens.py +++ b/tests/openid/connect/core/test_tokens.py @@ -42,7 +42,7 @@ class JWTTokenTestCase(TestCase): """ request_mock = mock.MagicMock() - with mock.patch('oauthlib.oauth2.rfc6749.request_validator.RequestValidator', + with mock.patch('oauthlib.openid.RequestValidator', autospec=True) as RequestValidatorMock: request_validator = RequestValidatorMock() @@ -58,7 +58,7 @@ class JWTTokenTestCase(TestCase): """ with mock.patch('oauthlib.common.Request', autospec=True) as RequestMock, \ - mock.patch('oauthlib.oauth2.rfc6749.request_validator.RequestValidator', + mock.patch('oauthlib.openid.RequestValidator', autospec=True) as RequestValidatorMock: request_validator_mock = RequestValidatorMock() @@ -84,7 +84,7 @@ class JWTTokenTestCase(TestCase): """ with mock.patch('oauthlib.common.Request', autospec=True) as RequestMock, \ - mock.patch('oauthlib.oauth2.rfc6749.request_validator.RequestValidator', + mock.patch('oauthlib.openid.RequestValidator', autospec=True) as RequestValidatorMock: request_validator_mock = RequestValidatorMock() |