From c695f695bcbdf33c7c727e739a4bd472b5dde3d2 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 26 Jul 2018 16:48:17 +0530 Subject: [PATCH] more lambda slots --- src/calibre/gui2/covers.py | 3 +-- src/calibre/gui2/metadata/bulk_download.py | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/covers.py b/src/calibre/gui2/covers.py index d54cf9aad6..f5d4e574dc 100644 --- a/src/calibre/gui2/covers.py +++ b/src/calibre/gui2/covers.py @@ -7,7 +7,6 @@ __license__ = 'GPL v3' __copyright__ = '2014, Kovid Goyal ' from collections import OrderedDict -from functools import partial from PyQt5.Qt import ( QWidget, QHBoxLayout, QTabWidget, QLabel, QSizePolicy, QSize, QFormLayout, @@ -243,7 +242,7 @@ class CoverSettingsWidget(QWidget): la.setWordWrap(True) b = QPushButton(button) b.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) - b.clicked.connect(partial(self.change_template, which)) + connect_lambda(b.clicked, self, lambda self: self.change_template(which)) setattr(self, attr + '_button', b) l.addWidget(b) if which != 'footer': diff --git a/src/calibre/gui2/metadata/bulk_download.py b/src/calibre/gui2/metadata/bulk_download.py index 94df9ac9d1..e92a59b063 100644 --- a/src/calibre/gui2/metadata/bulk_download.py +++ b/src/calibre/gui2/metadata/bulk_download.py @@ -8,7 +8,6 @@ __copyright__ = '2011, Kovid Goyal ' __docformat__ = 'restructuredtext en' import os, time, shutil -from functools import partial from threading import Thread from PyQt5.Qt import (QIcon, QDialog, @@ -45,10 +44,11 @@ class Job(ThreadedJob): return open(self.download_debug_log, 'rb') -def show_config(gui, parent): +def show_config(parent): from calibre.gui2.preferences import show_config_widget + from calibre.gui2.ui import get_gui show_config_widget('Sharing', 'Metadata download', parent=parent, - gui=gui, never_shutdown=True) + gui=get_gui(), never_shutdown=True) class ConfirmDialog(QDialog): @@ -95,7 +95,7 @@ class ConfirmDialog(QDialog): b.setIcon(QIcon(I('default_cover.png'))) b = self.b = self.bb.addButton(_('&Configure download'), self.bb.ActionRole) b.setIcon(QIcon(I('config.png'))) - b.clicked.connect(partial(show_config, parent, self)) + connect_lambda(b.clicked, self, lambda self: show_config(self)) l.addWidget(self.bb, 1, 0, 1, 2) b = self.bb.addButton(_('Download &both'), self.bb.AcceptRole)