[Python-checkins] cpython (merge 3.2 -> default): merge

Fri Apr 29 23:29:18 CEST 2011

http://hg.python.org/cpython/rev/c73875eaa9ac
changeset: 69691:c73875eaa9ac
parent: 69688:b41eef4b1804
parent: 69690:4c3ae7d04664
user: Brian Curtin <brian at python.org>
date: Fri Apr 29 16:14:55 2011 -0500
summary:
 merge
files:
 Lib/subprocess.py | 11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -435,8 +435,15 @@
 "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:
-- 
Repository URL: http://hg.python.org/cpython
