From f81d89a76b091d6914e17575ab20d0d35db2a4b4 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 8 Jul 2011 21:21:21 -0600
Subject: [PATCH] ...

---
 src/calibre/devices/kobo/driver.py | 4 +++-
 src/calibre/ebooks/htmlz/input.py  | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py
index fd71eb57cc..682eac99ce 100644
--- a/src/calibre/devices/kobo/driver.py
+++ b/src/calibre/devices/kobo/driver.py
@@ -227,7 +227,9 @@ class KOBO(USBMS):
         try:
             cursor.execute (query)
         except Exception as e:
-            if '___ExpirationStatus' not in str(e):
+            err = str(e)
+            if not ('___ExpirationStatus' in err or 'FavouritesIndex' in err or
+                    'Accessibility' in err):
                 raise
             query= ('select Title, Attribution, DateCreated, ContentID, MimeType, ContentType, '
                 'ImageID, ReadStatus, "-1" as ___ExpirationStatus, "-1" as '
diff --git a/src/calibre/ebooks/htmlz/input.py b/src/calibre/ebooks/htmlz/input.py
index 743d8e53eb..3cf95b8a48 100644
--- a/src/calibre/ebooks/htmlz/input.py
+++ b/src/calibre/ebooks/htmlz/input.py
@@ -20,7 +20,7 @@ class HTMLZInput(InputFormatPlugin):
     author      = 'John Schember'
     description = 'Convert HTML files to HTML'
     file_types  = set(['htmlz'])
-    
+
     def convert(self, stream, options, file_ext, log,
                 accelerators):
         self.log = log
@@ -35,14 +35,14 @@ class HTMLZInput(InputFormatPlugin):
                 with open(x, 'rb') as tf:
                     html = tf.read()
                     break
-        
+
         # Encoding
         if options.input_encoding:
             ienc = options.input_encoding
         else:
             ienc = xml_to_unicode(html[:4096])[-1]
         html = html.decode(ienc, 'replace')
-        
+
         # Run the HTML through the html processing plugin.
         from calibre.customize.ui import plugin_for_input_format
         html_input = plugin_for_input_format('html')
@@ -71,7 +71,7 @@ class HTMLZInput(InputFormatPlugin):
         from calibre.ebooks.oeb.transforms.metadata import meta_info_to_oeb_metadata
         mi = get_file_type_metadata(stream, file_ext)
         meta_info_to_oeb_metadata(mi, oeb.metadata, log)
-        
+
         # Get the cover path from the OPF.
         cover_path = None
         opf = None