From: Brian Curtin <brian@python.org>
Date: Fri, 29 Apr 2011 21:11:30 +0000 (-0500)
Subject: merge
X-Git-Tag: v3.2.1b1~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=08fd8d93f75a265058b9fa6cc8e757490f4ee3dc;p=thirdparty%2FPython%2Fcpython.git

merge
---

08fd8d93f75a265058b9fa6cc8e757490f4ee3dc
diff --cc Lib/subprocess.py
index b3fb9355c9bd,299f73e711a8..9856e6a33306
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@@ -415,8 -371,15 +415,15 @@@ __all__ = ["Popen", "PIPE", "STDOUT", "
             "getoutput", "check_output", "CalledProcessError"]
  
  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,
++    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",
++    __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: