From 39da4e94377ecb99b5fc5f9ff99f01e79d9b39ee Mon Sep 17 00:00:00 2001 From: Scott Petersen Date: Thu, 6 Jun 2013 11:03:11 -0700 Subject: [PATCH] Clearing buffers on error. --- pyad2usb/devices.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index 26e8cbc..88d89b6 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -240,6 +240,9 @@ class USBDevice(Device): time.sleep(0.001) except (usb.core.USBError, FtdiError), err: + self._buffer = '' + timer.cancel() + raise util.CommError('Error reading from AD2USB device: {0}'.format(str(err))) else: if got_line: @@ -428,6 +431,7 @@ class SerialDevice(Device): time.sleep(0.001) except (OSError, serial.SerialException), err: + self._buffer = '' timer.cancel() raise util.CommError('Error reading from AD2SERIAL device: {0}'.format(str(err))) @@ -591,6 +595,9 @@ class SocketDevice(Device): time.sleep(0.001) except socket.error, err: + self._buffer = '' + timer.cancel() + raise util.CommError('Error reading from Socket device: {0}'.format(str(err))) else: if got_line: