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
1eda9e7c
Commit
1eda9e7c
authored
Nov 30, 2013
by
Gregory P. Smith
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes Issue #15798 - subprocess.Popen() no longer fails if file
descriptor 0, 1 or 2 is closed.
parent
65846c6c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
6 deletions
+29
-6
Lib/subprocess.py
Lib/subprocess.py
+4
-1
Lib/test/test_subprocess.py
Lib/test/test_subprocess.py
+21
-0
Misc/NEWS
Misc/NEWS
+3
-0
Modules/_posixsubprocess.c
Modules/_posixsubprocess.c
+1
-5
No files found.
Lib/subprocess.py
View file @
1eda9e7c
...
...
@@ -1368,7 +1368,10 @@ class Popen(object):
executable_list
=
tuple
(
os
.
path
.
join
(
os
.
fsencode
(
dir
),
executable
)
for
dir
in
os
.
get_exec_path
(
env
))
fds_to_keep
=
set
(
pass_fds
)
# Never close stdin, stdout and stderr for the child.
fds_to_keep
=
{
0
,
1
,
2
}
fds_to_keep
.
update
(
pass_fds
)
# Our child uses this one to signal error before exec().
fds_to_keep
.
add
(
errpipe_write
)
self
.
pid
=
_posixsubprocess
.
fork_exec
(
args
,
executable_list
,
...
...
Lib/test/test_subprocess.py
View file @
1eda9e7c
...
...
@@ -1559,6 +1559,27 @@ class POSIXProcessTestCase(BaseTestCase):
# all standard fds closed.
self
.
check_close_std_fds
([
0
,
1
,
2
])
def
test_small_errpipe_write_fd
(
self
):
"""Issue #15798: Popen should work when stdio fds are available."""
new_stdin
=
os
.
dup
(
0
)
new_stdout
=
os
.
dup
(
1
)
try
:
os
.
close
(
0
)
os
.
close
(
1
)
# Side test: if errpipe_write fails to have its CLOEXEC
# flag set this should cause the parent to think the exec
# failed. Extremely unlikely: everyone supports CLOEXEC.
subprocess
.
Popen
([
sys
.
executable
,
"-c"
,
"print('AssertionError:0:CLOEXEC failure.')"
]).
wait
()
finally
:
# Restore original stdin and stdout
os
.
dup2
(
new_stdin
,
0
)
os
.
dup2
(
new_stdout
,
1
)
os
.
close
(
new_stdin
)
os
.
close
(
new_stdout
)
def
test_remapping_std_fds
(
self
):
# open up some temporary files
temps
=
[
mkstemp
()
for
i
in
range
(
3
)]
...
...
Misc/NEWS
View file @
1eda9e7c
...
...
@@ -18,6 +18,9 @@ Core and Builtins
Library
-------
- Issue #15798: Fixed subprocess.Popen() to no longer fail if file
descriptor 0, 1 or 2 is closed.
- Issue #19088: Fixed incorrect caching of the copyreg module in
object.__reduce__() and object.__reduce_ex__().
...
...
Modules/_posixsubprocess.c
View file @
1eda9e7c
...
...
@@ -449,7 +449,7 @@ child_exec(char *const exec_array[],
local_max_fd
=
max_fd
;
#endif
/* TODO HP-UX could use pstat_getproc() if anyone cares about it. */
_close_open_fd_range
(
3
,
local_max_fd
,
py_fds_to_keep
);
_close_open_fd_range
(
0
,
local_max_fd
,
py_fds_to_keep
);
}
/* This loop matches the Lib/os.py _execvpe()'s PATH search when */
...
...
@@ -526,10 +526,6 @@ subprocess_fork_exec(PyObject* self, PyObject *args)
&
restore_signals
,
&
call_setsid
,
&
preexec_fn
))
return
NULL
;
if
(
close_fds
&&
errpipe_write
<
3
)
{
/* precondition */
PyErr_SetString
(
PyExc_ValueError
,
"errpipe_write must be >= 3"
);
return
NULL
;
}
if
(
PySequence_Length
(
py_fds_to_keep
)
<
0
)
{
PyErr_SetString
(
PyExc_ValueError
,
"cannot get length of fds_to_keep"
);
return
NULL
;
...
...
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