[py] Fix imports

cgoldberg · cgoldberg · commit 7e3d32a0340e · 2025-09-10T09:30:30.000-04:00
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -21,13 +21,13 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.27.0
+          pip install tox==4.30.2
       - name: Generate docs
         run: tox -c py/tox.ini
         env:
@@ -41,13 +41,13 @@ jobs:
       - name: Checkout source tree
         uses: actions/checkout@v4
       - name: Set up Python 3.9
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install tox==4.27.0
+          pip install tox==4.30.2
       - name: Run type checking
         run: |
           tox -c py/tox.ini || true
diff --git a/.github/workflows/update-documentation.yml b/.github/workflows/update-documentation.yml
@@ -68,7 +68,7 @@ jobs:
           distribution: 'temurin'
       - name: Set up Python 3.9
         if: ${{ inputs.language == 'py' || inputs.language == 'all' }}
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.9
       - name: Install dependencies
diff --git a/dotnet/src/webdriver/InvalidSelectorException.cs b/dotnet/src/webdriver/InvalidSelectorException.cs
@@ -30,7 +30,7 @@ public class InvalidSelectorException : WebDriverException
     /// <summary>
     /// Link to the documentation for this error
     /// </summary>
-    private static string supportUrl = baseSupportUrl + "#invalid-selector-exception";
+    private static string supportUrl = baseSupportUrl + "#invalidselectorexception";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="InvalidSelectorException"/> class.
diff --git a/dotnet/src/webdriver/NoSuchElementException.cs b/dotnet/src/webdriver/NoSuchElementException.cs
@@ -31,7 +31,7 @@ public class NoSuchElementException : NotFoundException
     /// <summary>
     /// Link to the documentation for this error
     /// </summary>
-    private static string supportUrl = baseSupportUrl + "#no-such-element-exception";
+    private static string supportUrl = baseSupportUrl + "#nosuchelementexception";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="NoSuchElementException"/> class.
diff --git a/dotnet/src/webdriver/StaleElementReferenceException.cs b/dotnet/src/webdriver/StaleElementReferenceException.cs
@@ -30,7 +30,7 @@ public class StaleElementReferenceException : WebDriverException
     /// <summary>
     /// Link to the documentation for this error
     /// </summary>
-    private static string supportUrl = baseSupportUrl + "#stale-element-reference-exception";
+    private static string supportUrl = baseSupportUrl + "#staleelementreferenceexception";
 
     /// <summary>
     /// Initializes a new instance of the <see cref="StaleElementReferenceException"/> class.
diff --git a/dotnet/test/common/RelativeLocatorTest.cs b/dotnet/test/common/RelativeLocatorTest.cs
@@ -224,7 +224,7 @@ public void NearLocatorShouldNotFindFarElements()
         {
             var rect2 = driver.FindElement(RelativeBy.WithLocator(By.Id("rect4")).Near(rect));
 
-        }, Throws.TypeOf<NoSuchElementException>().With.Message.EqualTo("Unable to find element; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#no-such-element-exception"));
+        }, Throws.TypeOf<NoSuchElementException>().With.Message.EqualTo("Unable to find element; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#nosuchelementexception"));
     }
 
     //------------------------------------------------------------------
