[py] Tidy up python exception handling (#10537)

symonk · AutomatedTester · web-flow · commit 3824c3e9c5bb · 2022-05-23T21:20:39.000+01:00
Co-authored-by: David Burns &lt;david.burns@theautomatedtester.co.uk&gt;
diff --git a/py/selenium/webdriver/remote/switch_to.py b/py/selenium/webdriver/remote/switch_to.py
@@ -53,7 +53,7 @@ def alert(self) -> Alert:
                 alert = driver.switch_to.alert
         """
         alert = Alert(self._driver)
-        alert.text
+        _ = alert.text
         return alert
 
     def default_content(self) -> None:
@@ -141,7 +141,7 @@ def send_handle(h):
         try:
             # Try using it as a handle first.
             send_handle(window_name)
-        except NoSuchWindowException as e:
+        except NoSuchWindowException:
             # Check every window to try to find the given window name.
             original_handle = self._driver.current_window_handle
             handles = self._driver.window_handles
@@ -151,4 +151,4 @@ def send_handle(h):
                 if window_name == current_name:
                     return
             send_handle(original_handle)
-            raise e
+            raise
diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py
@@ -820,4 +820,4 @@ def _upload(self, filename):
             elif '{"status":405,"value":["GET","HEAD","DELETE"]}' in e.__str__():
                 return filename
             else:
-                raise e
+                raise
diff --git a/py/selenium/webdriver/support/color.py b/py/selenium/webdriver/support/color.py
@@ -125,7 +125,7 @@ def hue_to_rgb(lum1: float, lum2: float, hue: float) -> float:
                     hue -= 1
 
                 if hue < 1.0 / 6.0:
-                    return (lum1 + (lum2 - lum1) * 6.0 * hue)
+                    return lum1 + (lum2 - lum1) * 6.0 * hue
                 elif hue < 1.0 / 2.0:
                     return lum2
                 elif hue < 2.0 / 3.0:
diff --git a/py/selenium/webdriver/support/event_firing_webdriver.py b/py/selenium/webdriver/support/event_firing_webdriver.py
@@ -180,7 +180,7 @@ def _dispatch(self, l_call, l_args, d_call, d_args):
             result = getattr(self._driver, d_call)(*d_args)
         except Exception as e:
             self._listener.on_exception(e, self._driver)
-            raise e
+            raise
         getattr(self._listener, "after_%s" % l_call)(*l_args)
         return _wrap_elements(result, self)
 
@@ -207,7 +207,7 @@ def __setattr__(self, item, value):
                 object.__setattr__(self._driver, item, value)
             except Exception as e:
                 self._listener.on_exception(e, self._driver)
-                raise e
+                raise
 
     def __getattr__(self, name):
         def _wrap(*args, **kwargs):
@@ -330,7 +330,7 @@ def _dispatch(self, l_call, l_args, d_call, d_args):
             result = getattr(self._webelement, d_call)(*d_args)
         except Exception as e:
             self._listener.on_exception(e, self._driver)
-            raise e
+            raise
         getattr(self._listener, "after_%s" % l_call)(*l_args)
         return _wrap_elements(result, self._ef_driver)
 
@@ -342,7 +342,7 @@ def __setattr__(self, item, value):
                 object.__setattr__(self._webelement, item, value)
             except Exception as e:
                 self._listener.on_exception(e, self._driver)
-                raise e
+                raise
 
     def __getattr__(self, name):
         def _wrap(*args, **kwargs):
@@ -361,4 +361,5 @@ def _wrap(*args, **kwargs):
             raise
 
 
+# Register a virtual subclass.
 WebElement.register(EventFiringWebElement)
diff --git a/py/selenium/webdriver/support/expected_conditions.py b/py/selenium/webdriver/support/expected_conditions.py
@@ -17,7 +17,7 @@
 
 import re
 
-from selenium.common.exceptions import NoSuchElementException, InvalidSelectorException
+from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import NoSuchFrameException
 from selenium.common.exceptions import StaleElementReferenceException
 from selenium.common.exceptions import WebDriverException
@@ -123,8 +123,6 @@ def visibility_of_element_located(locator):
     def _predicate(driver):
         try:
             return _element_if_visible(driver.find_element(*locator))
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
@@ -190,8 +188,6 @@ def _predicate(driver):
                 if _element_if_visible(element, visibility=False):
                     return False
             return elements
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
@@ -208,8 +204,6 @@ def _predicate(driver):
         try:
             element_text = driver.find_element(*locator).text
             return text_ in element_text
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
@@ -226,8 +220,6 @@ def _predicate(driver):
         try:
             element_text = driver.find_element(*locator).get_attribute("value")
             return text_ in element_text
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
@@ -246,8 +238,6 @@ def _predicate(driver):
                 return False
             element_text = driver.find_element(*locator).get_attribute(attribute_)
             return text_ in element_text
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
@@ -267,8 +257,6 @@ def _predicate(driver):
             else:
                 driver.switch_to.frame(locator)
             return True
-        except InvalidSelectorException as e:
-            raise e
         except NoSuchFrameException:
             return False
 
@@ -288,8 +276,6 @@ def _predicate(driver):
             if not isinstance(target, WebElement):
                 target = driver.find_element(*target)
             return _element_if_visible(target, False)
-        except InvalidSelectorException as e:
-            raise e
         except (NoSuchElementException, StaleElementReferenceException):
             # In the case of NoSuchElement, returns true because the element is
             # not present in DOM. The try block checks if the element is present
@@ -344,8 +330,6 @@ def _predicate(_):
             # Calling any method forces a staleness check
             element.is_enabled()
             return False
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return True
 
@@ -376,7 +360,7 @@ def _predicate(driver):
 def element_selection_state_to_be(element, is_selected):
     """ An expectation for checking if the given element is selected.
     element is WebElement object
-    is_selected is a Boolean."
+    is_selected is a Boolean.
     """
 
     def _predicate(_):
@@ -396,8 +380,6 @@ def _predicate(driver):
         try:
             element = driver.find_element(*locator)
             return element.is_selected() == is_selected
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
@@ -443,8 +425,6 @@ def _predicate(driver):
         try:
             element_attribute = driver.find_element(*locator).get_attribute(attribute_)
             return element_attribute is not None
-        except InvalidSelectorException as e:
-            raise e
         except StaleElementReferenceException:
             return False
 
diff --git a/py/selenium/webdriver/support/wait.py b/py/selenium/webdriver/support/wait.py
@@ -16,7 +16,7 @@
 # under the License.
 
 import time
-from selenium.common.exceptions import NoSuchElementException, InvalidSelectorException
+from selenium.common.exceptions import NoSuchElementException
 from selenium.common.exceptions import TimeoutException
 
 POLL_FREQUENCY = 0.5  # How long to sleep in between calls to the method
@@ -78,8 +78,6 @@ def until(self, method, message=''):
                 value = method(self._driver)
                 if value:
                     return value
-            except InvalidSelectorException as e:
-                raise e
             except self._ignored_exceptions as exc:
                 screen = getattr(exc, 'screen', None)
                 stacktrace = getattr(exc, 'stacktrace', None)
@@ -104,8 +102,6 @@ def until_not(self, method, message=''):
                 value = method(self._driver)
                 if not value:
                     return value
-            except InvalidSelectorException as e:
-                raise e
             except self._ignored_exceptions:
                 return True
             time.sleep(self._poll)
diff --git a/py/test/selenium/webdriver/common/webdriverwait_tests.py b/py/test/selenium/webdriver/common/webdriverwait_tests.py
@@ -38,7 +38,7 @@ def test_should_fail_with_invalid_selector_exception(driver, pages):
         WebDriverWait(driver, 0.7).until(EC.presence_of_element_located((By.XPATH, "//*[contains(@id,'something'")))
 
 
-def test_should_explicitly_wait_for_asingle_element(driver, pages):
+def test_should_explicitly_wait_for_a_single_element(driver, pages):
     pages.load("dynamic.html")
     add = driver.find_element(By.ID, "adder")
     add.click()
