Issue #17097: Merge.

This commit is contained in:
Richard Oudkerk 2013-07-01 19:10:39 +01:00
commit 626032ac54
3 changed files with 86 additions and 4 deletions

View file

@ -363,7 +363,10 @@ class Connection(_ConnectionBase):
def _send(self, buf, write=_write):
remaining = len(buf)
while True:
n = write(self._handle, buf)
try:
n = write(self._handle, buf)
except InterruptedError:
continue
remaining -= n
if remaining == 0:
break
@ -374,7 +377,10 @@ class Connection(_ConnectionBase):
handle = self._handle
remaining = size
while remaining > 0:
chunk = read(handle, remaining)
try:
chunk = read(handle, remaining)
except InterruptedError:
continue
n = len(chunk)
if n == 0:
if remaining == size:
@ -578,7 +584,13 @@ class SocketListener(object):
self._unlink = None
def accept(self):
s, self._last_accepted = self._socket.accept()
while True:
try:
s, self._last_accepted = self._socket.accept()
except InterruptedError:
pass
else:
break
s.setblocking(True)
return Connection(s.detach())