From 1cd54361c0d5647ad7c19c05df2df258d9b84663 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 19 Aug 2019 17:28:31 -0400 Subject: [PATCH] micro-optimize: use sorted(generator) instead of sorted(newlist) Or just use the initial value. --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 2 +- src/calibre/gui2/device_drivers/configwidget.py | 2 +- src/calibre/gui2/dialogs/catalog.py | 2 +- src/calibre/gui2/dialogs/metadata_bulk.py | 4 ++-- src/calibre/utils/unrar.py | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 2f7555d269..1b9c66f9ae 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -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): diff --git a/src/calibre/gui2/device_drivers/configwidget.py b/src/calibre/gui2/device_drivers/configwidget.py index 61458c0871..a6be604f38 100644 --- a/src/calibre/gui2/device_drivers/configwidget.py +++ b/src/calibre/gui2/device_drivers/configwidget.py @@ -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 {0} formats for' ' your {1}. The {1} may not support them.' diff --git a/src/calibre/gui2/dialogs/catalog.py b/src/calibre/gui2/dialogs/catalog.py index f10eab4384..11ec86e87d 100644 --- a/src/calibre/gui2/dialogs/catalog.py +++ b/src/calibre/gui2/dialogs/catalog.py @@ -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: diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index bd90a71d03..11bda1a892 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -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)) diff --git a/src/calibre/utils/unrar.py b/src/calibre/utils/unrar.py index 9f7054f1b6..7b196dbd11 100644 --- a/src/calibre/utils/unrar.py +++ b/src/calibre/utils/unrar.py @@ -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)