Browse Source

Removed temp tracebacks and made exceptions consistent in device open calls.

pyserial_fix
Scott Petersen 11 years ago
parent
commit
ec13e78af1
1 changed files with 2 additions and 5 deletions
  1. +2
    -5
      pyad2usb/devices.py

+ 2
- 5
pyad2usb/devices.py View File

@@ -9,7 +9,6 @@ import threading
import serial import serial
import serial.tools.list_ports import serial.tools.list_ports
import socket import socket
import traceback
from pyftdi.pyftdi.ftdi import * from pyftdi.pyftdi.ftdi import *
from pyftdi.pyftdi.usbtools import * from pyftdi.pyftdi.usbtools import *
from . import util from . import util
@@ -60,8 +59,6 @@ class Device(object):
while self._running: while self._running:
try: try:
self._device.read_line(timeout=10) self._device.read_line(timeout=10)
except util.CommError, err:
traceback.print_exc(err) # TEMP
except util.TimeoutError, err: except util.TimeoutError, err:
pass pass


@@ -143,7 +140,7 @@ class USBDevice(Device):
except (usb.core.USBError, FtdiError), err: except (usb.core.USBError, FtdiError), err:
self.on_close() self.on_close()


raise util.CommError('Error opening AD2USB device: {0}'.format(str(err)))
raise util.NoDeviceError('Error opening AD2USB device: {0}'.format(str(err)))
else: else:
self._running = True self._running = True
if not no_reader_thread: if not no_reader_thread:
@@ -486,7 +483,7 @@ class SocketDevice(Device):
except socket.error, err: except socket.error, err:
self.on_close() self.on_close()


traceback.print_exc(err) # TEMP
raise util.NoDeviceError('Error opening AD2SOCKET device at {0}:{1}'.format(self._host, self._port))
else: else:
self._running = True self._running = True




Loading…
Cancel
Save