From 3f443c49513c961a9a96a3d70a7c1ff092ad329d Mon Sep 17 00:00:00 2001 From: Dima Veselov Date: Wed, 12 Apr 2017 16:26:39 +0300 Subject: [PATCH 1/3] Update errorhandler.py --- py/selenium/webdriver/remote/errorhandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/selenium/webdriver/remote/errorhandler.py b/py/selenium/webdriver/remote/errorhandler.py index 76bba42acfbad..3c5b9f41a53a4 100644 --- a/py/selenium/webdriver/remote/errorhandler.py +++ b/py/selenium/webdriver/remote/errorhandler.py @@ -110,7 +110,7 @@ def check_response(self, response): value = message try: message = message['message'] - except TypeError: + except KeyError: message = None else: message = value.get('message', None) From c58539a2c51a5ef9065b8564d4a2d98cbb4f949e Mon Sep 17 00:00:00 2001 From: Dima Veselov Date: Wed, 12 Apr 2017 16:58:49 +0300 Subject: [PATCH 2/3] Update errorhandler.py --- py/selenium/webdriver/remote/errorhandler.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/py/selenium/webdriver/remote/errorhandler.py b/py/selenium/webdriver/remote/errorhandler.py index 3c5b9f41a53a4..12bf6cd1f2cb6 100644 --- a/py/selenium/webdriver/remote/errorhandler.py +++ b/py/selenium/webdriver/remote/errorhandler.py @@ -108,10 +108,7 @@ def check_response(self, response): message = value["value"] if not isinstance(message, basestring): value = message - try: - message = message['message'] - except KeyError: - message = None + message = message.get('message', None) else: message = value.get('message', None) except ValueError: From 5009ffa7d2217f3f0a5097bbbc3b9225c122f773 Mon Sep 17 00:00:00 2001 From: Dima Veselov Date: Wed, 12 Apr 2017 17:07:41 +0300 Subject: [PATCH 3/3] Update errorhandler.py --- py/selenium/webdriver/remote/errorhandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/selenium/webdriver/remote/errorhandler.py b/py/selenium/webdriver/remote/errorhandler.py index 12bf6cd1f2cb6..d0ed9c3f50d15 100644 --- a/py/selenium/webdriver/remote/errorhandler.py +++ b/py/selenium/webdriver/remote/errorhandler.py @@ -108,7 +108,7 @@ def check_response(self, response): message = value["value"] if not isinstance(message, basestring): value = message - message = message.get('message', None) + message = message.get('message') else: message = value.get('message', None) except ValueError: