Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

version 0.4.80

Browse Source
This commit is contained in:
Kovid Goyal 2008-07-25 00:01:31 -07:00
parent 50add0c72d
commit 49f75513cf
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -62,7 +62,7 @@ if __name__ == '__main__':
) )
if isosx: if isosx:
ext_modules.append(Extension('calibre.plugins.usbobserver', ext_modules.append(Extension('calibre.plugins.usbobserver',
sources=['src/calibre/driver/usbobserver/usbobserver.c']) sources=['src/calibre/devices/usbobserver/usbobserver.c'])
) )
def build_PyQt_extension(path): def build_PyQt_extension(path):

6
src/calibre/__init__.py
View File

@ -1,7 +1,7 @@
''' E-book management software''' ''' E-book management software'''
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
__version__ = '0.4.79' __version__ = '0.4.80'
__docformat__ = "epytext" __docformat__ = "epytext"
__author__ = "Kovid Goyal <kovid at kovidgoyal.net>" __author__ = "Kovid Goyal <kovid at kovidgoyal.net>"
__appname__ = 'calibre' __appname__ = 'calibre'
@ -61,7 +61,9 @@ if iswindows and getattr(sys, 'frozen', False):
plugins = {} plugins = {}
for plugin in ['pictureflow', 'lzx'] + (['winutil'] if iswindows else []): for plugin in ['pictureflow', 'lzx'] + \
(['winutil'] if iswindows else []) + \
(['usbobserver'] if isosx else []):
try: try:
p, err = __import__(plugin), '' p, err = __import__(plugin), ''
except Exception, err: except Exception, err:

6
src/calibre/devices/scanner.py
View File

@ -12,12 +12,6 @@ from calibre.devices import libusb
osx_scanner = win_scanner = linux_scanner = None osx_scanner = win_scanner = linux_scanner = None
try:
import usbobserver
osx_scanner = usbobserver.get_devices
except ImportError:
pass
if iswindows: if iswindows:
try: try:
win_scanner = plugins['winutil'][0].get_usb_devices win_scanner = plugins['winutil'][0].get_usb_devices