From 67ab770a771aa8db48f28e2dca120ce8806fa661 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 9 Oct 2020 12:08:02 +0530 Subject: [PATCH] Import plugins from calibre.constants not calibre --- src/calibre/devices/kindle/bookmark.py | 2 +- src/calibre/ebooks/lit/lzx.py | 2 +- src/calibre/ebooks/lit/reader.py | 2 +- src/calibre/ebooks/lit/writer.py | 2 +- src/calibre/gui2/cover_flow.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/devices/kindle/bookmark.py b/src/calibre/devices/kindle/bookmark.py index 5d690f170e..c0811fefe2 100644 --- a/src/calibre/devices/kindle/bookmark.py +++ b/src/calibre/devices/kindle/bookmark.py @@ -306,7 +306,7 @@ class Bookmark(): # {{{ except: pass elif self.bookmark_extension == 'pdr': - from calibre import plugins + from calibre.constants import plugins try: self.book_length = plugins['pdfreflow'][0].get_numpages(open(book_fs).read()) except : diff --git a/src/calibre/ebooks/lit/lzx.py b/src/calibre/ebooks/lit/lzx.py index 3995bb9023..c4e06b0b04 100644 --- a/src/calibre/ebooks/lit/lzx.py +++ b/src/calibre/ebooks/lit/lzx.py @@ -7,7 +7,7 @@ LZX compression/decompression wrapper. __license__ = 'GPL v3' __copyright__ = '2008, Marshall T. Vandegrift ' -from calibre import plugins +from calibre.constants import plugins _lzx, _error = plugins['lzx'] if _lzx is None: diff --git a/src/calibre/ebooks/lit/reader.py b/src/calibre/ebooks/lit/reader.py index 73a2e5035e..54489e0f10 100644 --- a/src/calibre/ebooks/lit/reader.py +++ b/src/calibre/ebooks/lit/reader.py @@ -17,7 +17,7 @@ import calibre.ebooks.lit.mssha1 as mssha1 from calibre.ebooks.oeb.base import urlnormalize, xpath from calibre.ebooks.oeb.reader import OEBReader from calibre.ebooks import DRMError -from calibre import plugins +from calibre.constants import plugins from polyglot.builtins import codepoint_to_chr, unicode_type, string_or_bytes, range, itervalues from polyglot.urllib import unquote as urlunquote, urldefrag diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py index f37de4cc02..453e3dd4c2 100644 --- a/src/calibre/ebooks/lit/writer.py +++ b/src/calibre/ebooks/lit/writer.py @@ -27,7 +27,7 @@ from calibre.ebooks.oeb.base import prefixname, \ from calibre.ebooks.oeb.stylizer import Stylizer from calibre.ebooks.lit.lzx import Compressor import calibre -from calibre import plugins +from calibre.constants import plugins msdes, msdeserror = plugins['msdes'] import calibre.ebooks.lit.mssha1 as mssha1 from polyglot.builtins import codepoint_to_chr, unicode_type, string_or_bytes, range, zip, native_string_type diff --git a/src/calibre/gui2/cover_flow.py b/src/calibre/gui2/cover_flow.py index fae8dbeeef..2e7be78840 100644 --- a/src/calibre/gui2/cover_flow.py +++ b/src/calibre/gui2/cover_flow.py @@ -14,7 +14,7 @@ import sys, os, time from PyQt5.Qt import (QImage, QSizePolicy, QTimer, QDialog, Qt, QSize, QAction, QStackedLayout, QLabel, pyqtSignal, QKeySequence, QFont, QApplication) -from calibre import plugins +from calibre.constants import plugins from calibre.ebooks.metadata import rating_to_stars from calibre.constants import islinux from calibre.gui2 import (config, available_height, available_width, gprefs,