[py]: fix alot of mypy complaints

symonk · symonk · commit e12972ec0fc0 · 2022-08-21T17:11:17.000+01:00
diff --git a/py/selenium/webdriver/common/options.py b/py/selenium/webdriver/common/options.py
@@ -25,7 +25,7 @@ class BaseOptions(metaclass=ABCMeta):
     Base class for individual browser options
     """
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self._caps = self.default_capabilities
         self.set_capability("pageLoadStrategy", "normal")
@@ -225,7 +225,7 @@ def default_capabilities(self):
 
 class ArgOptions(BaseOptions):
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self._arguments = []
         self._ignore_local_proxy = False
@@ -249,7 +249,7 @@ def add_argument(self, argument):
         else:
             raise ValueError('argument can not be null')
 
-    def ignore_local_proxy_environment_variables(self):
+    def ignore_local_proxy_environment_variables(self) -> None:
         """
             By calling this you will ignore HTTP_PROXY and HTTPS_PROXY from being picked up and used.
         """
diff --git a/py/selenium/webdriver/common/virtual_authenticator.py b/py/selenium/webdriver/common/virtual_authenticator.py
@@ -64,8 +64,8 @@ def __init__(self) -> None:
             - isUserVerified: False
         """
 
-        self._protocol: Literal = Protocol.CTAP2
-        self._transport: Literal = Transport.USB
+        self._protocol: Protocol = Protocol.CTAP2
+        self._transport: Transport = Transport.USB
         self._has_resident_key: bool = False
         self._has_user_verification: bool = False
         self._is_user_consenting: bool = True
@@ -88,38 +88,38 @@ def transport(self, transport: Transport) -> None:
         self._transport = transport
 
     @property
-    def has_resident_key(self) -> None:
+    def has_resident_key(self) -> bool:
         return self._has_resident_key
 
     @has_resident_key.setter
     def has_resident_key(self, value: bool) -> None:
         self._has_resident_key = value
 
     @property
-    def has_user_verification(self) -> None:
+    def has_user_verification(self) -> bool:
         return self._has_user_verification
 
     @has_user_verification.setter
     def has_user_verification(self, value: bool) -> None:
         self._has_user_verification = value
 
     @property
-    def is_user_consenting(self) -> None:
+    def is_user_consenting(self) -> bool:
         return self._is_user_consenting
 
     @is_user_consenting.setter
     def is_user_consenting(self, value: bool) -> None:
         self._is_user_consenting = value
 
     @property
-    def is_user_verified(self) -> None:
+    def is_user_verified(self) -> bool:
         return self._is_user_verified
 
     @is_user_verified.setter
     def is_user_verified(self, value: bool) -> None:
         self._is_user_verified = value
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> typing.Dict[str, typing.Any]:
         return {
             "protocol": self.protocol,
             "transport": self.transport,
@@ -131,7 +131,7 @@ def to_dict(self) -> dict:
 
 
 class Credential:
-    def __init__(self, credential_id: bytes, is_resident_credential: bool, rp_id: str, user_handle: bytes, private_key: bytes, sign_count: int):
+    def __init__(self, credential_id: bytes, is_resident_credential: bool, rp_id: str, user_handle: typing.Optional[bytes], private_key: bytes, sign_count: int):
         """Constructor. A credential stored in a virtual authenticator.
         https://w3c.github.io/webauthn/#credential-parameters
 
@@ -151,29 +151,29 @@ def __init__(self, credential_id: bytes, is_resident_credential: bool, rp_id: st
         self._sign_count = sign_count
 
     @property
-    def id(self):
+    def id(self) -> str:
         return urlsafe_b64encode(self._id).decode()
 
     @property
     def is_resident_credential(self) -> bool:
         return self._is_resident_credential
 
     @property
-    def rp_id(self):
+    def rp_id(self) -> str:
         return self._rp_id
 
     @property
-    def user_handle(self):
+    def user_handle(self) -> typing.Optional[str]:
         if self._user_handle:
             return urlsafe_b64encode(self._user_handle).decode()
         return None
 
     @property
-    def private_key(self):
+    def private_key(self) -> str:
         return urlsafe_b64encode(self._private_key).decode()
 
     @property
-    def sign_count(self):
+    def sign_count(self) -> int:
         return self._sign_count
 
     @classmethod
@@ -192,7 +192,7 @@ def create_non_resident_credential(cls, id: bytes, rp_id: str, private_key: byte
         return cls(id, False, rp_id, None, private_key, sign_count)
 
     @classmethod
-    def create_resident_credential(cls, id: bytes, rp_id: str, user_handle: bytes, private_key: bytes, sign_count: int) -> 'Credential':
+    def create_resident_credential(cls, id: bytes, rp_id: str, user_handle: typing.Optional[bytes], private_key: bytes, sign_count: int) -> 'Credential':
         """Creates a resident (i.e. stateful) credential.
 
               :Args:
@@ -207,7 +207,7 @@ def create_resident_credential(cls, id: bytes, rp_id: str, user_handle: bytes, p
         """
         return cls(id, True, rp_id, user_handle, private_key, sign_count)
 
-    def to_dict(self):
+    def to_dict(self) -> typing.Dict[str, typing.Any]:
         credential_data = {
             'credentialId': self.id,
             'isResidentCredential': self._is_resident_credential,
@@ -222,7 +222,7 @@ def to_dict(self):
         return credential_data
 
     @classmethod
-    def from_dict(cls, data):
+    def from_dict(cls, data: typing.Dict[str, typing.Any]) -> 'Credential':
         _id = urlsafe_b64decode(f"{data['credentialId']}==")
         is_resident_credential = bool(data['isResidentCredential'])
         rp_id = data.get('rpId', None)
