Merge branch 'trunk' into py-use-chrome-for-remote-tests

Author: cgoldberg

py/selenium/webdriver/chrome/service.py

@@ -27,11 +27,17 @@ class Service(service.ChromiumService):
     """A Service class that is responsible for the starting and stopping of
     `chromedriver`.
 
-    :param executable_path: install path of the chromedriver executable, defaults to `chromedriver`.
-    :param port: Port for the service to run on, defaults to 0 where the operating system will decide.
-    :param service_args: (Optional) Sequence of args to be passed to the subprocess when launching the executable.
-    :param log_output: (Optional) int representation of STDOUT/DEVNULL, any IO instance or String path to file.
-    :param env: (Optional) Mapping of environment variables for the new process, defaults to `os.environ`.
+    Args:
+        executable_path: Install path of the chromedriver executable, defaults
+            to `chromedriver`.
+        port: Port for the service to run on, defaults to 0 where the operating
+            system will decide.
+        service_args: (Optional) Sequence of args to be passed to the subprocess
+            when launching the executable.
+        log_output: (Optional) int representation of STDOUT/DEVNULL, any IO
+            instance or String path to file.
+        env: (Optional) Mapping of environment variables for the new process,
+            defaults to `os.environ`.
     """
 
     def __init__(

py/selenium/webdriver/chromium/service.py

@@ -27,12 +27,18 @@ class ChromiumService(service.Service):
     """A Service class that is responsible for the starting and stopping the
     WebDriver instance of the ChromiumDriver.
 
-    :param executable_path: install path of the executable.
-    :param port: Port for the service to run on, defaults to 0 where the operating system will decide.
-    :param service_args: (Optional) Sequence of args to be passed to the subprocess when launching the executable.
-    :param log_output: (Optional) int representation of STDOUT/DEVNULL, any IO instance or String path to file.
-    :param env: (Optional) Mapping of environment variables for the new process, defaults to `os.environ`.
-    :param driver_path_env_key: (Optional) Environment variable to use to get the path to the driver executable.
+    Args:
+        executable_path: Install path of the executable.
+        port: Port for the service to run on, defaults to 0 where the operating
+            system will decide.
+        service_args: (Optional) Sequence of args to be passed to the subprocess
+            when launching the executable.
+        log_output: (Optional) int representation of STDOUT/DEVNULL, any IO
+            instance or String path to file.
+        env: (Optional) Mapping of environment variables for the new process,
+            defaults to `os.environ`.
+        driver_path_env_key: (Optional) Environment variable to use to get the
+            path to the driver executable.
     """
 
     def __init__(

py/selenium/webdriver/webkitgtk/service.py

@@ -29,13 +29,17 @@ class Service(service.Service):
     """A Service class that is responsible for the starting and stopping of
     `WebKitWebDriver`.
 
-    :param executable_path: install path of the WebKitWebDriver executable, defaults to the first
-        `WebKitWebDriver` in `$PATH`.
-    :param port: Port for the service to run on, defaults to 0 where the operating system will decide.
-    :param service_args: (Optional) Sequence of args to be passed to the subprocess when launching the executable.
-    :param log_output: (Optional) File path for the file to be opened and passed as the subprocess
-        stdout/stderr handler.
-    :param env: (Optional) Mapping of environment variables for the new process, defaults to `os.environ`.
+    Args:
+        executable_path: Install path of the WebKitWebDriver executable,
+            defaults to the first `WebKitWebDriver` in `$PATH`.
+        port: Port for the service to run on, defaults to 0 where the
+            operating system will decide.
+        service_args: (Optional) Sequence of args to be passed to the
+            subprocess when launching the executable.
+        log_output: (Optional) File path for the file to be opened and passed
+            as the subprocess stdout/stderr handler.
+        env: (Optional) Mapping of environment variables for the new process,
+            defaults to `os.environ`.
     """
 
     def __init__(

py/selenium/webdriver/wpewebkit/service.py

@@ -28,13 +28,17 @@ class Service(service.Service):
     """A Service class that is responsible for the starting and stopping of
     `WPEWebDriver`.
 
-    :param executable_path: install path of the WPEWebDriver executable, defaults to the first
-        `WPEWebDriver` in `$PATH`.
-    :param port: Port for the service to run on, defaults to 0 where the operating system will decide.
-    :param service_args: (Optional) Sequence of args to be passed to the subprocess when launching the executable.
-    :param log_output: (Optional) File path for the file to be opened and passed as the subprocess
-        stdout/stderr handler.
-    :param env: (Optional) Mapping of environment variables for the new process, defaults to `os.environ`.
+    Args:
+        executable_path: Install path of the WPEWebDriver executable, defaults
+            to the first `WPEWebDriver` in `$PATH`.
+        port: Port for the service to run on, defaults to 0 where the
+            operating system will decide.
+        service_args: (Optional) Sequence of args to be passed to the
+            subprocess when launching the executable.
+        log_output: (Optional) File path for the file to be opened and passed
+            as the subprocess stdout/stderr handler.
+        env: (Optional) Mapping of environment variables for the new process,
+            defaults to `os.environ`.
     """
 
     def __init__(