]> granicus.if.org Git - python/commitdiff
Fix an oversight in r78946 which causes failure in the subprocess module on Windows.
authorFlorent Xicluna <florent.xicluna@gmail.com>
Sun, 14 Mar 2010 12:31:06 +0000 (12:31 +0000)
committerFlorent Xicluna <florent.xicluna@gmail.com>
Sun, 14 Mar 2010 12:31:06 +0000 (12:31 +0000)
Lib/subprocess.py

index b6afdeca563734c4c0673ac58bc2dab435974c44..89cf9bfa33c5ab3070fe6aaa8d42e151526da14f 100644 (file)
@@ -681,11 +681,11 @@ class Popen(object):
                             restore_signals, start_new_session)
 
         if mswindows:
-            if p2cwrite is not None:
+            if p2cwrite != -1:
                 p2cwrite = msvcrt.open_osfhandle(p2cwrite.Detach(), 0)
-            if c2pread is not None:
+            if c2pread != -1:
                 c2pread = msvcrt.open_osfhandle(c2pread.Detach(), 0)
-            if errread is not None:
+            if errread != -1:
                 errread = msvcrt.open_osfhandle(errread.Detach(), 0)
 
         if bufsize == 0:
@@ -909,11 +909,11 @@ class Popen(object):
             # output pipe are maintained in this process or else the
             # pipe will not close when the child process exits and the
             # ReadFile will hang.
-            if p2cread is not None:
+            if p2cread != -1:
                 p2cread.Close()
-            if c2pwrite is not None:
+            if c2pwrite != -1:
                 c2pwrite.Close()
-            if errwrite is not None:
+            if errwrite != -1:
                 errwrite.Close()