summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2011-04-29 21:11:30 (GMT)
committerBrian Curtin <brian@python.org>2011-04-29 21:11:30 (GMT)
commit08fd8d93f75a265058b9fa6cc8e757490f4ee3dc (patch)
tree55661a370a6f82383af9347cefd0394aacd4b5d8
parent5c7419d4332a9929d8ba0db13d5e2c0db3aee160 (diff)
parent8b8e7f467f960390d0d7be2bd6094a4b43fe4091 (diff)
downloadcpython-08fd8d93f75a265058b9fa6cc8e757490f4ee3dc.zip
cpython-08fd8d93f75a265058b9fa6cc8e757490f4ee3dc.tar.gz
cpython-08fd8d93f75a265058b9fa6cc8e757490f4ee3dc.tar.bz2
merge
-rw-r--r--Lib/subprocess.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index b3fb935..9856e6a 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -415,8 +415,15 @@ __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput",
"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: