[Python-checkins] cpython (merge 3.1 -> 3.2): merge
brian.curtin
python-checkins at python.org
Fri Apr 29 23:29:17 CEST 2011
http://hg.python.org/cpython/rev/4c3ae7d04664
changeset: 69690:4c3ae7d04664
branch: 3.2
parent: 69687:546cae2917ec
parent: 69689:80971f71b0d9
user: Brian Curtin <brian at python.org>
date: Fri Apr 29 16:11:30 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
@@ -415,8 +415,15 @@
"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, 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
More information about the Python-checkins
mailing list