From: Brian Curtin <brian@python.org>
Date: Fri, 29 Apr 2011 20:48:13 +0000 (-0500)
Subject: Further fix #7838. CREATE_NEW_CONSOLE was exposed, but none of the
X-Git-Tag: v3.2.1b1~51^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b8e7f467f960390d0d7be2bd6094a4b43fe4091;p=thirdparty%2FPython%2Fcpython.git

Further fix #7838. CREATE_NEW_CONSOLE was exposed, but none of the
constants to be used for STARTUPINFO were exposed due to the change.
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index e1c9eedabd19..299f73e711a8 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -344,7 +344,6 @@ class CalledProcessError(Exception):
 
 
 if mswindows:
-    from _subprocess import CREATE_NEW_CONSOLE
     import threading
     import msvcrt
     import _subprocess
@@ -372,7 +371,15 @@ __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput",
            "getoutput", "check_output", "CalledProcessError"]
 
 if mswindows:
-    __all__.append("CREATE_NEW_CONSOLE")
+    from _subprocess import (CREATE_NEW_CONSOLE,
+                             STD_INPUT_HANDLE, STD_OUTPUT_HANDLE,
+                             STD_ERROR_HANDLE, SW_HIDE,
+                             STARTF_USESTDHANDLES, STARTF_USESHOWWINDOW)
+                
+    __all__.extend(["CREATE_NEW_CONSOLE",
+                    "STD_INPUT_HANDLE", "STD_OUTPUT_HANDLE",
+                    "STD_ERROR_HANDLE", "SW_HIDE",
+                    "STARTF_USESTDHANDLES", "STARTF_USESHOWWINDOW"])
 try:
     MAXFD = os.sysconf("SC_OPEN_MAX")
 except: