[py] deprecate w3c checks in python bindings (#9109)

Co-authored-by: David Burns <[email protected]>

Author: Dharin-shah

py/selenium/webdriver/common/action_chains.py

@@ -19,10 +19,6 @@
 The ActionChains implementation,
 """
 
-import time
-
-from selenium.webdriver.remote.command import Command
-
 from .utils import keys_to_typing
 from .actions.action_builder import ActionBuilder
 
@@ -69,27 +65,21 @@ def __init__(self, driver):
         """
         self._driver = driver
         self._actions = []
-        if self._driver.w3c:
-            self.w3c_actions = ActionBuilder(driver)
+        self.w3c_actions = ActionBuilder(driver)
 
     def perform(self):
         """
         Performs all stored actions.
         """
-        if self._driver.w3c:
-            self.w3c_actions.perform()
-        else:
-            for action in self._actions:
-                action()
+        self.w3c_actions.perform()
 
     def reset_actions(self):
         """
         Clears actions that are already stored locally and on the remote end
         """
-        if self._driver.w3c:
-            self.w3c_actions.clear_actions()
-            for device in self.w3c_actions.devices:
-                device.clear_actions()
+        self.w3c_actions.clear_actions()
+        for device in self.w3c_actions.devices:
+            device.clear_actions()
         self._actions = []
 
     def click(self, on_element=None):
@@ -102,13 +92,11 @@ def click(self, on_element=None):
         """
         if on_element:
             self.move_to_element(on_element)
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.click()
-            self.w3c_actions.key_action.pause()
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                                 Command.CLICK, {'button': 0}))
+
+        self.w3c_actions.pointer_action.click()
+        self.w3c_actions.key_action.pause()
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def click_and_hold(self, on_element=None):
@@ -121,12 +109,10 @@ def click_and_hold(self, on_element=None):
         """
         if on_element:
             self.move_to_element(on_element)
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.click_and_hold()
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                                 Command.MOUSE_DOWN, {}))
+
+        self.w3c_actions.pointer_action.click_and_hold()
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def context_click(self, on_element=None):
@@ -139,13 +125,11 @@ def context_click(self, on_element=None):
         """
         if on_element:
             self.move_to_element(on_element)
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.context_click()
-            self.w3c_actions.key_action.pause()
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                                 Command.CLICK, {'button': 2}))
+
+        self.w3c_actions.pointer_action.context_click()
+        self.w3c_actions.key_action.pause()
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def double_click(self, on_element=None):
@@ -158,13 +142,11 @@ def double_click(self, on_element=None):
         """
         if on_element:
             self.move_to_element(on_element)
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.double_click()
-            for _ in range(4):
-                self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                                 Command.DOUBLE_CLICK, {}))
+
+        self.w3c_actions.pointer_action.double_click()
+        for _ in range(4):
+            self.w3c_actions.key_action.pause()
+
         return self
 
     def drag_and_drop(self, source, target):
@@ -212,13 +194,10 @@ def key_down(self, value, element=None):
         """
         if element:
             self.click(element)
-        if self._driver.w3c:
-            self.w3c_actions.key_action.key_down(value)
-            self.w3c_actions.pointer_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                Command.SEND_KEYS_TO_ACTIVE_ELEMENT,
-                {"value": keys_to_typing(value)}))
+
+        self.w3c_actions.key_action.key_down(value)
+        self.w3c_actions.pointer_action.pause()
+
         return self
 
     def key_up(self, value, element=None):
@@ -237,13 +216,10 @@ def key_up(self, value, element=None):
         """
         if element:
             self.click(element)
-        if self._driver.w3c:
-            self.w3c_actions.key_action.key_up(value)
-            self.w3c_actions.pointer_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                Command.SEND_KEYS_TO_ACTIVE_ELEMENT,
-                {"value": keys_to_typing(value)}))
+
+        self.w3c_actions.key_action.key_up(value)
+        self.w3c_actions.pointer_action.pause()
+
         return self
 
     def move_by_offset(self, xoffset, yoffset):
@@ -254,14 +230,10 @@ def move_by_offset(self, xoffset, yoffset):
          - xoffset: X offset to move to, as a positive or negative integer.
          - yoffset: Y offset to move to, as a positive or negative integer.
         """
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.move_by(xoffset, yoffset)
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                Command.MOVE_TO, {
-                    'xoffset': int(xoffset),
-                    'yoffset': int(yoffset)}))
+
+        self.w3c_actions.pointer_action.move_by(xoffset, yoffset)
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def move_to_element(self, to_element):
@@ -271,12 +243,10 @@ def move_to_element(self, to_element):
         :Args:
          - to_element: The WebElement to move to.
         """
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.move_to(to_element)
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                                 Command.MOVE_TO, {'element': to_element.id}))
+
+        self.w3c_actions.pointer_action.move_to(to_element)
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def move_to_element_with_offset(self, to_element, xoffset, yoffset):
@@ -289,26 +259,20 @@ def move_to_element_with_offset(self, to_element, xoffset, yoffset):
          - xoffset: X offset to move to.
          - yoffset: Y offset to move to.
         """
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.move_to(to_element,
-                                                    int(xoffset),
-                                                    int(yoffset))
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(
-                lambda: self._driver.execute(Command.MOVE_TO, {
-                    'element': to_element.id,
-                    'xoffset': int(xoffset),
-                    'yoffset': int(yoffset)}))
+
+        self.w3c_actions.pointer_action.move_to(to_element,
+                                                int(xoffset),
+                                                int(yoffset))
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def pause(self, seconds):
         """ Pause all inputs for the specified duration in seconds """
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.pause(seconds)
-            self.w3c_actions.key_action.pause(seconds)
-        else:
-            self._actions.append(lambda: time.sleep(seconds))
+
+        self.w3c_actions.pointer_action.pause(seconds)
+        self.w3c_actions.key_action.pause(seconds)
+
         return self
 
     def release(self, on_element=None):
@@ -321,11 +285,10 @@ def release(self, on_element=None):
         """
         if on_element:
             self.move_to_element(on_element)
