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

Don't fail catastrophically if appscript does not load

Browse Source
This commit is contained in:
Kovid Goyal 2010-06-05 01:30:12 -06:00
parent 989f07901e
commit 5f8f352e4a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/devices/apple/driver.py
View File

@ -22,7 +22,12 @@ from calibre.devices.errors import UserFeedback
from PIL import Image as PILImage from PIL import Image as PILImage
if isosx: if isosx:
import appscript try:
import appscript
appscript
except:
# appscript fails to load on 10.4
appscript = None
if iswindows: if iswindows:
import pythoncom, win32com.client import pythoncom, win32com.client
@ -268,6 +273,8 @@ class ITUNES(DevicePlugin):
instantiate iTunes if necessary instantiate iTunes if necessary
This gets called ~1x/second while device fingerprint is sensed This gets called ~1x/second while device fingerprint is sensed
''' '''
if appscript is None:
return False
if self.iTunes: if self.iTunes:
# Check for connected book-capable device # Check for connected book-capable device