From 0ffd4c2ba3ecde3507c325cd092c3a89d074ba3c Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 27 Jan 2010 10:15:40 -0700 Subject: [PATCH 1/2] ... --- src/calibre/devices/blackberry/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/devices/blackberry/driver.py b/src/calibre/devices/blackberry/driver.py index 6a9bb84431..0005be54d0 100644 --- a/src/calibre/devices/blackberry/driver.py +++ b/src/calibre/devices/blackberry/driver.py @@ -19,7 +19,7 @@ class BLACKBERRY(USBMS): VENDOR_ID = [0x0fca] PRODUCT_ID = [0x8004, 0x0004] - BCD = [0x0200, 0x0107, 0x0210] + BCD = [0x0200, 0x0107, 0x0210, 0x0201] VENDOR_NAME = 'RIM' WINDOWS_MAIN_MEM = 'BLACKBERRY_SD' From b1b291007cb03693c35ecd43a4332973fa95a274 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 27 Jan 2010 11:34:59 -0700 Subject: [PATCH 2/2] EPUB Input: Handle empty XML files. Fixes #4705 (epub to mobi conversion fails) --- src/calibre/ebooks/oeb/base.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py index 753b1722de..18d3de1e56 100644 --- a/src/calibre/ebooks/oeb/base.py +++ b/src/calibre/ebooks/oeb/base.py @@ -760,6 +760,8 @@ class Manifest(object): def _parse_xml(self, data): data = xml_to_unicode(data, strip_encoding_pats=True)[0] + if not data: + return None parser = etree.XMLParser(recover=True) try: return etree.fromstring(data, parser=parser)