Fix mypy errors with no_implicit_optional=True (#832)

* Try fixing mypy errors with no_implicit_optional=True

* Update CHANGELOG.md

Author: schlenk

CHANGELOG.md

@@ -10,6 +10,7 @@ The format is based on the [KeepAChangeLog] project.
 ### Changed
 - [#827] Added support for python 3.11
 - [#830], [#831] Allow null and empty values in UserInfo responses, but filter them out. 
+- [#832] Added support for mypy with --no_implicit_optional=True
 
 ### Fixed
 - [#826], [#829] Fixed RP-Initiated Logout To Accept id_token_hint
@@ -19,11 +20,12 @@ The format is based on the [KeepAChangeLog] project.
 - [#820] Removed Client.grant_from_state method.
 
 [#820]: https://github.com/OpenIDC/pyoidc/pull/820
-[#827]: https://github.com/OpenIDC/pyoidc/issues/827
 [#826]: https://github.com/OpenIDC/pyoidc/issues/826
+[#827]: https://github.com/OpenIDC/pyoidc/issues/827
 [#829]: https://github.com/OpenIDC/pyoidc/pull/829
 [#830]: https://github.com/OpenIDC/pyoidc/issues/830
 [#831]: https://github.com/OpenIDC/pyoidc/pull/831
+[#832]: https://github.com/OpenIDC/pyoidc/pull/832
 
 ## 1.4.0 [2022-05-23]
 

mypy.ini

@@ -1,6 +1,6 @@
 [mypy]
 check_untyped_defs = True
-no_implicit_optional = False
+no_implicit_optional = True
 
 [mypy-jwkest.*]
 ignore_missing_imports = True

src/oic/oauth2/__init__.py

@@ -179,7 +179,7 @@ def __init__(
         client_cert=None,
         timeout=None,
         message_factory: Type[MessageFactory] = OauthMessageFactory,
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         """
         Initialize the instance.
@@ -414,7 +414,7 @@ def construct_Message(
 
     def construct_AuthorizationRequest(
         self,
-        request: Type[AuthorizationRequest] = None,
+        request: Optional[Type[AuthorizationRequest]] = None,
         request_args=None,
         extra_args=None,
         **kwargs,
@@ -441,11 +441,13 @@ def construct_AuthorizationRequest(
 
     def construct_AccessTokenRequest(
         self,
-        request: Union[
-            Type[AccessTokenRequest],
-            Type[ROPCAccessTokenRequest],
-            Type[CCAccessTokenRequest],
-            Type[ExtensionTokenRequest],
+        request: Optional[
+            Union[
+                Type[AccessTokenRequest],
+                Type[ROPCAccessTokenRequest],
+                Type[CCAccessTokenRequest],
+                Type[ExtensionTokenRequest],
+            ]
         ] = None,
         request_args=None,
         extra_args=None,
@@ -490,7 +492,7 @@ def construct_AccessTokenRequest(
 
     def construct_RefreshAccessTokenRequest(
         self,
-        request: Type[RefreshAccessTokenRequest] = None,
+        request: Optional[Type[RefreshAccessTokenRequest]] = None,
         request_args=None,
         extra_args=None,
         **kwargs,
@@ -514,7 +516,7 @@ def construct_RefreshAccessTokenRequest(
 
     def construct_ResourceRequest(
         self,
-        request: Type[ResourceRequest] = None,
+        request: Optional[Type[ResourceRequest]] = None,
         request_args=None,
         extra_args=None,
         **kwargs,
@@ -736,8 +738,8 @@ def init_authentication_method(
     def parse_request_response(
         self,
         reqresp: requests.Response,
-        response: Type[Message] = None,
-        body_type: ENCODINGS = None,
+        response: Optional[Type[Message]] = None,
+        body_type: Optional[ENCODINGS] = None,
         state="",
         **kwargs,
     ) -> Union[Message, requests.Response]:
@@ -800,7 +802,7 @@ def parse_request_response(
     def request_and_return(
         self,
         url: str,
-        response: Type[Message] = None,
+        response: Optional[Type[Message]] = None,
         method="GET",
         body=None,
         body_type: ENCODINGS = "json",
@@ -1006,7 +1008,7 @@ def do_any(
         request_args=None,
         extra_args=None,
         http_args=None,
-        response: Type[Message] = None,
+        response: Optional[Type[Message]] = None,
         authn_method="",
     ) -> Message:
 
@@ -1186,12 +1188,12 @@ class Server(PBase):
 
     def __init__(
         self,
-        verify_ssl: bool = None,
-        keyjar: KeyJar = None,
-        client_cert: Union[str, Tuple[str, str]] = None,
-        timeout: float = None,
+        verify_ssl: Optional[bool] = None,
+        keyjar: Optional[KeyJar] = None,
+        client_cert: Optional[Union[str, Tuple[str, str]]] = None,
+        timeout: Optional[float] = None,
         message_factory: Type[MessageFactory] = OauthMessageFactory,
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         """
         Initialize the server.
@@ -1240,7 +1242,7 @@ def parse_url_request(request, url=None, query=None):
         return req
 
     def parse_authorization_request(
-        self, url: str = None, query: dict = None
+        self, url: Optional[str] = None, query: Optional[dict] = None
     ) -> AuthorizationRequest:
         request = self.message_factory.get_request_type("authorization_endpoint")
         return self.parse_url_request(request, url, query)
@@ -1249,7 +1251,7 @@ def parse_jwt_request(
         self,
         request: Type[Message] = AuthorizationRequest,
         txt: str = "",
-        keyjar: KeyJar = None,
+        keyjar: Optional[KeyJar] = None,
         verify: bool = True,
         **kwargs,
     ) -> Message:
@@ -1263,18 +1265,18 @@ def parse_jwt_request(
         return areq
 
     def parse_body_request(
-        self, request: Type[Message] = AccessTokenRequest, body: str = None
+        self, request: Type[Message] = AccessTokenRequest, body: Optional[str] = None
     ):
         req = request().deserialize(body, "urlencoded")
         req.verify()
         return req
 
-    def parse_token_request(self, body: str = None) -> AccessTokenRequest:
+    def parse_token_request(self, body: Optional[str] = None) -> AccessTokenRequest:
         request = self.message_factory.get_request_type("token_endpoint")
         return self.parse_body_request(request, body)
 
     def parse_refresh_token_request(
-        self, body: str = None
+        self, body: Optional[str] = None
     ) -> RefreshAccessTokenRequest:
         request = self.message_factory.get_request_type("refresh_endpoint")
         return self.parse_body_request(request, body)

src/oic/oauth2/base.py

@@ -4,6 +4,7 @@
 from http import cookiejar as cookielib
 from http.cookies import CookieError
 from http.cookies import SimpleCookie
+from typing import Optional
 from typing import cast
 
 import requests
@@ -28,7 +29,7 @@ def __init__(
         keyjar=None,
         client_cert=None,
         timeout=None,
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         """
         Initialize the instance.

src/oic/oauth2/provider.py

@@ -204,7 +204,7 @@ def __init__(
         message_factory=OauthMessageFactory,
         capabilities=None,
         jwks_uri="",
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         self.settings = settings or OauthProviderSettings()
         if verify_ssl is not None:

src/oic/oic/__init__.py

@@ -338,7 +338,7 @@ def __init__(
         client_cert=None,
         requests_dir="requests",
         message_factory: Type[MessageFactory] = OIDCMessageFactory,
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         """
         Initialize the instance.
@@ -1527,12 +1527,12 @@ class Server(oauth2.Server):
 
     def __init__(
         self,
-        verify_ssl: bool = None,
-        keyjar: KeyJar = None,
-        client_cert: Union[str, Tuple[str, str]] = None,
-        timeout: float = None,
+        verify_ssl: Optional[bool] = None,
+        keyjar: Optional[KeyJar] = None,
+        client_cert: Optional[Union[str, Tuple[str, str]]] = None,
+        timeout: Optional[float] = None,
         message_factory: Type[MessageFactory] = OIDCMessageFactory,
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         """Initialize the server."""
         self.settings = settings or OicServerSettings()

src/oic/oic/provider.py

@@ -253,7 +253,7 @@ def __init__(
         post_logout_page=None,
         self_signing_alg="RS256",
         logout_path="",
-        settings: PyoidcSettings = None,
+        settings: Optional[PyoidcSettings] = None,
     ):
         self.settings = settings or OicProviderSettings()
         if verify_ssl is not None: