From 9d46c5344cc4e118c661c81fce0f211bcaaf2fc2 Mon Sep 17 00:00:00 2001 From: un-pogaz <46523284+un-pogaz@users.noreply.github.com> Date: Fri, 24 Jan 2025 11:14:18 +0100 Subject: [PATCH] unnecessary map (extra-edit) --- src/calibre/devices/kindle/apnx_page_generator/pages.py | 2 +- src/calibre/ebooks/mobi/utils.py | 2 +- src/calibre/gui2/dialogs/metadata_bulk.py | 4 ++-- src/calibre/gui2/dialogs/template_dialog_code_widget.py | 2 +- src/calibre/gui2/preferences/columns.py | 5 ++++- src/calibre/gui2/preferences/texture_chooser.py | 2 +- src/calibre/gui2/tweak_book/diff/view.py | 2 +- src/calibre/gui2/tweak_book/editor/text.py | 2 +- src/calibre/srv/users.py | 4 ++-- 9 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/calibre/devices/kindle/apnx_page_generator/pages.py b/src/calibre/devices/kindle/apnx_page_generator/pages.py index 9c92bf4637..aa8e1ea51b 100644 --- a/src/calibre/devices/kindle/apnx_page_generator/pages.py +++ b/src/calibre/devices/kindle/apnx_page_generator/pages.py @@ -38,6 +38,6 @@ class Pages: @property def number_of_pages(self) -> int: - return sum([len(pg.page_locations) for pg in self.__pages_groups]) + return sum(len(pg.page_locations) for pg in self.__pages_groups) diff --git a/src/calibre/ebooks/mobi/utils.py b/src/calibre/ebooks/mobi/utils.py index 073d56dc74..c4f9dc3b10 100644 --- a/src/calibre/ebooks/mobi/utils.py +++ b/src/calibre/ebooks/mobi/utils.py @@ -647,4 +647,4 @@ def convert_color_for_font_tag(val): def clamp(x): return min(x, max(0, x), 1) rgb = map(clamp, rgba[:3]) - return '#' + ''.join(('%02x' % int(x * 255) for x in rgb)) + return '#' + ''.join('%02x' % int(x * 255) for x in rgb) diff --git a/src/calibre/gui2/dialogs/metadata_bulk.py b/src/calibre/gui2/dialogs/metadata_bulk.py index 1bf8a3c016..73aef28b32 100644 --- a/src/calibre/gui2/dialogs/metadata_bulk.py +++ b/src/calibre/gui2/dialogs/metadata_bulk.py @@ -660,8 +660,8 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog): self.button_transform_publishers.clicked.connect(self.transform_publishers) self.button_transform_series.clicked.connect(self.transform_series) self.tag_map_rules = self.author_map_rules = self.publisher_map_rules = self.series_map_rules = () - tuple(((b.clicked.connect(self.clear_transform_rules_for), b.setIcon(QIcon.ic('clear_left.png')), b.setToolTip(_( - 'Clear the rules'))) for b in (self.button_clear_tags_rules, self.button_clear_authors_rules, self.button_clear_publishers_rules))) + tuple((b.clicked.connect(self.clear_transform_rules_for), b.setIcon(QIcon.ic('clear_left.png')), b.setToolTip(_('Clear the rules'))) + for b in (self.button_clear_tags_rules, self.button_clear_authors_rules, self.button_clear_publishers_rules)) self.update_transform_labels() if starting_tab < 0: starting_tab = gprefs.get('bulk_metadata_window_tab', 0) diff --git a/src/calibre/gui2/dialogs/template_dialog_code_widget.py b/src/calibre/gui2/dialogs/template_dialog_code_widget.py index 9a3ec98a58..022e85ddb9 100644 --- a/src/calibre/gui2/dialogs/template_dialog_code_widget.py +++ b/src/calibre/gui2/dialogs/template_dialog_code_widget.py @@ -59,7 +59,7 @@ class CodeEditor(QPlainTextEdit): def line_number_area_width(self): # get largest width of digits fm = self.fontMetrics() - self.number_width = max((fm.horizontalAdvance(str(x)) for x in range(10))) + self.number_width = max(fm.horizontalAdvance(str(x)) for x in range(10)) digits = 1 limit = max(1, self.blockCount()) while limit >= 10: diff --git a/src/calibre/gui2/preferences/columns.py b/src/calibre/gui2/preferences/columns.py index 98a413d15f..7fb66a17a2 100644 --- a/src/calibre/gui2/preferences/columns.py +++ b/src/calibre/gui2/preferences/columns.py @@ -107,7 +107,10 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form): self.opt_columns.verticalHeader().hide() self.opt_columns.setRowCount(len(colmap)) - self.column_desc = {CreateCustomColumn.column_types[x]['datatype']: CreateCustomColumn.column_types[x]['text'] for x in CreateCustomColumn.column_types} + self.column_desc = { + CreateCustomColumn.column_types[x]['datatype']: CreateCustomColumn.column_types[x]['text'] + for x in CreateCustomColumn.column_types + } for row, key in enumerate(colmap): self.setup_row(row, key, row) diff --git a/src/calibre/gui2/preferences/texture_chooser.py b/src/calibre/gui2/preferences/texture_chooser.py index 3d04b6d52c..a91b06baed 100644 --- a/src/calibre/gui2/preferences/texture_chooser.py +++ b/src/calibre/gui2/preferences/texture_chooser.py @@ -86,7 +86,7 @@ class TextureChooser(QDialog): images = [{ 'fname': ':'+os.path.basename(x), 'path': x, - 'name': ' '.join((s.capitalize() for s in os.path.splitext(os.path.basename(x))[0].split('_'))) + 'name': ' '.join(s.capitalize() for s in os.path.splitext(os.path.basename(x))[0].split('_')) } for x in glob.glob(I('textures/*.png'))] + [{ 'fname': os.path.basename(x), 'path': x, diff --git a/src/calibre/gui2/tweak_book/diff/view.py b/src/calibre/gui2/tweak_book/diff/view.py index 12e0735604..93515d1e0b 100644 --- a/src/calibre/gui2/tweak_book/diff/view.py +++ b/src/calibre/gui2/tweak_book/diff/view.py @@ -181,7 +181,7 @@ class TextBrowser(PlainTextEdit): # {{{ def calculate_metrics(self): fm = self.fontMetrics() - self.number_width = max((fm.horizontalAdvance(str(x)) for x in range(10))) + self.number_width = max(fm.horizontalAdvance(str(x)) for x in range(10)) self.space_width = fm.horizontalAdvance(' ') def show_context_menu(self, pos): diff --git a/src/calibre/gui2/tweak_book/editor/text.py b/src/calibre/gui2/tweak_book/editor/text.py index 63b7c96a1f..e90a82ff37 100644 --- a/src/calibre/gui2/tweak_book/editor/text.py +++ b/src/calibre/gui2/tweak_book/editor/text.py @@ -282,7 +282,7 @@ class TextEdit(PlainTextEdit): self.setFont(font) self.highlighter.apply_theme(theme) fm = self.fontMetrics() - self.number_width = max((fm.horizontalAdvance(str(x)) for x in range(10))) + self.number_width = max(fm.horizontalAdvance(str(x)) for x in range(10)) self.size_hint = QSize(self.expected_geometry[0] * fm.averageCharWidth(), self.expected_geometry[1] * fm.height()) self.highlight_color = theme_color(theme, 'HighlightRegion', 'bg') self.highlight_cursor_line() diff --git a/src/calibre/srv/users.py b/src/calibre/srv/users.py index e10859a1a1..d23cb68cff 100644 --- a/src/calibre/srv/users.py +++ b/src/calibre/srv/users.py @@ -36,8 +36,8 @@ def parse_restriction(raw): lr = r.get('library_restrictions', {}) if not isinstance(lr, dict): lr = {} - r['allowed_library_names'] = frozenset((x.lower() for x in r.get('allowed_library_names', ()))) - r['blocked_library_names'] = frozenset((x.lower() for x in r.get('blocked_library_names', ()))) + r['allowed_library_names'] = frozenset(x.lower() for x in r.get('allowed_library_names', ())) + r['blocked_library_names'] = frozenset(x.lower() for x in r.get('blocked_library_names', ())) r['library_restrictions'] = {k.lower(): v or '' for k, v in iteritems(lr)} return r