Remove more uses of the plugins dict

src/calibre/gui2/cover_flow.py

@@ -15,20 +15,19 @@ from PyQt5.Qt import (QImage, QSizePolicy, QTimer, QDialog, Qt, QSize, QAction,
         QStackedLayout, QLabel, pyqtSignal, QKeySequence, QFont, QApplication)
 
 from calibre.ebooks.metadata import rating_to_stars
-from calibre.constants import islinux, plugins
+from calibre.constants import islinux
 from calibre.gui2 import (config, available_height, available_width, gprefs,
         rating_font)
+from calibre_extensions import pictureflow
 
-pictureflow, pictureflowerror = plugins['pictureflow']
 
-if pictureflow is not None:
-
-    class EmptyImageList(pictureflow.FlowImages):
+class EmptyImageList(pictureflow.FlowImages):
 
     def __init__(self):
         pictureflow.FlowImages.__init__(self)
 
-    class FileSystemImages(pictureflow.FlowImages):
+
+class FileSystemImages(pictureflow.FlowImages):
 
     def __init__(self, dirpath):
         pictureflow.FlowImages.__init__(self)
@@ -58,7 +57,8 @@ if pictureflow is not None:
     def currentChanged(self, index):
         print('current changed:', index)
 
-    class DummyImageList(pictureflow.FlowImages):
+
+class DummyImageList(pictureflow.FlowImages):
 
     def __init__(self):
         pictureflow.FlowImages.__init__(self)
@@ -79,7 +79,8 @@ if pictureflow is not None:
     def subtitle(self, index):
         return ''
 
-    class DatabaseImages(pictureflow.FlowImages):
+
+class DatabaseImages(pictureflow.FlowImages):
 
     def __init__(self, model, is_cover_browser_visible):
         pictureflow.FlowImages.__init__(self)
@@ -168,7 +169,8 @@ if pictureflow is not None:
             return QImage()
         return self.model.cover(index)
 
-    class CoverFlow(pictureflow.PictureFlow):
+
+class CoverFlow(pictureflow.PictureFlow):
 
     dc_signal = pyqtSignal()
     context_menu_requested = pyqtSignal()
@@ -224,12 +226,6 @@ if pictureflow is not None:
         pictureflow.PictureFlow.setCurrentSlide(self, num)
 
 
-else:
-    CoverFlow = None
-    DatabaseImages = None
-    FileSystemImages = None
-
-
 class CBDialog(QDialog):
 
     closed = pyqtSignal()
@@ -301,7 +297,6 @@ class CoverFlowMixin(object):
 
     def init_cover_flow_mixin(self):
         self.cover_flow = None
-        if CoverFlow is not None:
         self.cf_last_updated_at = None
         self.cover_flow_syncing_enabled = False
         self.cover_flow_sync_flag = True
@@ -313,10 +308,6 @@ class CoverFlowMixin(object):
         self.cover_flow.setImages(self.db_images)
         self.cover_flow.itemActivated.connect(self.iactions['View'].view_specific_book)
         self.update_cover_flow_subtitle_font()
-        else:
-            self.cover_flow = QLabel('<p>'+_('Cover browser could not be loaded') +
-                                     '<br>'+pictureflowerror)
-            self.cover_flow.setWordWrap(True)
         if config['separate_cover_flow']:
             self.separate_cover_browser = True
             self.cb_splitter.button.clicked.connect(self.toggle_cover_browser)

src/calibre/gui2/notify.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 
 import time
 from calibre import prints
-from calibre.constants import islinux, ismacos, get_osx_version, DEBUG, plugins
+from calibre.constants import islinux, ismacos, get_osx_version, DEBUG
 from polyglot.builtins import unicode_type
 
 
@@ -132,8 +132,9 @@ class DummyNotifier(Notifier):
 class AppleNotifier(Notifier):
 
     def __init__(self):
-        self.cocoa, err = plugins['cocoa']
-        self.ok = not err
+        from calibre_extensions import cocoa
+        self.cocoa = cocoa
+        self.ok = True
 
     def notify(self, body, summary):
         if summary:

src/calibre/gui2/tweak_book/editor/insert_resource.py

@@ -5,28 +5,28 @@
 __license__ = 'GPL v3'
 __copyright__ = '2013, Kovid Goyal <kovid at kovidgoyal.net>'
 
-import sys, os
+import os
+import sys
 from functools import partial
-
 from PyQt5.Qt import (
-    QGridLayout, QSize, QListView, QStyledItemDelegate, QLabel, QPixmap,
-    QApplication, QSizePolicy, QAbstractListModel, Qt, QRect, QCheckBox,
-    QPainter, QSortFilterProxyModel, QLineEdit, QToolButton,
-    QIcon, QFormLayout, pyqtSignal, QTreeWidget, QTreeWidgetItem, QVBoxLayout,
-    QMenu, QInputDialog, QHBoxLayout)
+    QAbstractListModel, QApplication, QCheckBox, QFormLayout, QGridLayout,
+    QHBoxLayout, QIcon, QInputDialog, QLabel, QLineEdit, QListView, QMenu, QPainter,
+    QPixmap, QRect, QSize, QSizePolicy, QSortFilterProxyModel, QStyledItemDelegate,
+    Qt, QToolButton, QTreeWidget, QTreeWidgetItem, QVBoxLayout, pyqtSignal
+)
 
 from calibre import fit_image
-from calibre.constants import plugins
 from calibre.ebooks.metadata import string_to_authors
 from calibre.ebooks.metadata.book.base import Metadata
-from calibre.gui2 import choose_files, error_dialog, pixmap_to_data, empty_index
+from calibre.gui2 import choose_files, empty_index, error_dialog, pixmap_to_data
 from calibre.gui2.languages import LanguagesEdit
 from calibre.gui2.tweak_book import current_container, tprefs
-from calibre.gui2.tweak_book.widgets import Dialog
 from calibre.gui2.tweak_book.file_list import name_is_ok
+from calibre.gui2.tweak_book.widgets import Dialog
 from calibre.ptempfile import PersistentTemporaryFile
-from calibre.utils.localization import get_lang, canonicalize_lang
 from calibre.utils.icu import numeric_sort_key
+from calibre.utils.localization import canonicalize_lang, get_lang
+from calibre_extensions.progress_indicator import set_no_activate_on_click
 from polyglot.builtins import unicode_type
 
 
@@ -219,9 +219,7 @@ class InsertImage(Dialog):
         v.setSpacing(4)
         v.setResizeMode(v.Adjust)
         v.setUniformItemSizes(True)
-        pi = plugins['progress_indicator'][0]
-        if hasattr(pi, 'set_no_activate_on_click'):
-            pi.set_no_activate_on_click(v)
+        set_no_activate_on_click(v)
         v.activated.connect(self.activated)
         v.doubleClicked.connect(self.activated)
         self.d = ImageDelegate(v)