use ENV variables for custom driver locations

Author: Delta456

py/selenium/webdriver/chromium/service.py

@@ -39,9 +39,11 @@ def __init__(
         service_args: typing.Optional[typing.List[str]] = None,
         log_output: SubprocessStdAlias = None,
         env: typing.Optional[typing.Mapping[str, str]] = None,
+        driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []
+        driver_path_env_key = driver_path_env_key or 'SE_CHROMEDRIVER'
 
         if isinstance(log_output, str):
             self.service_args.append(f"--log-path={log_output}")
@@ -56,6 +58,7 @@ def __init__(
             port=port,
             env=env,
             log_output=self.log_output,
+            driver_path_env_key=driver_path_env_key,
             **kwargs,
         )
 

py/selenium/webdriver/chromium/webdriver.py

@@ -51,7 +51,7 @@ def __init__(
             options.binary_location = finder.get_browser_path()
             options.browser_version = None
 
-        self.service.path = finder.get_driver_path()
+        self.service.path = finder.get_driver_path() or self.service.env_path()
         self.service.start()
 
         executor = ChromiumRemoteConnection(

py/selenium/webdriver/common/service.py

@@ -25,7 +25,7 @@
 from platform import system
 from subprocess import PIPE
 from time import sleep
-from typing import cast
+from typing import cast, Optional
 from urllib import request
 from urllib.error import URLError
 
@@ -53,6 +53,7 @@ def __init__(
         port: int = 0,
         log_output: SubprocessStdAlias = None,
         env: typing.Optional[typing.Mapping[typing.Any, typing.Any]] = None,
+        driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
         if isinstance(log_output, str):
@@ -70,6 +71,7 @@ def __init__(
         self.popen_kw = kwargs.pop("popen_kw", {})
         self.creation_flags = self.popen_kw.pop("creation_flags", 0)
         self.env = env or os.environ
+        self.DRIVER_PATH_ENV_KEY = driver_path_env_key
 
     @property
     def service_url(self) -> str:
@@ -236,3 +238,5 @@ def _start_process(self, path: str) -> None:
                     f"'{os.path.basename(self._path)}' executable may have wrong permissions."
                 ) from err
             raise
+    def env_path(self) -> Optional[str]:
+        return os.getenv(self.DRIVER_PATH_ENV_KEY, None)

py/selenium/webdriver/edge/service.py

@@ -40,15 +40,18 @@ def __init__(
         log_output: SubprocessStdAlias = None,
         service_args: typing.Optional[typing.List[str]] = None,
         env: typing.Optional[typing.Mapping[str, str]] = None,
+        driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []
+        driver_path_env_key = driver_path_env_key or 'SE_EDGEDRIVER'
 
         super().__init__(
             executable_path=executable_path,
             port=port,
             service_args=service_args,
             log_output=log_output,
             env=env,
+            driver_path_env_key=driver_path_env_key,
             **kwargs,
         )

py/selenium/webdriver/firefox/service.py

@@ -40,15 +40,18 @@ def __init__(
         service_args: typing.Optional[typing.List[str]] = None,
         log_output: SubprocessStdAlias = None,
         env: typing.Optional[typing.Mapping[str, str]] = None,
+        driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []
+        driver_path_env_key = driver_path_env_key or "SE_GECKODRIVER"
 
         super().__init__(
             executable_path=executable_path,
             port=port,
             log_output=log_output,
             env=env,
+            driver_path_env_key=driver_path_env_key,
             **kwargs,
         )
 

py/selenium/webdriver/firefox/webdriver.py

@@ -58,7 +58,7 @@ def __init__(
             options.binary_location = finder.get_browser_path()
             options.browser_version = None
 
-        self.service.path = finder.get_driver_path()
+        self.service.path = finder.get_driver_path() or self.service.env_path()
         self.service.start()
 
         executor = FirefoxRemoteConnection(

py/selenium/webdriver/ie/service.py

@@ -32,6 +32,7 @@ def __init__(
         service_args: typing.Optional[typing.List[str]] = None,
         log_level: typing.Optional[str] = None,
         log_output: SubprocessStdAlias = None,
+        driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
         """Creates a new instance of the Service.
@@ -46,6 +47,8 @@ def __init__(
            Default is "stdout".
         """
         self.service_args = service_args or []
+        driver_path_env_key = driver_path_env_key or 'SE_IEDRIVER'
+
         if host:
             self.service_args.append(f"--host={host}")
         if log_level:
@@ -55,6 +58,7 @@ def __init__(
             executable_path=executable_path,
             port=port,
             log_output=log_output,
+            driver_path_env_key=driver_path_env_key,
             **kwargs,
         )
 

py/selenium/webdriver/ie/webdriver.py

@@ -46,7 +46,7 @@ def __init__(
         self.service = service if service else Service()
         options = options if options else Options()
 
-        self.service.path = DriverFinder(self.service, options).get_driver_path()
+        self.service.path = DriverFinder(self.service, options).get_driver_path() or self.service.env_path()
         self.service.start()
 
         executor = RemoteConnection(

py/selenium/webdriver/safari/service.py

@@ -37,15 +37,18 @@ def __init__(
         service_args: typing.Optional[typing.List[str]] = None,
         env: typing.Optional[typing.Mapping[str, str]] = None,
         reuse_service=False,
+        driver_path_env_key: str = None,
         **kwargs,
     ) -> None:
         self.service_args = service_args or []
+        driver_path_env_key = driver_path_env_key or 'SE_SAFARIDRIVER'
 
         self.reuse_service = reuse_service
         super().__init__(
             executable_path=executable_path,
             port=port,
             env=env,
+            driver_path_env_key=driver_path_env_key,
             **kwargs,
         )
 

py/selenium/webdriver/safari/webdriver.py

@@ -45,7 +45,7 @@ def __init__(
         self.service = service if service else Service()
         options = options if options else Options()
 
-        self.service.path = DriverFinder(self.service, options).get_driver_path()
+        self.service.path = DriverFinder(self.service, options).get_driver_path() or self.service.env_path()
 
         if not self.service.reuse_service:
             self.service.start()