From 983bb2aabbfc4a4d284fd08abd2e0498e6700f2e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 16 Oct 2020 20:55:46 +0530 Subject: [PATCH] Remove more usage of plugins dict --- src/calibre/gui2/main.py | 4 ++-- src/calibre/srv/standalone.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py index bb9cfc24df..eca93ab5fc 100644 --- a/src/calibre/gui2/main.py +++ b/src/calibre/gui2/main.py @@ -13,7 +13,7 @@ import traceback import apsw from PyQt5.Qt import QCoreApplication, QIcon, QObject, QTimer -from calibre import force_unicode, plugins, prints +from calibre import force_unicode, prints from calibre.constants import ( DEBUG, MAIN_APP_UID, __appname__, filesystem_encoding, get_portable_base, islinux, ismacos, iswindows @@ -32,7 +32,7 @@ from polyglot.builtins import as_bytes, environ_item, range, unicode_type after_quit_actions = {'debug_on_restart': False, 'restart_after_quit': False} if iswindows: - winutil = plugins['winutil'][0] + from calibre_extensions import winutil class AbortInit(Exception): diff --git a/src/calibre/srv/standalone.py b/src/calibre/srv/standalone.py index 7b7361d380..197c1aa03c 100644 --- a/src/calibre/srv/standalone.py +++ b/src/calibre/srv/standalone.py @@ -9,7 +9,7 @@ import signal import sys from calibre import as_unicode -from calibre.constants import is_running_from_develop, ismacos, iswindows, plugins +from calibre.constants import is_running_from_develop, ismacos, iswindows from calibre.db.delete_service import shutdown as shutdown_delete_service from calibre.db.legacy import LibraryDatabase from calibre.srv.bonjour import BonJour @@ -25,6 +25,7 @@ from calibre.utils.config import prefs from calibre.utils.localization import localize_user_manual_link from calibre.utils.lock import singleinstance from polyglot.builtins import error_message, unicode_type +from calibre_extensions import speedup def daemonize(): # {{{ @@ -51,7 +52,7 @@ def daemonize(): # {{{ raise SystemExit('fork #2 failed: %s' % as_unicode(e)) # Redirect standard file descriptors. - plugins['speedup'][0].detach(os.devnull) + speedup.detach(os.devnull) # }}}