From feb5a6f0595c37c38bfff33a057b00a029afe9c5 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 16 May 2010 21:55:09 -0600 Subject: [PATCH] USBMS: books emthod should always returna n object of type BookList --- src/calibre/devices/usbms/driver.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py index 332f337a2f..c8f48511a4 100644 --- a/src/calibre/devices/usbms/driver.py +++ b/src/calibre/devices/usbms/driver.py @@ -45,15 +45,17 @@ class USBMS(CLI, Device): def books(self, oncard=None, end_session=True): from calibre.ebooks.metadata.meta import path_to_ext + dummy_bl = BookList(None, None, None) + if oncard == 'carda' and not self._card_a_prefix: self.report_progress(1.0, _('Getting list of books on device...')) - return [] + return dummy_bl elif oncard == 'cardb' and not self._card_b_prefix: self.report_progress(1.0, _('Getting list of books on device...')) - return [] + return dummy_bl elif oncard and oncard != 'carda' and oncard != 'cardb': self.report_progress(1.0, _('Getting list of books on device...')) - return [] + return dummy_bl prefix = self._card_a_prefix if oncard == 'carda' else \ self._card_b_prefix if oncard == 'cardb' \