diff options
| -rw-r--r-- | Doc/whatsnew/3.8.rst | 3 | ||||
| -rw-r--r-- | Lib/subprocess.py | 13 | ||||
| -rw-r--r-- | Lib/test/pythoninfo.py | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst index 053fe90..05fb4ff 100644 --- a/Doc/whatsnew/3.8.rst +++ b/Doc/whatsnew/3.8.rst @@ -281,8 +281,7 @@ Optimizations * *close_fds* is false; * *preexec_fn*, *pass_fds*, *cwd*, *stdin*, *stdout*, *stderr* and - *start_new_session* parameters are not set; - * the *executable* path contains a directory. + *start_new_session* parameters are not set. * :func:`shutil.copyfile`, :func:`shutil.copy`, :func:`shutil.copy2`, :func:`shutil.copytree` and :func:`shutil.move` use platform-specific diff --git a/Lib/subprocess.py b/Lib/subprocess.py index b94575b..d63cf20 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -655,6 +655,7 @@ def _use_posix_spawn(): _USE_POSIX_SPAWN = _use_posix_spawn() +_HAVE_POSIX_SPAWNP = hasattr(os, 'posix_spawnp') class Popen(object): @@ -1442,7 +1443,10 @@ class Popen(object): 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: env = os.environ @@ -1456,7 +1460,10 @@ class Popen(object): sigset.append(signum) kwargs['setsigdef'] = sigset - self.pid = os.posix_spawn(executable, args, env, **kwargs) + if _HAVE_POSIX_SPAWNP: + self.pid = os.posix_spawnp(executable, args, env, **kwargs) + else: + self.pid = os.posix_spawn(executable, args, env, **kwargs) def _execute_child(self, args, executable, preexec_fn, close_fds, pass_fds, cwd, env, @@ -1484,7 +1491,7 @@ class Popen(object): executable = args[0] if (_USE_POSIX_SPAWN - and os.path.dirname(executable) + and (_HAVE_POSIX_SPAWNP or os.path.dirname(executable)) and preexec_fn is None and not close_fds and not pass_fds diff --git a/Lib/test/pythoninfo.py b/Lib/test/pythoninfo.py index 7e94a31..93d87be 100644 --- a/Lib/test/pythoninfo.py +++ b/Lib/test/pythoninfo.py @@ -612,7 +612,8 @@ def collect_get_config(info_add): def collect_subprocess(info_add): 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): |