diff options
| author | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2013-05-31 00:55:43 +0000 |
|---|---|---|
| committer | cliechti <cliechti@f19166aa-fa4f-0410-85c2-fa1106f25c8a> | 2013-05-31 00:55:43 +0000 |
| commit | fee4e96f51be51d4ff99288fe82097d1b9dcd028 (patch) | |
| tree | 10252f7290e77c80607717967bb4eee3d8cac1ed | |
| parent | 2640978be7673cdd230241de2be32bd9c410b709 (diff) | |
| download | pyserial-git-fee4e96f51be51d4ff99288fe82097d1b9dcd028.tar.gz | |
[Bug pyserial:45] Error in socket_connection.py
| -rw-r--r-- | pyserial/CHANGES.txt | 1 | ||||
| -rw-r--r-- | pyserial/serial/urlhandler/protocol_socket.py | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/pyserial/CHANGES.txt b/pyserial/CHANGES.txt index f57eab7..cda018b 100644 --- a/pyserial/CHANGES.txt +++ b/pyserial/CHANGES.txt @@ -445,6 +445,7 @@ Version 2.7 2012-nn-nn Bugfixes: - [Bug 3540332] SerialException not returned +- [Bug pyserial:45] Error in socket_connection.py Bugfixes (posix): diff --git a/pyserial/serial/urlhandler/protocol_socket.py b/pyserial/serial/urlhandler/protocol_socket.py index ec2e0ab..ccf7e14 100644 --- a/pyserial/serial/urlhandler/protocol_socket.py +++ b/pyserial/serial/urlhandler/protocol_socket.py @@ -140,7 +140,9 @@ class SocketSerial(SerialBase): try: # an implementation with internal buffer would be better # performing... - data = self._socket.recv(size - len(data)) + block = self._socket.recv(size - len(data)) + if block: + data.append(block) except socket.timeout: # just need to get out of recv form time to time to check if # still alive |