Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove more usage of plugins dict

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-16 20:55:46 +05:30
parent c9f2ae20fc
commit 983bb2aabb
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/main.py
View File

@ -13,7 +13,7 @@ import traceback
import apsw import apsw
from PyQt5.Qt import QCoreApplication, QIcon, QObject, QTimer 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 ( from calibre.constants import (
DEBUG, MAIN_APP_UID, __appname__, filesystem_encoding, get_portable_base, DEBUG, MAIN_APP_UID, __appname__, filesystem_encoding, get_portable_base,
islinux, ismacos, iswindows 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} after_quit_actions = {'debug_on_restart': False, 'restart_after_quit': False}
if iswindows: if iswindows:
winutil = plugins['winutil'][0] from calibre_extensions import winutil
class AbortInit(Exception): class AbortInit(Exception):

5
src/calibre/srv/standalone.py
View File

@ -9,7 +9,7 @@ import signal
import sys import sys
from calibre import as_unicode 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.delete_service import shutdown as shutdown_delete_service
from calibre.db.legacy import LibraryDatabase from calibre.db.legacy import LibraryDatabase
from calibre.srv.bonjour import BonJour 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.localization import localize_user_manual_link
from calibre.utils.lock import singleinstance from calibre.utils.lock import singleinstance
from polyglot.builtins import error_message, unicode_type from polyglot.builtins import error_message, unicode_type
from calibre_extensions import speedup
def daemonize(): # {{{ def daemonize(): # {{{
@ -51,7 +52,7 @@ def daemonize(): # {{{
raise SystemExit('fork #2 failed: %s' % as_unicode(e)) raise SystemExit('fork #2 failed: %s' % as_unicode(e))
# Redirect standard file descriptors. # Redirect standard file descriptors.
plugins['speedup'][0].detach(os.devnull) speedup.detach(os.devnull)
# }}} # }}}