From: Brian Curtin <brian@python.org>
Date: Fri, 29 Apr 2011 21:14:55 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.3.0a1~2463
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8f8b4e54b42b2e9b007569836c34cc5fec32910;p=thirdparty%2FPython%2Fcpython.git

merge
---

b8f8b4e54b42b2e9b007569836c34cc5fec32910
diff --cc Lib/subprocess.py
index e4bb78e87991,9856e6a33306..ad362231304f
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@@ -432,11 -412,18 +432,18 @@@ else
              return fds
  
  __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput",
 -           "getoutput", "check_output", "CalledProcessError"]
 +           "getoutput", "check_output", "CalledProcessError", "DEVNULL"]
  
  if mswindows:
-     from _subprocess import CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP
-     __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP"])
+     from _subprocess import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
+                              STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
+                              STD_ERROR_HANDLE, SW_HIDE,
+                              STARTF_USESTDHANDLES, STARTF_USESHOWWINDOW)
+                 
+     __all__.extend(["CREATE_NEW_CONSOLE", "CREATE_NEW_PROCESS_GROUP",
+                     "STD_INPUT_HANDLE", "STD_OUTPUT_HANDLE",
+                     "STD_ERROR_HANDLE", "SW_HIDE",
+                     "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW"])
  try:
      MAXFD = os.sysconf("SC_OPEN_MAX")
  except: