Cleaned up some more bits.

Author: rohe

src/idpyoidc/client/oauth2/__init__.py

@@ -229,12 +229,12 @@ def parse_request_response(self, service, reqresp, response_body_type='',
 
             try:
                 err_resp = service.parse_response(reqresp.text, _deser_method)
-            except FormatError:
+            except (FormatError, ValueError):
                 if _deser_method != response_body_type:
                     try:
                         err_resp = service.parse_response(reqresp.text,
                                                           response_body_type)
-                    except (OidcServiceError, FormatError):
+                    except (OidcServiceError, FormatError, ValueError):
                         raise OidcServiceError("HTTP ERROR: %s [%s] on %s" % (
                             reqresp.text, reqresp.status_code, reqresp.url))
                 else:

src/idpyoidc/client/service.py

@@ -501,7 +501,7 @@ def _do_response(self, info, sformat, **kwargs):
                     raise
 
             if resp is None:
-                raise TypeError(f'Incorrect message type: {sformat}')
+                raise ValueError(f'Incorrect message type: {sformat}')
         return resp
 
     def parse_response(self, info,

tests/test_client_04_service.py

@@ -112,7 +112,7 @@ def test_parse_response_err(self):
         _sign_key = self.service_context.keyjar.get_signing_key()
         resp1 = AuthorizationResponse(code="auth_grant", state="state").to_jwt(key=_sign_key,
                                                                                algorithm="RS256")
-        with pytest.raises(FormatError):
+        with pytest.raises(ValueError):
             arg = self.service.parse_response(resp1)