[py] Check dict instance

Author: cgoldberg

py/selenium/webdriver/remote/errorhandler.py

@@ -162,9 +162,9 @@ def check_response(self, response: dict[str, Any]) -> None:
         if isinstance(status, int):
             value_json = response.get("value", None)
             if value_json and isinstance(value_json, str):
-                if not value_json.isdigit():
-                    try:
-                        value = json.loads(value_json)
+                try:
+                    value = json.loads(value_json)
+                    if isinstance(value, dict):
                         if len(value) == 1:
                             value = value["value"]
                         status = value.get("error", None)
@@ -176,8 +176,8 @@ def check_response(self, response: dict[str, Any]) -> None:
                                 message = message.get("message")
                         else:
                             message = value.get("message", None)
-                    except ValueError:
-                        pass
+                except ValueError:
+                    pass
 
         exception_class: type[WebDriverException]
         e = ErrorCode()

py/test/unit/selenium/webdriver/remote/error_handler_tests.py

@@ -259,7 +259,7 @@ def test_relays_exception_stacktrace(handler, key):
     assert "Spam.ham" in e.value.stacktrace[0]
 
 
-def test_handle_errors_better(handler):
+def test_handle_json_error_with_message(handler):
     response = {
         "status": 500,
         "value": json.dumps(
@@ -281,21 +281,21 @@ def test_handle_errors_better(handler):
     assert "Could not start a new session." in e.value.msg
 
 
-def test_handle_numeric_value_error(handler):
+def test_handle_string_error(handler):
     response = {
-        "status": 999,
-        "value": "0",
+        "status": 407,
+        "value": "Proxy Authentication Required",
     }
     with pytest.raises(exceptions.WebDriverException) as e:
         handler.check_response(response)
-    assert e.value.msg == "0"
+    assert e.value.msg == "Proxy Authentication Required"
 
 
-def test_handle_non_json_error(handler):
+def test_handle_numeric_error(handler):
     response = {
-        "status": 407,
-        "value": "Proxy Authentication Required",
+        "status": 999,
+        "value": "0",
     }
     with pytest.raises(exceptions.WebDriverException) as e:
         handler.check_response(response)
-    assert e.value.msg == "Proxy Authentication Required"
+    assert e.value.msg == "0"