python safaridriver requires apple's implementation now. one must use remote with 2.X version of standalone for the legacy version

Author: lukeis

py/selenium/webdriver/safari/service.py

@@ -25,21 +25,17 @@ class Service(service.Service):
     Object that manages the starting and stopping of the SafariDriver
     """
 
-    def __init__(self, executable_path=None, port=0, quiet=False, use_legacy=False):
+    def __init__(self, port=0, quiet=False):
         """
         Creates a new instance of the Service
 
         :Args:
          - executable_path : Path to the SafariDriver
          - port : Port the service is running on """
 
-        if not use_legacy and os.path.exists('/usr/bin/safaridriver'):
-            path = '/usr/bin/safaridriver'
-            self.legacy_driver = False
-        else:
-            path = 'java'
-            self.standalone_jar = executable_path
-            self.legacy_driver = True
+        path = '/usr/bin/safaridriver'
+        if not os.path.exists(path):
+            raise Exception("SafariDriver requires Safari 10 on OSX El Capitan or greater")
 
         if port == 0:
             port = utils.free_port()
@@ -51,16 +47,11 @@ def __init__(self, executable_path=None, port=0, quiet=False, use_legacy=False):
         service.Service.__init__(self, path, port, log)
 
     def command_line_args(self):
-        if self.legacy_driver:
-            return ["-jar", self.standalone_jar, "-port", "%s" % self.port]
         return ["-p", "%s" % self.port]
 
     @property
     def service_url(self):
         """
         Gets the url of the SafariDriver Service
         """
-        if not self.legacy_driver:
-            return "http://localhost:%d" % self.port
-        else:
-            return "http://localhost:%d/wd/hub" % self.port
+        return "http://localhost:%d" % self.port

py/selenium/webdriver/safari/webdriver.py

@@ -32,22 +32,18 @@ class WebDriver(RemoteWebDriver):
 
     """
 
-    def __init__(self, executable_path=None, port=0,
-                 desired_capabilities=DesiredCapabilities.SAFARI, quiet=False, use_legacy_driver=False):
+    def __init__(self, port=0, desired_capabilities=DesiredCapabilities.SAFARI, quiet=False):
         """
         Creates a new instance of the Safari driver.
 
         Starts the service and then creates new instance of Safari Driver.
 
         :Args:
-         - executable_path - path to the executable. If the default is used it assumes the executable is in the
-           Environment Variable SELENIUM_SERVER_JAR
          - port - port you would like the service to run, if left as 0, a free port will be found.
          - desired_capabilities: Dictionary object with desired capabilities (Can be used to provide various Safari switches).
+         - quiet - set to True to suppress stdout and stderr of the driver
         """
-        if not executable_path is None:
-            executable_path = os.environ.get("SELENIUM_SERVER_JAR")
-        self.service = Service(executable_path, port=port, quiet=quiet, use_legacy=use_legacy_driver)
+        self.service = Service(port=port, quiet=quiet)
         self.service.start()
 
         RemoteWebDriver.__init__(