[py]: Remove warning duplication in webdriver.py and provide stacklevel=

symonk · symonk · commit 778d195c9ed5 · 2023-07-30T16:39:51.000+01:00
diff --git a/py/selenium/webdriver/remote/webdriver.py b/py/selenium/webdriver/remote/webdriver.py
@@ -797,6 +797,7 @@ def get_screenshot_as_file(self, filename) -> bool:
             warnings.warn(
                 "name used for saved screenshot does not match file type. It should end with a `.png` extension",
                 UserWarning,
+                stacklevel=2,
             )
         png = self.get_screenshot_as_png()
         try:
@@ -857,8 +858,7 @@ def set_window_size(self, width, height, windowHandle: str = "current") -> None:
 
                 driver.set_window_size(800,600)
         """
-        if windowHandle != "current":
-            warnings.warn("Only 'current' window is supported for W3C compatible browsers.")
+        self._check_if_window_handle_is_current(windowHandle)
         self.set_window_rect(width=int(width), height=int(height))
 
     def get_window_size(self, windowHandle: str = "current") -> dict:
@@ -870,8 +870,6 @@ def get_window_size(self, windowHandle: str = "current") -> dict:
                 driver.get_window_size()
         """
 
-        if windowHandle != "current":
-            warnings.warn("Only 'current' window is supported for W3C compatible browsers.")
         size = self.get_window_rect()
 
         if size.get("value", None):
@@ -891,8 +889,7 @@ def set_window_position(self, x, y, windowHandle: str = "current") -> dict:
 
                 driver.set_window_position(0,0)
         """
-        if windowHandle != "current":
-            warnings.warn("Only 'current' window is supported for W3C compatible browsers.")
+        self._check_if_window_handle_is_current(windowHandle)
         return self.set_window_rect(x=int(x), y=int(y))
 
     def get_window_position(self, windowHandle="current") -> dict:
@@ -904,12 +901,16 @@ def get_window_position(self, windowHandle="current") -> dict:
                 driver.get_window_position()
         """
 
-        if windowHandle != "current":
-            warnings.warn("Only 'current' window is supported for W3C compatible browsers.")
+        self._check_if_window_handle_is_current(windowHandle)
         position = self.get_window_rect()
 
         return {k: position[k] for k in ("x", "y")}
 
+    def _check_if_window_handle_is_current(windowHandle: str) -> None:
+        """Warns if the window handle is not equal to `current`."""
+        if windowHandle != "current":
+            warnings.warn("Only 'current' window is supported for W3C compatible browsers.", stacklevel=2)
+
     def get_window_rect(self) -> dict:
         """Gets the x, y coordinates of the window as well as height and width
         of the current window.
diff --git a/py/selenium/webdriver/remote/webelement.py b/py/selenium/webdriver/remote/webelement.py
@@ -109,8 +109,8 @@ def submit(self):
 
         try:
             self._parent.execute_script(script, self)
-        except JavascriptException:
-            raise WebDriverException("To submit an element, it must be nested inside a form element")
+        except JavascriptException as exc:
+            raise WebDriverException("To submit an element, it must be nested inside a form element") from exc
 
     def clear(self) -> None:
         """Clears the text if it's a text entry element."""
