From ef5cce0e0b0fe99cc81d53ba0dfdc8f31c2044c8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 31 Oct 2007 17:01:52 +0000 Subject: [PATCH] --- src/libprs500/devices/prs500/driver.py | 3 +-- src/libprs500/devices/prs505/driver.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libprs500/devices/prs500/driver.py b/src/libprs500/devices/prs500/driver.py index 8331791cac..9d83dc1a13 100755 --- a/src/libprs500/devices/prs500/driver.py +++ b/src/libprs500/devices/prs500/driver.py @@ -12,7 +12,6 @@ ## You should have received a copy of the GNU General Public License along ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -from libprs500.devices import libusb ### End point description for PRS-500 procductId=667 ### Endpoint Descriptor: @@ -227,7 +226,7 @@ class PRS500(Device): """ try: return get_device_by_id(cls.VENDOR_ID, cls.PRODUCT_ID) != None - except libusb.Error: + except USBError: return False def set_progress_reporter(self, report_progress): diff --git a/src/libprs500/devices/prs505/driver.py b/src/libprs500/devices/prs505/driver.py index 549528277d..ce6c6120a9 100644 --- a/src/libprs500/devices/prs505/driver.py +++ b/src/libprs500/devices/prs505/driver.py @@ -23,7 +23,7 @@ from libprs500.devices.errors import DeviceError, FreeSpaceError from libprs500.devices.prs500.books import BookList, fix_ids from libprs500 import iswindows, islinux, isosx from libprs500.devices.libusb import get_device_by_id -from libprs500.devices import libusb +from libprs500.devices.libusb import Error as USBError from libprs500.devices.errors import PathError class File(object): @@ -117,7 +117,7 @@ class PRS505(Device): else: try: return get_device_by_id(cls.VENDOR_ID, cls.PRODUCT_ID) != None - except libusb.Error: + except USBError: return False