diff --git a/src/calibre/gui2/actions/convert.py b/src/calibre/gui2/actions/convert.py index 310582865f..de31d199a6 100644 --- a/src/calibre/gui2/actions/convert.py +++ b/src/calibre/gui2/actions/convert.py @@ -40,7 +40,7 @@ class ConvertAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/delete.py b/src/calibre/gui2/actions/delete.py index 4e6317b28a..f41810b3a8 100644 --- a/src/calibre/gui2/actions/delete.py +++ b/src/calibre/gui2/actions/delete.py @@ -106,7 +106,7 @@ class DeleteAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/edit_metadata.py b/src/calibre/gui2/actions/edit_metadata.py index 8a11468de7..d0fcc7c624 100644 --- a/src/calibre/gui2/actions/edit_metadata.py +++ b/src/calibre/gui2/actions/edit_metadata.py @@ -51,7 +51,7 @@ class EditMetadataAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/embed.py b/src/calibre/gui2/actions/embed.py index 40bceae49e..39aae059c0 100644 --- a/src/calibre/gui2/actions/embed.py +++ b/src/calibre/gui2/actions/embed.py @@ -37,7 +37,7 @@ class EmbedAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/mark_books.py b/src/calibre/gui2/actions/mark_books.py index e8e5fd720f..2a95c7c2b9 100644 --- a/src/calibre/gui2/actions/mark_books.py +++ b/src/calibre/gui2/actions/mark_books.py @@ -39,7 +39,7 @@ class MarkBooksAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/polish.py b/src/calibre/gui2/actions/polish.py index 64224bdd79..7ad22efcec 100644 --- a/src/calibre/gui2/actions/polish.py +++ b/src/calibre/gui2/actions/polish.py @@ -420,7 +420,7 @@ class PolishAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/toc_edit.py b/src/calibre/gui2/actions/toc_edit.py index dd4ef8c1a8..c39f3dc2ee 100644 --- a/src/calibre/gui2/actions/toc_edit.py +++ b/src/calibre/gui2/actions/toc_edit.py @@ -87,7 +87,7 @@ class ToCEditAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/tweak_epub.py b/src/calibre/gui2/actions/tweak_epub.py index 6650b891b2..a0d9f1c0a2 100644 --- a/src/calibre/gui2/actions/tweak_epub.py +++ b/src/calibre/gui2/actions/tweak_epub.py @@ -74,7 +74,7 @@ class TweakEpubAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/actions/unpack_book.py b/src/calibre/gui2/actions/unpack_book.py index e92627ea57..e666c1a108 100644 --- a/src/calibre/gui2/actions/unpack_book.py +++ b/src/calibre/gui2/actions/unpack_book.py @@ -308,7 +308,7 @@ class UnpackBookAction(InterfaceAction): def drop_event(self, event, mime_data): mime = 'application/calibre+from_library' if mime_data.hasFormat(mime): - self.dropped_ids = tuple(map(int, str(mime_data.data(mime)).split())) + self.dropped_ids = tuple(map(int, mime_data.data(mime).data().split())) QTimer.singleShot(1, self.do_drop) return True return False diff --git a/src/calibre/gui2/bars.py b/src/calibre/gui2/bars.py index 7d62a358b6..7df3a5f338 100644 --- a/src/calibre/gui2/bars.py +++ b/src/calibre/gui2/bars.py @@ -286,10 +286,10 @@ class ToolBar(QToolBar): # {{{ event.ignore() def dropEvent(self, event): - data = event.mimeData() + md = event.mimeData() mime = 'application/calibre+from_library' - if data.hasFormat(mime): - ids = list(map(int, str(data.data(mime)).split())) + if md.hasFormat(mime): + ids = list(map(int, md.data(mime).data().split())) tgt = None for ac in self.location_manager.available_actions: w = self.widgetForAction(ac) @@ -303,8 +303,8 @@ class ToolBar(QToolBar): # {{{ return mime = 'application/calibre+from_device' - if data.hasFormat(mime): - paths = [unicode_type(u.toLocalFile()) for u in data.urls()] + if md.hasFormat(mime): + paths = [unicode_type(u.toLocalFile()) for u in md.urls()] if paths: self.gui.iactions['Add Books'].add_books_from_device( self.gui.current_view(), paths=paths) @@ -312,7 +312,7 @@ class ToolBar(QToolBar): # {{{ return # Give added_actions an opportunity to process the drag&drop event - if self.check_iactions_for_drag(event, data, 'drop_event'): + if self.check_iactions_for_drag(event, md, 'drop_event'): event.accept() else: event.ignore() diff --git a/src/calibre/gui2/tag_browser/model.py b/src/calibre/gui2/tag_browser/model.py index 4602e503e4..6bb903c3c9 100644 --- a/src/calibre/gui2/tag_browser/model.py +++ b/src/calibre/gui2/tag_browser/model.py @@ -857,7 +857,7 @@ class TagsModel(QAbstractItemModel): # {{{ fm['datatype'] == 'composite' and fm['display'].get('make_category', False)))): mime = 'application/calibre+from_library' - ids = list(map(int, str(md.data(mime)).split())) + ids = list(map(int, md.data(mime).data().split())) self.handle_drop(node, ids) return True elif node.type == TagTreeItem.CATEGORY: @@ -871,7 +871,7 @@ class TagsModel(QAbstractItemModel): # {{{ (fm_src['datatype'] == 'composite' and fm_src['display'].get('make_category', False))): mime = 'application/calibre+from_library' - ids = list(map(int, str(md.data(mime)).split())) + ids = list(map(int, md.data(mime).data().split())) self.handle_user_category_drop(node, ids, md.column_name) return True return False