Merge remote-tracking branch 'origin/rb_bidi_get_client_windows' into rb_bidi_get_client_windows

Author: aguspe

.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

.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

py/selenium/webdriver/common/actions/interaction.py

@@ -16,11 +16,13 @@
 # under the License.
 from typing import Union
 
+from .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
 
 

py/selenium/webdriver/common/actions/key_actions.py

@@ -18,7 +18,7 @@
 from __future__ import annotations
 
 from ..utils import keys_to_typing
-from .interaction import KEY, POINTER, WHEEL, Interaction
+from .interaction import KEY, Interaction
 from .key_input import KeyInput
 from .pointer_input import PointerInput
 from .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

py/selenium/webdriver/common/actions/wheel_actions.py

@@ -17,14 +17,14 @@
 
 from typing import Optional
 
-from .interaction import Interaction
+from .interaction import WHEEL, Interaction
 from .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):

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 = {