micro-optimize: use sorted(generator) instead of sorted(newlist)

Or just use the initial value.
This commit is contained in:
Eli Schwartz 2019-08-19 17:28:31 -04:00
parent 074e3ff829
commit 1cd54361c0
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
5 changed files with 7 additions and 7 deletions

View File

@ -615,7 +615,7 @@ class PluginWidget(QWidget,Ui_Form):
# Populate the Presets combo box
self.presets = JSONConfig("catalog_presets")
self.preset_field.addItem("")
self.preset_field_values = sorted([p for p in self.presets], key=sort_key)
self.preset_field_values = sorted(self.presets, key=sort_key)
self.preset_field.addItems(self.preset_field_values)
def preset_change(self, item_name):

View File

@ -156,7 +156,7 @@ class ConfigWidget(QWidget, Ui_ConfigWidget):
formats = set(self.format_map())
extra = formats - set(self.calibre_known_formats)
if extra:
fmts = sorted([x.upper() for x in extra])
fmts = sorted((x.upper() for x in extra))
if not question_dialog(self, _('Unknown formats'),
_('You have enabled the <b>{0}</b> formats for'
' your {1}. The {1} may not support them.'

View File

@ -96,7 +96,7 @@ class Catalog(QDialog, Ui_Dialog):
self.widgets = sorted(self.widgets, key=lambda x: x.TITLE)
# Generate a sorted list of installed catalog formats/sync_enabled pairs
fmts = sorted([x[0] for x in self.fmts])
fmts = sorted((x[0] for x in self.fmts))
self.sync_enabled_formats = []
for fmt in self.fmts:

View File

@ -743,7 +743,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.queries = JSONConfig("search_replace_queries")
self.saved_search_name = ''
self.query_field.addItem("")
self.query_field_values = sorted([q for q in self.queries], key=sort_key)
self.query_field_values = sorted(self.queries, key=sort_key)
self.query_field.addItems(self.query_field_values)
self.query_field.currentIndexChanged[str].connect(self.s_r_query_change)
self.query_field.setCurrentIndex(0)
@ -1323,7 +1323,7 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.query_field.blockSignals(True)
self.query_field.clear()
self.query_field.addItem('')
self.query_field_values = sorted([q for q in self.queries], key=sort_key)
self.query_field_values = sorted(self.queries, key=sort_key)
self.query_field.addItems(self.query_field_values)
self.query_field.blockSignals(False)
self.query_field.setCurrentIndex(self.query_field.findText(name))

View File

@ -90,10 +90,10 @@ def extract_member(
def extract_first_alphabetically(stream):
from calibre.libunzip import sort_key
names_ = sorted([
names_ = sorted((
x for x in names(stream)
if os.path.splitext(x)[1][1:].lower() in {
'png', 'jpg', 'jpeg', 'gif', 'webp'}],
'png', 'jpg', 'jpeg', 'gif', 'webp'}),
key=sort_key)
return extract_member(stream, name=names_[0], match=None)