[Python-checkins] r53293 - python/trunk/Lib/subprocess.py

[peter.astrand]

Author: peter.astrand
Date: Sun Jan  7 09:53:46 2007
New Revision: 53293

Modified:
   python/trunk/Lib/subprocess.py
Log:
Re-implemented fix for #1531862 once again, in a way that works with Python 2.2. Fixes bug #1603424.

Modified: python/trunk/Lib/subprocess.py
==============================================================================
--- python/trunk/Lib/subprocess.py	(original)
+++ python/trunk/Lib/subprocess.py	Sun Jan  7 09:53:46 2007
@@ -1004,8 +1004,12 @@
 
                     # Close pipe fds.  Make sure we don't close the same
                     # fd more than once, or standard fds.
-                    for fd in set((p2cread, c2pwrite, errwrite))-set((0,1,2)):
-                        if fd: os.close(fd)
+                    if p2cread and p2cread not in (0,):
+                        os.close(p2cread)
+                    if c2pwrite and c2pwrite not in (p2cread, 1):
+                        os.close(c2pwrite)
+                    if errwrite and errwrite not in (p2cread, c2pwrite, 2):
+                        os.close(errwrite)
 
                     # Close all other fds, if asked for
                     if close_fds: