summaryrefslogtreecommitdiff
path: root/serial/urlhandler/protocol_socket.py
diff options
context:
space:
mode:
Diffstat (limited to 'serial/urlhandler/protocol_socket.py')
-rw-r--r--serial/urlhandler/protocol_socket.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/serial/urlhandler/protocol_socket.py b/serial/urlhandler/protocol_socket.py
index ccf7e14..0c96511 100644
--- a/serial/urlhandler/protocol_socket.py
+++ b/serial/urlhandler/protocol_socket.py
@@ -135,8 +135,11 @@ class SocketSerial(SerialBase):
until the requested number of bytes is read."""
if not self._isOpen: raise portNotOpenError
data = bytearray()
- timeout = time.time() + self._timeout
- while len(data) < size and time.time() < timeout:
+ if self._timeout is not None:
+ timeout = time.time() + self._timeout
+ else:
+ timeout = None
+ while len(data) < size and (timeout is None or time.time() < timeout):
try:
# an implementation with internal buffer would be better
# performing...