Browse Source

Terrible commit message that I couldn't even determine what it was supposed to mean. Not that this one is better, but at least it has no cursing.

pyserial_fix
Scott Petersen 11 years ago
parent
commit
b954910b08
1 changed files with 12 additions and 6 deletions
  1. +12
    -6
      pyad2usb/devices.py

+ 12
- 6
pyad2usb/devices.py View File

@@ -207,7 +207,6 @@ class USBDevice(Device):
"""
def timeout_event():
timeout_event.reading = False
raise util.TimeoutError('Timeout while waiting for line terminator.')

timeout_event.reading = True

@@ -250,7 +249,10 @@ class USBDevice(Device):
self.on_read(ret)

if timer:
timer.cancel()
if timer.is_alive():
timer.cancel()
else:
raise util.TimeoutError('Timeout while waiting for line terminator.')

return ret

@@ -393,7 +395,6 @@ class SerialDevice(Device):

def timeout_event():
timeout_event.reading = False
raise util.TimeoutError('Timeout while waiting for line terminator.')

timeout_event.reading = True

@@ -436,7 +437,10 @@ class SerialDevice(Device):
self.on_read(ret)

if timer:
timer.cancel()
if timer.is_alive():
timer.cancel()
else:
raise util.TimeoutError('Timeout while waiting for line terminator.')

return ret

@@ -552,7 +556,6 @@ class SocketDevice(Device):
"""
def timeout_event():
timeout_event.reading = False
raise util.TimeoutError('Timeout while waiting for line terminator.')

timeout_event.reading = True

@@ -595,6 +598,9 @@ class SocketDevice(Device):
self.on_read(ret)

if timer:
timer.cancel()
if timer.is_alive():
timer.cancel()
else:
raise util.TimeoutError('Timeout while waiting for line terminator.')

return ret

Loading…
Cancel
Save