From be2208ae2103e9c65f491bb9c1d1fdfa1c5d759f Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Tue, 10 Apr 2007 01:31:54 +0000
Subject: [PATCH] Misc minor bug fixes.

---
 src/libprs500/device.py       | 3 ++-
 src/libprs500/gui/__init__.py | 2 +-
 src/libprs500/libusb.py       | 7 ++++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/libprs500/device.py b/src/libprs500/device.py
index 139a4dbe8a..fe06b9a1c1 100644
--- a/src/libprs500/device.py
+++ b/src/libprs500/device.py
@@ -111,4 +111,5 @@ class Device(object):
         @param booklists: A tuple containing the result of calls to 
                                 (L{books}(oncard=False), L{books}(oncard=True)).    
         """
-        raise NotImplementedError()        
\ No newline at end of file
+        raise NotImplementedError()        
+
diff --git a/src/libprs500/gui/__init__.py b/src/libprs500/gui/__init__.py
index 252fc7d6d9..8c7cd39807 100644
--- a/src/libprs500/gui/__init__.py
+++ b/src/libprs500/gui/__init__.py
@@ -18,7 +18,7 @@ __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 APP_TITLE     = "libprs500"
 
 import pkg_resources, sys, os, re, StringIO, traceback
-from PyQt4.uic.Compiler import compiler
+from PyQt4.uic import compiler
 from PyQt4 import QtCore, QtGui # Needed in globals() for import_ui
 
 error_dialog = None
diff --git a/src/libprs500/libusb.py b/src/libprs500/libusb.py
index f6ce979580..c01e5708ad 100644
--- a/src/libprs500/libusb.py
+++ b/src/libprs500/libusb.py
@@ -32,7 +32,12 @@ if isosx:
     PATH_MAX = 1024
     _libusb_name = 'libusb.dylib'
 
-_libusb = cdll.LoadLibrary(_libusb_name)
+try:
+    _libusb = cdll.LoadLibrary(_libusb_name)
+except OSError:
+    if iswindows or isosx:
+        raise
+    _libusb = cdll.LoadLibrary('libusb-0.1.so.4')
 
 class DeviceDescriptor(Structure):
     _fields_ = [\