commit b0042000c44bd19d0bdd8e84541cd8dc5c725d95
author Charles-François Natali <cf.natali@gmail.com> Sun Aug 25 18:27:34 2013 +0200
committer Charles-François Natali <cf.natali@gmail.com> Sun Aug 25 18:27:34 2013 +0200
tree 3935b52fe18c1187263dd958ca32cac2f1850edf
parent 879a21373623bb5536519b1a2fb4180669e96b80
parent 4c5331447561250bc1172dd4310351cf0707f056

Merge.

Lib/subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 50bec29..814cfbe 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1247,16 +1247,17 @@
                                     os.close(fd)
                                     closed.add(fd)
 
-                            # Close all other fds, if asked for
-                            if close_fds:
-                                self._close_fds(but=errpipe_write)
-
                             if cwd is not None:
                                 os.chdir(cwd)
 
                             if preexec_fn:
                                 preexec_fn()
 
+                            # Close all other fds, if asked for - after
+                            # preexec_fn(), which may open FDs.
+                            if close_fds:
+                                self._close_fds(but=errpipe_write)
+
                             if env is None:
                                 os.execvp(executable, args)
                             else: