Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c1d6536d
Commit
c1d6536d
authored
Nov 07, 2004
by
Peter Astrand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When using shell=True on Windows, don't display a shell window by default. Fixes #1057061.
parent
80961f3c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
Lib/subprocess.py
Lib/subprocess.py
+14
-11
PC/_subprocess.c
PC/_subprocess.c
+3
-0
No files found.
Lib/subprocess.py
View file @
c1d6536d
...
...
@@ -372,11 +372,11 @@ if mswindows:
STD_OUTPUT_HANDLE
,
STD_ERROR_HANDLE
from
win32api
import
GetCurrentProcess
,
DuplicateHandle
,
\
GetModuleFileName
,
GetVersion
from
win32con
import
DUPLICATE_SAME_ACCESS
from
win32con
import
DUPLICATE_SAME_ACCESS
,
SW_HIDE
from
win32pipe
import
CreatePipe
from
win32process
import
CreateProcess
,
STARTUPINFO
,
\
GetExitCodeProcess
,
STARTF_USESTDHANDLES
,
\
CREATE_NEW_CONSOLE
STARTF_USESHOWWINDOW
,
CREATE_NEW_CONSOLE
from
win32event
import
WaitForSingleObject
,
INFINITE
,
WAIT_OBJECT_0
else
:
from
_subprocess
import
*
...
...
@@ -673,7 +673,19 @@ class Popen(object):
if
not
isinstance
(
args
,
types
.
StringTypes
):
args
=
list2cmdline
(
args
)
# Process startup details
default_startupinfo
=
STARTUPINFO
()
if
startupinfo
==
None
:
startupinfo
=
default_startupinfo
if
not
None
in
(
p2cread
,
c2pwrite
,
errwrite
):
startupinfo
.
dwFlags
|=
STARTF_USESTDHANDLES
startupinfo
.
hStdInput
=
p2cread
startupinfo
.
hStdOutput
=
c2pwrite
startupinfo
.
hStdError
=
errwrite
if
shell
:
default_startupinfo
.
dwFlags
|=
STARTF_USESHOWWINDOW
default_startupinfo
.
wShowWindow
=
SW_HIDE
comspec
=
os
.
environ
.
get
(
"COMSPEC"
,
"cmd.exe"
)
args
=
comspec
+
" /c "
+
args
if
(
GetVersion
()
>=
0x80000000
L
or
...
...
@@ -692,15 +704,6 @@ class Popen(object):
# kill children.
creationflags
|=
CREATE_NEW_CONSOLE
# Process startup details
if
startupinfo
==
None
:
startupinfo
=
STARTUPINFO
()
if
not
None
in
(
p2cread
,
c2pwrite
,
errwrite
):
startupinfo
.
dwFlags
|=
STARTF_USESTDHANDLES
startupinfo
.
hStdInput
=
p2cread
startupinfo
.
hStdOutput
=
c2pwrite
startupinfo
.
hStdError
=
errwrite
# Start the process
try
:
hp
,
ht
,
pid
,
tid
=
CreateProcess
(
executable
,
args
,
...
...
PC/_subprocess.c
View file @
c1d6536d
...
...
@@ -377,6 +377,7 @@ sp_CreateProcess(PyObject* self, PyObject* args)
/* note: we only support a small subset of all SI attributes */
si
.
dwFlags
=
getint
(
startup_info
,
"dwFlags"
);
si
.
wShowWindow
=
getint
(
startup_info
,
"wShowWindow"
);
si
.
hStdInput
=
gethandle
(
startup_info
,
"hStdInput"
);
si
.
hStdOutput
=
gethandle
(
startup_info
,
"hStdOutput"
);
si
.
hStdError
=
gethandle
(
startup_info
,
"hStdError"
);
...
...
@@ -530,6 +531,8 @@ init_subprocess()
defint
(
d
,
"STD_ERROR_HANDLE"
,
STD_ERROR_HANDLE
);
defint
(
d
,
"DUPLICATE_SAME_ACCESS"
,
DUPLICATE_SAME_ACCESS
);
defint
(
d
,
"STARTF_USESTDHANDLES"
,
STARTF_USESTDHANDLES
);
defint
(
d
,
"STARTF_USESHOWWINDOW"
,
STARTF_USESHOWWINDOW
);
defint
(
d
,
"SW_HIDE"
,
SW_HIDE
);
defint
(
d
,
"INFINITE"
,
INFINITE
);
defint
(
d
,
"WAIT_OBJECT_0"
,
WAIT_OBJECT_0
);
defint
(
d
,
"CREATE_NEW_CONSOLE"
,
CREATE_NEW_CONSOLE
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment