Skip to content

Commit 4b60710

Browse files
committed
Fix type annotation errors in virtual_authenticator.py and errorhandler.py (partially addresses #15697)
1 parent 1d8078e commit 4b60710

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

py/selenium/webdriver/common/virtual_authenticator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,9 @@ def to_dict(self) -> dict[str, Any]:
180180
def from_dict(cls, data: dict[str, Any]) -> "Credential":
181181
_id = urlsafe_b64decode(f"{data['credentialId']}==")
182182
is_resident_credential = bool(data["isResidentCredential"])
183-
rp_id = data.get("rpId", None)
183+
if "rpId" not in data:
184+
raise KeyError("Missing required field 'rpId' in credential data.")
185+
rp_id = data["rpId"]
184186
private_key = urlsafe_b64decode(f"{data['privateKey']}==")
185187
sign_count = int(data["signCount"])
186188
user_handle = urlsafe_b64decode(f"{data['userHandle']}==") if data.get("userHandle", None) else None

py/selenium/webdriver/remote/errorhandler.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,10 @@ def check_response(self, response: dict[str, Any]) -> None:
173173
message = value.get("value") or value.get("message")
174174
if not isinstance(message, str):
175175
value = message
176-
message = message.get("message")
176+
if isinstance(message, dict):
177+
message = message.get("message")
178+
else:
179+
message = None
177180
else:
178181
message = value.get("message", None)
179182
except ValueError:
@@ -202,7 +205,9 @@ def check_response(self, response: dict[str, Any]) -> None:
202205
screen = value["screen"]
203206

204207
stacktrace = None
205-
st_value = value.get("stackTrace") or value.get("stacktrace")
208+
st_value = None
209+
if isinstance(value, dict):
210+
st_value = value.get("stackTrace") or value.get("stacktrace")
206211
if st_value:
207212
if isinstance(st_value, str):
208213
stacktrace = st_value.split("\n")

0 commit comments

Comments
 (0)