From 3345f311dd2bdbc74ff9ff330bb73931f2133d99 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 15 Dec 2009 08:50:57 -0700 Subject: [PATCH] Fix regression that broke device detection for Cybook devices in 0.6.28 on windows and linux --- src/calibre/devices/cybookg3/driver.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py index 1cf51f78ec..04e5e7012c 100644 --- a/src/calibre/devices/cybookg3/driver.py +++ b/src/calibre/devices/cybookg3/driver.py @@ -82,9 +82,8 @@ class CYBOOKG3(USBMS): def can_handle(cls, device_info, debug=False): USBMS.can_handle(device_info, debug) if islinux: - if device_info[3] == 'Bookeen' and device_info[4] == 'Cybook Gen3': - return True - return False + return device_info[3] == 'Bookeen' and device_info[4] == 'Cybook Gen3' + return True class CYBOOK_OPUS(CYBOOKG3): @@ -92,7 +91,7 @@ class CYBOOK_OPUS(CYBOOKG3): name = 'Cybook Opus Device Interface' gui_name = 'Cybook Opus' description = _('Communicate with the Cybook Opus eBook reader.') - author = _('John Schember') + author = 'John Schember' supported_platforms = ['windows', 'osx', 'linux'] FORMATS = ['epub', 'pdf', 'txt'] @@ -116,6 +115,5 @@ class CYBOOK_OPUS(CYBOOKG3): def can_handle(cls, device_info, debug=False): USBMS.can_handle(device_info, debug) if islinux: - if device_info[3] == 'Bookeen': - return True - return False + return device_info[3] == 'Bookeen' + return True