From 1fd7a76480680d12de266d3c9d99cd56a5413e59 Mon Sep 17 00:00:00 2001 From: sandeepsuryaprasad Date: Tue, 25 Jul 2023 21:34:13 +0530 Subject: [PATCH 1/2] [py] Using Selenium Manager to locate drivers on PATH --- py/selenium/webdriver/webkitgtk/service.py | 4 +--- py/selenium/webdriver/webkitgtk/webdriver.py | 8 ++++---- py/selenium/webdriver/wpewebkit/service.py | 4 +--- py/selenium/webdriver/wpewebkit/webdriver.py | 5 ++--- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/py/selenium/webdriver/webkitgtk/service.py b/py/selenium/webdriver/webkitgtk/service.py index 883fc0681b488..2fb37231e9e10 100644 --- a/py/selenium/webdriver/webkitgtk/service.py +++ b/py/selenium/webdriver/webkitgtk/service.py @@ -18,8 +18,6 @@ from selenium.webdriver.common import service -DEFAULT_EXECUTABLE_PATH = "WebKitWebDriver" - class Service(service.Service): """A Service class that is responsible for the starting and stopping of @@ -34,7 +32,7 @@ class Service(service.Service): def __init__( self, - executable_path: str = DEFAULT_EXECUTABLE_PATH, + executable_path: str = None, port: int = 0, log_path: typing.Optional[str] = None, service_args: typing.Optional[typing.List[str]] = None, diff --git a/py/selenium/webdriver/webkitgtk/webdriver.py b/py/selenium/webdriver/webkitgtk/webdriver.py index b364ca5f192be..d6d2f21294262 100644 --- a/py/selenium/webdriver/webkitgtk/webdriver.py +++ b/py/selenium/webdriver/webkitgtk/webdriver.py @@ -21,7 +21,6 @@ from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver from .options import Options -from .service import DEFAULT_EXECUTABLE_PATH from .service import Service @@ -30,7 +29,7 @@ class WebDriver(RemoteWebDriver): def __init__( self, - executable_path=DEFAULT_EXECUTABLE_PATH, + executable_path=None, port=0, options=None, desired_capabilities=None, @@ -59,8 +58,9 @@ def __init__( capabilities.update(desired_capabilities) desired_capabilities = capabilities - self.service = Service(executable_path, port=port, log_path=service_log_path) - self.service.path = DriverFinder.get_path(self.service, options) + self.service = Service() + self.options = options + self.service.path = DriverFinder.get_path(self.service, self.options) self.service.start() super().__init__( diff --git a/py/selenium/webdriver/wpewebkit/service.py b/py/selenium/webdriver/wpewebkit/service.py index 4dbb35a490e75..dcf9bbe01192b 100644 --- a/py/selenium/webdriver/wpewebkit/service.py +++ b/py/selenium/webdriver/wpewebkit/service.py @@ -18,8 +18,6 @@ from selenium.webdriver.common import service -DEFAULT_EXECUTABLE_PATH = "WPEWebDriver" - class Service(service.Service): """A Service class that is responsible for the starting and stopping of @@ -34,7 +32,7 @@ class Service(service.Service): def __init__( self, - executable_path: str = DEFAULT_EXECUTABLE_PATH, + executable_path: str = None, port: int = 0, log_path: typing.Optional[str] = None, service_args: typing.Optional[typing.List[str]] = None, diff --git a/py/selenium/webdriver/wpewebkit/webdriver.py b/py/selenium/webdriver/wpewebkit/webdriver.py index fe98ba6907c63..e0e5445c539ee 100644 --- a/py/selenium/webdriver/wpewebkit/webdriver.py +++ b/py/selenium/webdriver/wpewebkit/webdriver.py @@ -22,7 +22,6 @@ from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver from .options import Options -from .service import DEFAULT_EXECUTABLE_PATH from .service import Service @@ -31,7 +30,7 @@ class WebDriver(RemoteWebDriver): def __init__( self, - executable_path=DEFAULT_EXECUTABLE_PATH, + executable_path=None, port=0, options=None, desired_capabilities=DesiredCapabilities.WPEWEBKIT, @@ -55,7 +54,7 @@ def __init__( else: options = Options() - self.service = Service(executable_path, port=port, log_path=service_log_path) + self.service = Service() self.service.path = DriverFinder.get_path(self.service, options) self.service.start() From cf55436c75ddb9de41f02693b28e2515bc3db75e Mon Sep 17 00:00:00 2001 From: sandeepsuryaprasad Date: Tue, 25 Jul 2023 21:41:26 +0530 Subject: [PATCH 2/2] [py] Using Selenium Manager to locate drivers on PATH --- py/selenium/webdriver/webkitgtk/webdriver.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/py/selenium/webdriver/webkitgtk/webdriver.py b/py/selenium/webdriver/webkitgtk/webdriver.py index d6d2f21294262..7800a7605b973 100644 --- a/py/selenium/webdriver/webkitgtk/webdriver.py +++ b/py/selenium/webdriver/webkitgtk/webdriver.py @@ -59,8 +59,7 @@ def __init__( desired_capabilities = capabilities self.service = Service() - self.options = options - self.service.path = DriverFinder.get_path(self.service, self.options) + self.service.path = DriverFinder.get_path(self.service, options) self.service.start() super().__init__(