Merge branch 'master' into oidc-hashes

JonathanHuot · JonathanHuot · commit 55b152c89879 · 2019-03-05T10:24:17.000+01:00
diff --git 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
@@ -10,7 +10,7 @@
 
 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
@@ -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
@@ -42,7 +42,7 @@ def test_create_token_calls_get_id_token(self):
         """
         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 @@ def test_validate_request_token_from_headers(self):
         """
 
         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 @@ def test_validate_token_from_request(self):
         """
 
         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()
 
