merge
This commit is contained in:
commit
b8f8b4e54b
|
@ -435,8 +435,15 @@ __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput",
|
||||||
"getoutput", "check_output", "CalledProcessError", "DEVNULL"]
|
"getoutput", "check_output", "CalledProcessError", "DEVNULL"]
|
||||||
|
|
||||||
if mswindows:
|
if mswindows:
|
||||||
from _subprocess import CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP
|
from _subprocess import (CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP,
|
||||||
__all__.extend(["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:
|
try:
|
||||||
MAXFD = os.sysconf("SC_OPEN_MAX")
|
MAXFD = os.sysconf("SC_OPEN_MAX")
|
||||||
except:
|
except:
|
||||||
|
|
Loading…
Reference in New Issue