[py] moved static method get_path to SeleniumManager class

py/selenium/webdriver/chromium/webdriver.py

@@ -16,8 +16,8 @@
 # under the License.
 
 from selenium.webdriver.chromium.remote_connection import ChromiumRemoteConnection
-from selenium.webdriver.common.driver_finder import DriverFinder
 from selenium.webdriver.common.options import ArgOptions
+from selenium.webdriver.common.selenium_manager import SeleniumManager
 from selenium.webdriver.common.service import Service
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
@@ -48,7 +48,7 @@ def __init__(
 
         self.service = service
 
-        self.service.path = DriverFinder.get_path(self.service, options)
+        self.service.path = SeleniumManager.get_path(self.service, options)
 
         self.service.start()
 

py/selenium/webdriver/common/selenium_manager.py

@@ -21,8 +21,10 @@
 from pathlib import Path
 from typing import List
 
+from selenium.common import NoSuchDriverException
 from selenium.common import WebDriverException
 from selenium.webdriver.common.options import BaseOptions
+from selenium.webdriver.common.service import Service
 
 logger = logging.getLogger(__name__)
 
@@ -99,6 +101,22 @@ def driver_location(self, options: BaseOptions) -> str:
 
         return driver_path
 
+    @staticmethod
+    def get_path(service: Service, options: BaseOptions) -> str:
+        """Returns the path of the driver if it is present and executable."""
+
+        path = service.path
+        try:
+            path = SeleniumManager().driver_location(options) if path is None else path
+        except Exception as err:
+            msg = f"Unable to obtain driver for {options.capabilities['browserName']} using Selenium Manager."
+            raise NoSuchDriverException(msg) from err
+
+        if path is None or not Path(path).is_file():
+            raise NoSuchDriverException(f"Unable to locate or obtain driver for {options.capabilities['browserName']}")
+
+        return path
+
     @staticmethod
     def run(args: List[str]) -> dict:
         """

py/selenium/webdriver/firefox/webdriver.py

@@ -22,7 +22,7 @@
 from contextlib import contextmanager
 from io import BytesIO
 
-from selenium.webdriver.common.driver_finder import DriverFinder
+from selenium.webdriver.common.selenium_manager import SeleniumManager
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
 from .options import Options
@@ -56,7 +56,7 @@ def __init__(
         self.service = service if service else Service()
         options = options if options else Options()
 
-        self.service.path = DriverFinder.get_path(self.service, options)
+        self.service.path = SeleniumManager.get_path(self.service, options)
         self.service.start()
 
         executor = FirefoxRemoteConnection(

py/selenium/webdriver/ie/webdriver.py

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-from selenium.webdriver.common.driver_finder import DriverFinder
+from selenium.webdriver.common.selenium_manager import SeleniumManager
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
@@ -46,7 +46,7 @@ def __init__(
         self.service = service if service else Service()
         options = options if options else Options()
 
-        self.service.path = DriverFinder.get_path(self.service, options)
+        self.service.path = SeleniumManager.get_path(self.service, options)
         self.service.start()
 
         executor = RemoteConnection(

py/selenium/webdriver/safari/webdriver.py

@@ -21,7 +21,7 @@
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
-from ..common.driver_finder import DriverFinder
+from ..common.selenium_manager import SeleniumManager
 from .options import Options
 from .remote_connection import SafariRemoteConnection
 from .service import Service
@@ -57,7 +57,7 @@ def __init__(
         self.service = service if service else Service()
         options = options if options else Options()
 
-        self.service.path = DriverFinder.get_path(self.service, options)
+        self.service.path = SeleniumManager.get_path(self.service, options)
 
         self._reuse_service = reuse_service and self.service.reuse_service
         if not self._reuse_service:

py/selenium/webdriver/webkitgtk/webdriver.py

@@ -17,7 +17,7 @@
 
 import http.client as http_client
 
-from selenium.webdriver.common.driver_finder import DriverFinder
+from selenium.webdriver.common.selenium_manager import SeleniumManager
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
 from .options import Options
@@ -60,7 +60,7 @@ def __init__(
             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.path = SeleniumManager.get_path(self.service, options)
         self.service.start()
 
         super().__init__(

py/selenium/webdriver/wpewebkit/webdriver.py

@@ -18,7 +18,7 @@
 import http.client as http_client
 
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
-from selenium.webdriver.common.driver_finder import DriverFinder
+from selenium.webdriver.common.selenium_manager import SeleniumManager
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
 from .options import Options
@@ -56,7 +56,7 @@ def __init__(
             options = Options()
 
         self.service = Service(executable_path, port=port, log_path=service_log_path)
-        self.service.path = DriverFinder.get_path(self.service, options)
+        self.service.path = SeleniumManager.get_path(self.service, options)
         self.service.start()
 
         super().__init__(command_executor=self.service.service_url, desired_capabilities=desired_capabilities)

py/test/selenium/webdriver/common/selenium_manager_tests.py

@@ -22,7 +22,6 @@
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.chrome.options import Options
 from selenium.webdriver.chrome.service import Service
-from selenium.webdriver.common.driver_finder import DriverFinder
 from selenium.webdriver.common.proxy import Proxy
 from selenium.webdriver.common.selenium_manager import SeleniumManager
 
@@ -110,4 +109,4 @@ def test_driver_finder_error(mocker):
     options = Options()
     msg = r"Unable to locate or obtain driver for chrome.*errors\/driver_location"
     with pytest.raises(WebDriverException, match=msg):
-        DriverFinder.get_path(service, options)
+        SeleniumManager.get_path(service, options)