Sync to trunk.

src/calibre/ebooks/__init__.py

@@ -25,7 +25,7 @@ class DRMError(ValueError):
 BOOK_EXTENSIONS = ['lrf', 'rar', 'zip', 'rtf', 'lit', 'txt', 'htm', 'xhtm',
                    'html', 'xhtml', 'pdf', 'pdb', 'prc', 'mobi', 'azw', 'doc',
                    'epub', 'fb2', 'djvu', 'lrx', 'cbr', 'cbz', 'oebzip',
-                   'rb', 'imp', 'odt', 'chm']
+                   'rb', 'imp', 'odt', 'chm', 'tpz', 'azw1']
 
 class HTMLRenderer(object):
 

src/calibre/ebooks/oeb/base.py

@@ -765,7 +765,14 @@ class Manifest(object):
                     data = etree.fromstring(data)
                 except:
                     data=data.replace(':=', '=').replace(':>', '>')
-                    data = etree.fromstring(data)
+                    try:
+                        data = etree.fromstring(data)
+                    except etree.XMLSyntaxError:
+                        self.oeb.logger.warn('Stripping comments from %s'%
+                                self.href)
+                        data = re.compile(r'<!--.*?-->', re.DOTALL).sub('',
+                                data)
+                        data = etree.fromstring(data)
             elif namespace(data.tag) != XHTML_NS:
                 # OEB_DOC_NS, but possibly others
                 ns = namespace(data.tag)

src/calibre/gui2/main.py

@@ -385,7 +385,7 @@ class Main(MainWindow, Ui_MainWindow, DeviceGUI):
                 self.action_view, self.action_save, None, None)
         QObject.connect(self.library_view,
                 SIGNAL('files_dropped(PyQt_PyObject)'),
-                        self.files_dropped)
+                        self.files_dropped, Qt.QueuedConnection)
         for func, target in [
                              ('connect_to_search_box', self.search),
                              ('connect_to_book_display',