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

...

Browse Source
This commit is contained in:
Kovid Goyal 2009-12-07 13:34:16 -07:00
parent 3ef62526e9
commit 39307bb354
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/debug.py
View File

@ -71,7 +71,7 @@ def debug_device_driver():
drives = [] drives = []
print 'Drives detected:' print 'Drives detected:'
print '\t', '(ID, Partitions, Drive letter)' print '\t', '(ID, Partitions, Drive letter)'
for drive in wmi.WMI().Win32_DiskDrive(): for drive in wmi.WMI(find_classes=False).Win32_DiskDrive():
if drive.Partitions == 0: if drive.Partitions == 0:
continue continue
try: try:

3
src/calibre/devices/nook/driver.py
View File

@ -31,7 +31,8 @@ class NOOK(USBMS):
#OSX_MAIN_MEM = '' #OSX_MAIN_MEM = ''
MAIN_MEMORY_VOLUME_LABEL = 'BN Nook Main Memory' MAIN_MEMORY_VOLUME_LABEL = 'Nook Main Memory'
STORAGE_CARD_VOLUME_LABEL = 'Nook Storage Card'
EBOOK_DIR_MAIN = 'my documents' EBOOK_DIR_MAIN = 'my documents'
SUPPORTS_SUB_DIRS = True SUPPORTS_SUB_DIRS = True

3
src/calibre/devices/usbms/device.py
View File

@ -209,7 +209,8 @@ class Device(DeviceConfig, DevicePlugin):
return (msz, casz, cbsz) return (msz, casz, cbsz)
def windows_match_device(self, drive, attr): def windows_match_device(self, drive, attr):
pnp_id = str(drive.PNPDeviceID).upper() pnp_id = (str(drive.PNPDeviceID) if not isinstance(drive, basestring)
else str(drive)).upper()
device_id = getattr(self, attr) device_id = getattr(self, attr)
def test_vendor(): def test_vendor():