mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge with 3.1

Browse source
This commit is contained in:
Ross Lagerwall 2011-04-05 15:48:47 +02:00
commit 02ba73c0ef
4 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Lib/subprocess.py
View file

@ -345,6 +345,7 @@ import gc
import signal
import builtins
import warnings
import errno
# Exception classes used by this module.
class CalledProcessError(Exception):
@ -376,7 +377,6 @@ if mswindows:
else:
import select
_has_poll = hasattr(select, 'poll')
import errno
import fcntl
import pickle
@ -785,7 +785,11 @@ class Popen(object):
stderr = None
if self.stdin:
if input:
self.stdin.write(input)
try:
self.stdin.write(input)
except IOError as e:
if e.errno != errno.EPIPE and e.errno != errno.EINVAL:
raise
self.stdin.close()
elif self.stdout:
stdout = self.stdout.read()
@ -1019,7 +1023,11 @@ class Popen(object):
if self.stdin:
if input is not None:
self.stdin.write(input)
try:
self.stdin.write(input)
except IOError as e:
if e.errno != errno.EPIPE:
raise
self.stdin.close()
if self.stdout:
@ -1455,9 +1463,16 @@ class Popen(object):
for fd, mode in ready:
if mode & select.POLLOUT:
chunk = input[input_offset : input_offset + _PIPE_BUF]
input_offset += os.write(fd, chunk)
if input_offset >= len(input):
close_unregister_and_remove(fd)
try:
input_offset += os.write(fd, chunk)
except OSError as e:
if e.errno == errno.EPIPE:
close_unregister_and_remove(fd)
else:
raise
else:
if input_offset >= len(input):
close_unregister_and_remove(fd)
elif mode & select_POLLIN_POLLPRI:
data = os.read(fd, 4096)
if not data:
@ -1499,11 +1514,19 @@ class Popen(object):
if self.stdin in wlist:
chunk = input[input_offset : input_offset + _PIPE_BUF]
bytes_written = os.write(self.stdin.fileno(), chunk)
input_offset += bytes_written
if input_offset >= len(input):
self.stdin.close()
write_set.remove(self.stdin)
try:
bytes_written = os.write(self.stdin.fileno(), chunk)
except OSError as e:
if e.errno == errno.EPIPE:
self.stdin.close()
write_set.remove(self.stdin)
else:
raise
else:
input_offset += bytes_written
if input_offset >= len(input):
self.stdin.close()
write_set.remove(self.stdin)
if self.stdout in rlist:
data = os.read(self.stdout.fileno(), 1024)