diff --git a/java/src/org/openqa/selenium/InvalidSelectorException.java b/java/src/org/openqa/selenium/InvalidSelectorException.java
@@ -27,7 +27,7 @@
  */
 public class InvalidSelectorException extends WebDriverException {
 
-  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#invalid-selector-exception";
+  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#invalidselectorexception";
 
   public InvalidSelectorException(String reason) {
     super(reason);
diff --git a/java/src/org/openqa/selenium/NoSuchElementException.java b/java/src/org/openqa/selenium/NoSuchElementException.java
@@ -27,7 +27,7 @@
 @NullMarked
 public class NoSuchElementException extends NotFoundException {
 
-  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#no-such-element-exception";
+  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#nosuchelementexception";
 
   public NoSuchElementException(@Nullable String reason) {
     super(reason);
diff --git a/java/src/org/openqa/selenium/StaleElementReferenceException.java b/java/src/org/openqa/selenium/StaleElementReferenceException.java
@@ -27,7 +27,7 @@
 @NullMarked
 public class StaleElementReferenceException extends WebDriverException {
 
-  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#stale-element-reference-exception";
+  private static final String SUPPORT_URL = BASE_SUPPORT_URL + "#staleelementreferenceexception";
 
   public StaleElementReferenceException(@Nullable String message) {
     super(message);
diff --git a/py/pyproject.toml b/py/pyproject.toml
@@ -144,7 +144,7 @@ respect-gitignore = true
 target-version = "py39"
 
 [tool.ruff.lint]
-extend-select = ["E4", "E7", "E9", "F", "I", "E501", "RUF022"]
+extend-select = ["E4", "E7", "E9", "F", "I", "E501", "RUF022", "TID252"]
 fixable = ["ALL"]
 
 [tool.ruff.format]
diff --git a/py/selenium/webdriver/common/actions/interaction.py b/py/selenium/webdriver/common/actions/interaction.py
@@ -16,11 +16,13 @@
 # under the License.
 from typing import Union
 
+from selenium.webdriver.common.actions.input_device import InputDevice
+
 KEY = "key"
 POINTER = "pointer"
 NONE = "none"
 WHEEL = "wheel"
-SOURCE_TYPES = {KEY, POINTER, NONE}
+SOURCE_TYPES = {KEY, POINTER, WHEEL, NONE}
 
 POINTER_MOUSE = "mouse"
 POINTER_TOUCH = "touch"
@@ -32,7 +34,7 @@
 class Interaction:
     PAUSE = "pause"
 
-    def __init__(self, source: str) -> None:
+    def __init__(self, source: InputDevice) -> None:
         self.source = source
 
 
diff --git a/py/selenium/webdriver/common/actions/key_actions.py b/py/selenium/webdriver/common/actions/key_actions.py
@@ -17,7 +17,7 @@
 
 from __future__ import annotations
 
-from selenium.webdriver.common.actions.interaction import KEY, POINTER, WHEEL, Interaction
+from selenium.webdriver.common.actions.interaction import KEY, Interaction
 from selenium.webdriver.common.actions.key_input import KeyInput
 from selenium.webdriver.common.actions.pointer_input import PointerInput
 from selenium.webdriver.common.actions.wheel_input import WheelInput
@@ -29,18 +29,7 @@ def __init__(self, source: KeyInput | PointerInput | WheelInput | None = None) -
         if source is None:
             source = KeyInput(KEY)
         self.input_source = source
-
-        # Determine the correct source type string based on the input object
-        if isinstance(source, KeyInput):
-            source_type = KEY
-        elif isinstance(source, PointerInput):
-            source_type = POINTER
-        elif isinstance(source, WheelInput):
-            source_type = WHEEL
-        else:
-            source_type = KEY
-
-        super().__init__(source_type)
+        super().__init__(source)
 
     def key_down(self, letter: str) -> KeyActions:
         return self._key_action("create_key_down", letter)
@@ -60,6 +49,6 @@ def send_keys(self, text: str | list) -> KeyActions:
         return self
 
     def _key_action(self, action: str, letter) -> KeyActions:
-        meth = getattr(self.input_source, action)
+        meth = getattr(self.source, action)
         meth(letter)
         return self
diff --git a/py/selenium/webdriver/common/actions/wheel_actions.py b/py/selenium/webdriver/common/actions/wheel_actions.py
@@ -17,14 +17,14 @@
 
 from typing import Optional
 
-from selenium.webdriver.common.actions.interaction import Interaction
+from selenium.webdriver.common.actions.interaction import WHEEL, Interaction
 from selenium.webdriver.common.actions.wheel_input import WheelInput
 
 
 class WheelActions(Interaction):
     def __init__(self, source: Optional[WheelInput] = None):
         if source is None:
-            source = WheelInput("wheel")
+            source = WheelInput(WHEEL)
         super().__init__(source)
 
     def pause(self, duration: float = 0):
diff --git a/py/selenium/webdriver/common/desired_capabilities.py b/py/selenium/webdriver/common/desired_capabilities.py
@@ -26,19 +26,17 @@ class DesiredCapabilities:
     Usage Example::
 
         from selenium import webdriver
+        from selenium.webdriver.firefox.options import Options
 
         selenium_grid_url = "http://198.0.0.1:4444/wd/hub"
 
-        # Create a desired capabilities object as a starting point.
-        capabilities = DesiredCapabilities.FIREFOX.copy()
-        capabilities["platform"] = "WINDOWS"
-        capabilities["version"] = "10"
+        # Create a new Options object for the desired browser.
+        options = Options()
+        options.set_capability("platformName", "windows")
+        options.browser_version = "142"
 
-        # Instantiate an instance of Remote WebDriver with the desired capabilities.
-        driver = webdriver.Remote(desired_capabilities=capabilities, command_executor=selenium_grid_url)
-
-    Note: Always use '.copy()' on the DesiredCapabilities object to avoid the side
-    effects of altering the Global class instance.
+        # Instantiate an instance of Remote WebDriver with the new options.
+        driver = webdriver.Remote(command_executor=selenium_grid_url, options=options)
     """
 
     FIREFOX = {
diff --git a/py/selenium/webdriver/common/utils.py b/py/selenium/webdriver/common/utils.py
@@ -14,9 +14,11 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-"""The Utils methods."""
+
+"""Utility functions."""
 
 import socket
+import urllib.request
 from collections.abc import Iterable
 from typing import Optional, Union
 
@@ -67,8 +69,8 @@ def find_connectable_ip(host: Union[str, bytes, bytearray, None], port: Optional
     port are considered.
 
     :Args:
-        - host - A hostname.
-        - port - Optional port number.
+        - host - hostname
+        - port - port number
 
     :Returns:
         A single IP address, as a string. If any IPv4 address is found, one is
@@ -100,8 +102,8 @@ def join_host_port(host: str, port: int) -> str:
     example, _join_host_port('::1', 80) == '[::1]:80'.
 
     :Args:
-        - host - A hostname.
-        - port - An integer port.
+        - host - hostname or IP
+        - port - port number
     """
     if ":" in host and not host.startswith("["):
         return f"[{host}]:{port}"
@@ -112,7 +114,8 @@ def is_connectable(port: int, host: Optional[str] = "localhost") -> bool:
     """Tries to connect to the server at port to see if it is running.
 
     :Args:
-     - port - The port to connect.
+        - port - port number
+        - host - hostname or IP
     """
     socket_ = None
     try:
@@ -130,18 +133,22 @@ def is_connectable(port: int, host: Optional[str] = "localhost") -> bool:
     return result
 
 
-def is_url_connectable(port: Union[int, str]) -> bool:
-    """Tries to connect to the HTTP server at /status path and specified port
-    to see if it responds successfully.
+def is_url_connectable(
+    port: Union[int, str],
+    host: Optional[str] = "127.0.0.1",
+    scheme: Optional[str] = "http",
+) -> bool:
+    """Sends a request to the HTTP server at the /status endpoint to see if it
+    responds successfully.
 
     :Args:
-     - port - The port to connect.
+        - port - port number
+        - host - hostname or IP
+        - scheme - URL scheme
     """
-    from urllib import request as url_request
-
     try:
-        res = url_request.urlopen(f"http://127.0.0.1:{port}/status")
-        return res.getcode() == 200
+        with urllib.request.urlopen(f"{scheme}://{host}:{port}/status") as res:
+            return res.getcode() == 200
     except Exception:
         return False
 
diff --git a/rb/lib/selenium/webdriver/bidi/browser.rb b/rb/lib/selenium/webdriver/bidi/browser.rb
@@ -21,6 +21,11 @@ module Selenium
   module WebDriver
     class BiDi
       class Browser
+        Window = Struct.new(:handle, :active, :height, :width, :x, :y, :state) do
+          def active?
+            active
+          end
+        end
         def initialize(bidi)
           @bidi = bidi
         end
@@ -36,7 +41,24 @@ def user_contexts
         def remove_user_context(user_context)
           @bidi.send_cmd('browser.removeUserContext', userContext: user_context)
         end
-      end
+
+        def windows
+          response = @bidi.send_cmd('browser.getClientWindows')
+
+          response['clientWindows'].map do |win_data|
+            attributes = {
+              handle: win_data['clientWindow'],
+              active: win_data['active'],
+              height: win_data['height'],
+              width: win_data['width'],
+              x: win_data['x'],
+              y: win_data['y'],
+              state: win_data['state']
+            }
+            Window.new(**attributes)
+          end
+        end
+      end # Browser
     end # BiDi
   end # WebDriver
 end # Selenium
diff --git a/rb/lib/selenium/webdriver/bidi/browsing_context.rb b/rb/lib/selenium/webdriver/bidi/browsing_context.rb
@@ -109,7 +109,7 @@ def activate(context_id: nil)
           context_id ||= @bridge.window_handle
           @bidi.send_cmd('browsingContext.activate', context: context_id)
         end
-      end
+      end # BrowsingContext
     end # BiDi
   end # WebDriver
 end # Selenium
diff --git a/rb/lib/selenium/webdriver/common/error.rb b/rb/lib/selenium/webdriver/common/error.rb
@@ -38,9 +38,9 @@ def self.for_error(error)
       ERROR_URL = 'https://www.selenium.dev/documentation/webdriver/troubleshooting/errors'
 
       URLS = {
-        NoSuchElementError: "#{ERROR_URL}#no-such-element-exception",
-        StaleElementReferenceError: "#{ERROR_URL}#stale-element-reference-exception",
-        InvalidSelectorError: "#{ERROR_URL}#invalid-selector-exception",
+        NoSuchElementError: "#{ERROR_URL}#nosuchelementexception",
+        StaleElementReferenceError: "#{ERROR_URL}#staleelementreferenceexception",
+        InvalidSelectorError: "#{ERROR_URL}#invalidselectorexception",
         NoSuchDriverError: "#{ERROR_URL}/driver_location"
       }.freeze
 
diff --git a/rb/lib/selenium/webdriver/common/options.rb b/rb/lib/selenium/webdriver/common/options.rb
@@ -131,11 +131,20 @@ def w3c?(key)
 
       def process_w3c_options(options)
         w3c_options = options.select { |key, val| w3c?(key) && !val.nil? }
-        w3c_options[:unhandled_prompt_behavior] &&= w3c_options[:unhandled_prompt_behavior]&.to_s&.tr('_', ' ')
+        w3c_options[:unhandled_prompt_behavior] &&=
+          process_unhandled_prompt_behavior_value(w3c_options[:unhandled_prompt_behavior])
         options.delete_if { |key, _val| w3c?(key) }
         w3c_options
       end
 
+      def process_unhandled_prompt_behavior_value(value)
+        if value.is_a?(Hash)
+          value.transform_values { |v| process_unhandled_prompt_behavior_value(v) }
+        else
+          value&.to_s&.tr('_', ' ')
+        end
+      end
+
       def process_browser_options(_browser_options)
         nil
       end
diff --git a/rb/sig/lib/selenium/webdriver/bidi/browser.rbs b/rb/sig/lib/selenium/webdriver/bidi/browser.rbs
@@ -2,6 +2,8 @@ module Selenium
   module WebDriver
     class BiDi
       class Browser
+        Window: Selenium::WebDriver::BiDi::Browser::Window
+
         @bidi: BiDi
 
         def initialize: (BiDi bidi) -> void
diff --git a/rb/spec/integration/selenium/webdriver/action_builder_spec.rb b/rb/spec/integration/selenium/webdriver/action_builder_spec.rb
diff --git a/rb/spec/integration/selenium/webdriver/bidi/browser_spec.rb b/rb/spec/integration/selenium/webdriver/bidi/browser_spec.rb
diff --git a/rb/spec/integration/selenium/webdriver/driver_spec.rb b/rb/spec/integration/selenium/webdriver/driver_spec.rb
diff --git a/rb/spec/integration/selenium/webdriver/element_spec.rb b/rb/spec/integration/selenium/webdriver/element_spec.rb
diff --git a/rb/spec/integration/selenium/webdriver/error_spec.rb b/rb/spec/integration/selenium/webdriver/error_spec.rb
diff --git a/rb/spec/integration/selenium/webdriver/window_spec.rb b/rb/spec/integration/selenium/webdriver/window_spec.rb
diff --git a/rb/spec/unit/selenium/webdriver/chrome/options_spec.rb b/rb/spec/unit/selenium/webdriver/chrome/options_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -224,7 +224,7 @@ public void NearLocatorShouldNotFindFarElements()`
`224`	`224`	`{`
`225`	`225`	`var rect2 = driver.FindElement(RelativeBy.WithLocator(By.Id("rect4")).Near(rect));`
`226`	`226`
`227`		`- }, Throws.TypeOf<NoSuchElementException>().With.Message.EqualTo("Unable to find element; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#no-such-element-exception"));`
	`227`	`+ }, Throws.TypeOf<NoSuchElementException>().With.Message.EqualTo("Unable to find element; For documentation on this error, please visit: https://www.selenium.dev/documentation/webdriver/troubleshooting/errors#nosuchelementexception"));`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`//------------------------------------------------------------------`