Allow error handling to handle both current errors and w3c errors

Author: AutomatedTester

py/selenium/webdriver/remote/errorhandler.py

@@ -87,9 +87,22 @@ def check_response(self, response):
 
  :Raises: If the response contains an error message.
  """
- status = response['status']
- if status == ErrorCode.SUCCESS:
+ status = response.get('status', None)
+ if status is None or status == ErrorCode.SUCCESS:
  return
+
+ value = None
+ message = response.get("message", "")
+ screen = response.get("screen", "")
+ stacktrace = None
+ if isinstance(status, int):
+ value_json = response.get('value', None)
+ if value_json and isinstance(value_json, basestring):
+ import json
+ value = json.loads(value_json)
+ status = value['status']
+ message = value['message']
+
  exception_class = ErrorInResponseException
  if status in ErrorCode.NO_SUCH_ELEMENT:
  exception_class = NoSuchElementException