[py]: simplify service kwarg handling in the service base class

symonk · symonk · commit 393ba87b64c4 · 2023-03-11T21:37:26.000Z
diff --git a/py/CHANGES b/py/CHANGES
@@ -1,7 +1,6 @@
 Selenium 4.8.3
-* More fine grained control for `Service` subprocesses is now available via passing a `popen_kw` keyed map to any `Service` instance.
-* `Service` classes can now control `close_fds` and `creationflags` via `**kwargs` on any `Service` instance.
-* Setting `timeouts` on an `Options` instance no longer raises an exception for subsets of supported timeouts. (#11623)
+* Add fine grained control for arguments provided to service subprocesses by passing a `popen_kw` mapping for all services.
+* `Options` classes now allow `timeout` to be set partially and no longer raise an exception when all values are not provided. (#11623)
 * No longer sending `SIGKILL` to subprocesses in instances where `SIGTERM` was successful within 60 seconds.
 
 Selenium 4.8.2
diff --git a/py/selenium/webdriver/common/service.py b/py/selenium/webdriver/common/service.py
@@ -65,10 +65,9 @@ def __init__(
         self.log_file = open(os.devnull, "wb") if not _HAS_NATIVE_DEVNULL and log_file == DEVNULL else log_file
         self.start_error_message = start_error_message or ""
         # Default value for every python subprocess: subprocess.Popen(..., creationflags=0)
-        self.creation_flags = kwargs.pop("creation_flags", 0)
-        self.close_fds = kwargs.pop("close_fds") or system() != "Windows"
-        self.env = env or os.environ
         self.popen_kw = kwargs.pop("popen_kw", {})
+        self.creation_flags = self.popen_kw.pop("creation_flags", 0)
+        self.env = env or os.environ
 
     @property
     def service_url(self) -> str:
@@ -199,11 +198,12 @@ def _start_process(self, path: str) -> None:
         """
         cmd = [path]
         cmd.extend(self.command_line_args())
+        close_file_descriptors = self.popen_kw.pop("close_fds") or system() != "Windows"
         try:
             self.process = subprocess.Popen(
                 cmd,
                 env=self.env,
-                close_fds=self.close_fds,
+                close_fds=close_file_descriptors,
                 stdout=self.log_file,
                 stderr=self.log_file,
                 stdin=PIPE,
