mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-06-23 15:30:45 -04:00
Misc minor bug fixes.
This commit is contained in:
parent
011fc40780
commit
be2208ae21
@ -112,3 +112,4 @@ class Device(object):
|
||||
(L{books}(oncard=False), L{books}(oncard=True)).
|
||||
"""
|
||||
raise NotImplementedError()
|
||||
|
||||
|
@ -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
|
||||
|
@ -32,7 +32,12 @@ if isosx:
|
||||
PATH_MAX = 1024
|
||||
_libusb_name = 'libusb.dylib'
|
||||
|
||||
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_ = [\
|
||||
|
Loading…
x
Reference in New Issue
Block a user