Commit 07858894 authored by Victor Stinner's avatar Victor Stinner Committed by GitHub

bpo-35537: subprocess can now use os.posix_spawnp (GH-11579)

The subprocess module can now use the os.posix_spawnp() function,
if it is available, to locate the program in the PATH.
parent 92b8322e
...@@ -281,8 +281,7 @@ Optimizations ...@@ -281,8 +281,7 @@ Optimizations
* *close_fds* is false; * *close_fds* is false;
* *preexec_fn*, *pass_fds*, *cwd*, *stdin*, *stdout*, *stderr* and * *preexec_fn*, *pass_fds*, *cwd*, *stdin*, *stdout*, *stderr* and
*start_new_session* parameters are not set; *start_new_session* parameters are not set.
* the *executable* path contains a directory.
* :func:`shutil.copyfile`, :func:`shutil.copy`, :func:`shutil.copy2`, * :func:`shutil.copyfile`, :func:`shutil.copy`, :func:`shutil.copy2`,
:func:`shutil.copytree` and :func:`shutil.move` use platform-specific :func:`shutil.copytree` and :func:`shutil.move` use platform-specific
......
...@@ -655,6 +655,7 @@ def _use_posix_spawn(): ...@@ -655,6 +655,7 @@ def _use_posix_spawn():
_USE_POSIX_SPAWN = _use_posix_spawn() _USE_POSIX_SPAWN = _use_posix_spawn()
_HAVE_POSIX_SPAWNP = hasattr(os, 'posix_spawnp')
class Popen(object): class Popen(object):
...@@ -1442,7 +1443,10 @@ class Popen(object): ...@@ -1442,7 +1443,10 @@ class Popen(object):
def _posix_spawn(self, args, executable, env, restore_signals): def _posix_spawn(self, args, executable, env, restore_signals):
"""Execute program using os.posix_spawn().""" """Execute program using os.posix_spawnp().
Or use os.posix_spawn() if os.posix_spawnp() is not available.
"""
if env is None: if env is None:
env = os.environ env = os.environ
...@@ -1456,6 +1460,9 @@ class Popen(object): ...@@ -1456,6 +1460,9 @@ class Popen(object):
sigset.append(signum) sigset.append(signum)
kwargs['setsigdef'] = sigset kwargs['setsigdef'] = sigset
if _HAVE_POSIX_SPAWNP:
self.pid = os.posix_spawnp(executable, args, env, **kwargs)
else:
self.pid = os.posix_spawn(executable, args, env, **kwargs) self.pid = os.posix_spawn(executable, args, env, **kwargs)
def _execute_child(self, args, executable, preexec_fn, close_fds, def _execute_child(self, args, executable, preexec_fn, close_fds,
...@@ -1484,7 +1491,7 @@ class Popen(object): ...@@ -1484,7 +1491,7 @@ class Popen(object):
executable = args[0] executable = args[0]
if (_USE_POSIX_SPAWN if (_USE_POSIX_SPAWN
and os.path.dirname(executable) and (_HAVE_POSIX_SPAWNP or os.path.dirname(executable))
and preexec_fn is None and preexec_fn is None
and not close_fds and not close_fds
and not pass_fds and not pass_fds
......
...@@ -612,7 +612,8 @@ def collect_get_config(info_add): ...@@ -612,7 +612,8 @@ def collect_get_config(info_add):
def collect_subprocess(info_add): def collect_subprocess(info_add):
import subprocess import subprocess
copy_attributes(info_add, subprocess, 'subprocess.%s', ('_USE_POSIX_SPAWN',)) attrs = ('_USE_POSIX_SPAWN', '_HAVE_POSIX_SPAWNP')
copy_attributes(info_add, subprocess, 'subprocess.%s', attrs)
def collect_info(info): def collect_info(info):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment