Skip to content

bpo-30121: Fix debug assert in subprocess on Windows #1224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 18, 2017
Merged

bpo-30121: Fix debug assert in subprocess on Windows #1224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b4a65c
bpo-30121: Fix debug assert in subprocess on Windows
segevfiner Apr 20, 2017
6dd5a06
bpo-30121: Suppress debug assertion in test_subprocess when ran directly
segevfiner Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Lib/subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,10 @@ def __init__(self, args, bufsize=-1, executable=None,
to_close.append(self._devnull)
for fd in to_close:
try:
os.close(fd)
if _mswindows and isinstance(fd, Handle):
fd.Close()
else:
os.close(fd)
except OSError:
pass

Expand Down Expand Up @@ -1005,6 +1008,9 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
errwrite.Close()
if hasattr(self, '_devnull'):
os.close(self._devnull)
# Prevent a double close of these handles/fds from __init__
# on error.
self._closed_child_pipe_fds = True

# Retain the process handle, but close the thread handle
self._child_created = True
Expand Down
9 changes: 5 additions & 4 deletions Lib/test/test_subprocess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,10 +1068,11 @@ def _test_bufsize_equal_one(self, line, expected, universal_newlines):
p.stdin.write(line) # expect that it flushes the line in text mode
os.close(p.stdin.fileno()) # close it without flushing the buffer
read_line = p.stdout.readline()
try:
p.stdin.close()
except OSError:
pass
with support.SuppressCrashReport():
try:
p.stdin.close()
except OSError:
pass
p.stdin = None
self.assertEqual(p.returncode, 0)
self.assertEqual(read_line, expected)
Expand Down