Skip to content

Revert "bpo-35537: subprocess can now use os.posix_spawnp (GH-11579)" #11582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Doc/whatsnew/3.8.rst
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,8 @@ Optimizations

* *close_fds* is false;
* *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.copytree` and :func:`shutil.move` use platform-specific
Expand Down
13 changes: 3 additions & 10 deletions Lib/subprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,6 @@ def _use_posix_spawn():


_USE_POSIX_SPAWN = _use_posix_spawn()
_HAVE_POSIX_SPAWNP = hasattr(os, 'posix_spawnp')


class Popen(object):
Expand Down Expand Up @@ -1443,10 +1442,7 @@ def _get_handles(self, stdin, stdout, stderr):


def _posix_spawn(self, args, executable, env, restore_signals):
"""Execute program using os.posix_spawnp().

Or use os.posix_spawn() if os.posix_spawnp() is not available.
"""
"""Execute program using os.posix_spawn()."""
if env is None:
env = os.environ

Expand All @@ -1460,10 +1456,7 @@ def _posix_spawn(self, args, executable, env, restore_signals):
sigset.append(signum)
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,
pass_fds, cwd, env,
Expand Down Expand Up @@ -1491,7 +1484,7 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
executable = args[0]

if (_USE_POSIX_SPAWN
and (_HAVE_POSIX_SPAWNP or os.path.dirname(executable))
and os.path.dirname(executable)
and preexec_fn is None
and not close_fds
and not pass_fds
Expand Down
3 changes: 1 addition & 2 deletions Lib/test/pythoninfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,7 @@ def collect_get_config(info_add):

def collect_subprocess(info_add):
import subprocess
attrs = ('_USE_POSIX_SPAWN', '_HAVE_POSIX_SPAWNP')
copy_attributes(info_add, subprocess, 'subprocess.%s', attrs)
copy_attributes(info_add, subprocess, 'subprocess.%s', ('_USE_POSIX_SPAWN',))


def collect_info(info):
Expand Down