-        if self._driver.w3c:
-            self.w3c_actions.pointer_action.release()
-            self.w3c_actions.key_action.pause()
-        else:
-            self._actions.append(lambda: self._driver.execute(Command.MOUSE_UP, {}))
+
+        self.w3c_actions.pointer_action.release()
+        self.w3c_actions.key_action.pause()
+
         return self
 
     def send_keys(self, *keys_to_send):
@@ -337,13 +300,11 @@ def send_keys(self, *keys_to_send):
            'Keys' class.
         """
         typing = keys_to_typing(keys_to_send)
-        if self._driver.w3c:
-            for key in typing:
-                self.key_down(key)
-                self.key_up(key)
-        else:
-            self._actions.append(lambda: self._driver.execute(
-                Command.SEND_KEYS_TO_ACTIVE_ELEMENT, {'value': typing}))
+
+        for key in typing:
+            self.key_down(key)
+            self.key_up(key)
+
         return self
 
     def send_keys_to_element(self, element, *keys_to_send):

py/selenium/webdriver/common/alert.py

@@ -63,19 +63,13 @@ def text(self):
         """
         Gets the text of the Alert.
         """
-        if self.driver.w3c:
-            return self.driver.execute(Command.W3C_GET_ALERT_TEXT)["value"]
-        else:
-            return self.driver.execute(Command.GET_ALERT_TEXT)["value"]
+        return self.driver.execute(Command.W3C_GET_ALERT_TEXT)["value"]
 
     def dismiss(self):
         """
         Dismisses the alert available.
         """
-        if self.driver.w3c:
-            self.driver.execute(Command.W3C_DISMISS_ALERT)
-        else:
-            self.driver.execute(Command.DISMISS_ALERT)
+        self.driver.execute(Command.W3C_DISMISS_ALERT)
 
     def accept(self):
         """
@@ -84,22 +78,13 @@ def accept(self):
         Usage::
         Alert(driver).accept() # Confirm a alert dialog.
         """
-        if self.driver.w3c:
-            self.driver.execute(Command.W3C_ACCEPT_ALERT)
-        else:
-            self.driver.execute(Command.ACCEPT_ALERT)
+        self.driver.execute(Command.W3C_ACCEPT_ALERT)
 
     def send_keys(self, keysToSend):
         """
         Send Keys to the Alert.
 
         :Args:
          - keysToSend: The text to be sent to Alert.
-
-
         """
-        if self.driver.w3c:
-            self.driver.execute(Command.W3C_SET_ALERT_VALUE, {'value': keys_to_typing(keysToSend),
-                                                              'text': keysToSend})
-        else:
-            self.driver.execute(Command.SET_ALERT_VALUE, {'text': keysToSend})
+        self.driver.execute(Command.W3C_SET_ALERT_VALUE, {'value': keys_to_typing(keysToSend), 'text': keysToSend})

py/selenium/webdriver/firefox/webdriver.py

@@ -195,10 +195,7 @@ def quit(self) -> NoReturn:
             # We don't care about the message because something probably has gone wrong
             pass
 
-        if self.w3c:
-            self.service.stop()
-        else:
-            self.binary.kill()
+        self.service.stop()
 
         if self.profile:
             try:

py/selenium/webdriver/remote/remote_connection.py

@@ -387,7 +387,7 @@ def execute(self, command, params):
         command_info = self._commands[command]
         assert command_info is not None, 'Unrecognised command %s' % command
         path = string.Template(command_info[1]).substitute(params)
-        if hasattr(self, 'w3c') and self.w3c and isinstance(params, dict) and 'sessionId' in params:
+        if isinstance(params, dict) and 'sessionId' in params:
             del params['sessionId']
         data = utils.dump_json(params)
         url = f"{self._url}{path}"

py/selenium/webdriver/remote/switch_to.py

@@ -40,10 +40,7 @@ def active_element(self) -> WebElement:
 
                 element = driver.switch_to.active_element
         """
-        if self._driver.w3c:
-            return self._driver.execute(Command.W3C_GET_ACTIVE_ELEMENT)['value']
-        else:
-            return self._driver.execute(Command.GET_ACTIVE_ELEMENT)['value']
+        return self._driver.execute(Command.W3C_GET_ACTIVE_ELEMENT)['value']
 
     @property
     def alert(self) -> Alert:
@@ -85,7 +82,7 @@ def frame(self, frame_reference) -> None:
                 driver.switch_to.frame(1)
                 driver.switch_to.frame(driver.find_elements(By.TAG_NAME, "iframe")[0])
         """
-        if isinstance(frame_reference, str) and self._driver.w3c:
+        if isinstance(frame_reference, str):
             try:
                 frame_reference = self._driver.find_element(By.ID, frame_reference)
             except NoSuchElementException:
@@ -134,11 +131,8 @@ def window(self, window_name) -> None:
 
                 driver.switch_to.window('main')
         """
-        if self._driver.w3c:
-            self._w3c_window(window_name)
-            return
-        data = {'name': window_name}
-        self._driver.execute(Command.SWITCH_TO_WINDOW, data)
+        self._w3c_window(window_name)
+        return
 
     def _w3c_window(self, window_name):
         def send_handle(h):