Issue #7322: Trying to read from a socket's file-like object after a timeout
occurred now raises an error instead of silently losing data.
Patch by Ross Lagerwall.
diff --git a/Lib/socket.py b/Lib/socket.py
index 95901ae..1e28549 100644
--- a/Lib/socket.py
+++ b/Lib/socket.py
@@ -257,6 +257,7 @@
self._mode = mode
self._reading = "r" in mode
self._writing = "w" in mode
+ self._timeout_occurred = False
def readinto(self, b):
"""Read up to len(b) bytes into the writable buffer *b* and return
@@ -268,9 +269,14 @@
"""
self._checkClosed()
self._checkReadable()
+ if self._timeout_occurred:
+ raise IOError("cannot read from timed out object")
while True:
try:
return self._sock.recv_into(b)
+ except timeout:
+ self._timeout_occurred = True
+ raise
except error as e:
n = e.args[0]
if n == EINTR: