_setup_pipes: os.set_inheritable() for Python 3.4

diff --git a/pym/portage/process.py b/pym/portage/process.py
index 20ef97d4d6c5549a2bc54ccdf3c9b6bb31fe0961..3ec6d70cf9a0c18a56b12a2d6bb2f22cf62ef3e6 100644 (file)
--- a/pym/portage/process.py
+++ b/pym/portage/process.py
@@ -437,7 +437,7 @@ def _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, uid, umask,
        # the parent process (see bug #289486).
        signal.signal(signal.SIGQUIT, signal.SIG_DFL)
 
-       _setup_pipes(fd_pipes, close_fds=close_fds)
+       _setup_pipes(fd_pipes, close_fds=close_fds, inheritable=True)
 
        # Add to cgroup
        # it's better to do it from the child since we can guarantee
@@ -502,7 +502,7 @@ def _exec(binary, mycommand, opt_name, fd_pipes, env, gid, groups, uid, umask,
        # And switch to the new process.
        os.execve(binary, myargs, env)
 
-def _setup_pipes(fd_pipes, close_fds=True):
+def _setup_pipes(fd_pipes, close_fds=True, inheritable=None):
        """Setup pipes for a forked process.
 
        Even when close_fds is False, file descriptors referenced as
@@ -538,6 +538,13 @@ def _setup_pipes(fd_pipes, close_fds=True):
        actually does nothing in this case), which avoids possible
        interference.
        """
+
+       # Support PEP 446 for Python >=3.4
+       try:
+               set_inheritable = _os.set_inheritable
+       except AttributeError:
+               set_inheritable = None
+
        reverse_map = {}
        # To protect from cases where direct assignment could
        # clobber needed fds ({1:2, 2:1}) we create a reverse map
@@ -570,6 +577,12 @@ def _setup_pipes(fd_pipes, close_fds=True):
                        if oldfd != newfd:
                                os.dup2(oldfd, newfd)
 
+                       if set_inheritable is not None:
+                               if inheritable is not None:
+                                       set_inheritable(newfd, inheritable)
+                               elif newfd in (0, 1, 2):
+                                       set_inheritable(newfd, True)
+
                if oldfd not in fd_pipes:
                        # If oldfd is not a key in fd_pipes, then it's safe
                        # to close now, since we've already made all of the