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

do not use a side effect of allocating list(map(...)) to execute functions for each member of a list

Browse Source
This commit is contained in:
Eli Schwartz 2020-02-23 01:34:34 -05:00
parent d76bf7a13d
commit da8092c58a
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
16 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/ebooks/docx/to_html.py
View File

@ -182,7 +182,8 @@ class Convert:
indent = float(style.text_indent[:-2]) + indent indent = float(style.text_indent[:-2]) + indent
style.text_indent = '%.3gpt' % indent style.text_indent = '%.3gpt' % indent
parent.text = tabs[-1].tail or '' parent.text = tabs[-1].tail or ''
list(map(parent.remove, tabs)) for i in tabs:
parent.remove(i)
self.images.rid_map = orig_rid_map self.images.rid_map = orig_rid_map

10
src/calibre/ebooks/mobi/writer2/indexer.py
View File

@ -65,8 +65,8 @@ class TAGX: # {{{
''' '''
TAGX block for the Primary index header of a periodical TAGX block for the Primary index header of a periodical
''' '''
list(map(self.add_tag, (1, 2, 3, 4, 5, 21, 22, 23, 0, 69, 70, 71, 72, for i in (1, 2, 3, 4, 5, 21, 22, 23, 0, 69, 70, 71, 72,73, 0):
73, 0))) self.add_tag(i)
return self.header(2) + bytes(self.byts) return self.header(2) + bytes(self.byts)
@property @property
@ -74,7 +74,8 @@ class TAGX: # {{{
''' '''
TAGX block for the secondary index header of a periodical TAGX block for the secondary index header of a periodical
''' '''
list(map(self.add_tag, (11, 0))) for i in (11, 0):
self.add_tag(i)
return self.header(1) + bytes(self.byts) return self.header(1) + bytes(self.byts)
@property @property
@ -82,7 +83,8 @@ class TAGX: # {{{
''' '''
TAGX block for the primary index header of a flat book TAGX block for the primary index header of a flat book
''' '''
list(map(self.add_tag, (1, 2, 3, 4, 0))) for i in (1, 2, 3, 4, 0):
self.add_tag(i)
return self.header(1) + bytes(self.byts) return self.header(1) + bytes(self.byts)

3
src/calibre/ebooks/oeb/parse_utils.py
View File

@ -65,7 +65,8 @@ def merge_multiple_html_heads_and_bodies(root, log=None):
for b in bodies: for b in bodies:
for x in b: for x in b:
body.append(x) body.append(x)
tuple(map(root.append, (head, body))) for x in (head, body):
root.append(x)
if log is not None: if log is not None:
log.warn('Merging multiple <head> and <body> sections') log.warn('Merging multiple <head> and <body> sections')
return root return root

3
src/calibre/ebooks/oeb/polish/check/css.py
View File

@ -221,7 +221,8 @@ class Pool:
if not sip.isdeleted(x): if not sip.isdeleted(x):
sip.delete(x) sip.delete(x)
tuple(map(safe_delete, self.workers)) for i in self.workers:
safe_delete(i)
self.workers = [] self.workers = []

3
src/calibre/ebooks/oeb/polish/check/links.py
View File

@ -410,7 +410,8 @@ def check_external_links(container, progress_callback=(lambda num, total:None),
return [] return []
items = Queue() items = Queue()
ans = [] ans = []
tuple(map(items.put, iteritems(external_links))) for el in iteritems(external_links):
items.put(el)
progress_callback(0, len(external_links)) progress_callback(0, len(external_links))
done = [] done = []
downloaded_html_ids = {} downloaded_html_ids = {}

3
src/calibre/ebooks/oeb/polish/container.py
View File

@ -825,7 +825,8 @@ class Container(ContainerBase): # {{{
imap = {name:item_id for item_id, name in iteritems(imap)} imap = {name:item_id for item_id, name in iteritems(imap)}
items = [item for item, name, linear in self.spine_iter] items = [item for item, name, linear in self.spine_iter]
tail, last_tail = (items[0].tail, items[-1].tail) if items else ('\n ', '\n ') tail, last_tail = (items[0].tail, items[-1].tail) if items else ('\n ', '\n ')
tuple(map(self.remove_from_xml, items)) for i in items:
self.remove_from_xml(i)
spine = self.opf_xpath('//opf:spine')[0] spine = self.opf_xpath('//opf:spine')[0]
spine.text = tail spine.text = tail
for name, linear in spine_items: for name, linear in spine_items:

3
src/calibre/ebooks/oeb/polish/replace.py
View File

@ -384,7 +384,8 @@ def remove_links_to(container, predicate):
removed = remove_links_in_sheet(partial(container.href_to_name, base=name), container.parsed(name), predicate) removed = remove_links_in_sheet(partial(container.href_to_name, base=name), container.parsed(name), predicate)
if removed: if removed:
changed.add(name) changed.add(name)
tuple(map(container.dirty, changed)) for i in changed:
container.dirty(i)
return changed return changed

3
src/calibre/ebooks/pdf/html_writer.py
View File

@ -456,7 +456,8 @@ def add_anchors_markup(root, uuid, anchors):
a.tail = '\n' a.tail = '\n'
div.append(a) div.append(a)
a.count = 0 a.count = 0
tuple(map(a, anchors)) for anchor in anchors:
a(anchor)
a(uuid) a(uuid)

3
src/calibre/gui2/icon_theme.py
View File

@ -490,7 +490,8 @@ def get_cover(metadata):
def get_covers(themes, dialog, num_of_workers=8): def get_covers(themes, dialog, num_of_workers=8):
items = Queue() items = Queue()
tuple(map(items.put, themes)) for i in themes:
items.put(i)
def callback(metadata, x): def callback(metadata, x):
if not sip.isdeleted(dialog) and not dialog.dialog_closed: if not sip.isdeleted(dialog) and not dialog.dialog_closed:

2
src/calibre/gui2/preferences/server.py
View File

@ -217,7 +217,7 @@ class Choices(QComboBox):
self.setEditable(False) self.setEditable(False)
opt = options[name] opt = options[name]
self.choices = opt.choices self.choices = opt.choices
tuple(map(self.addItem, opt.choices)) self.addItems(opt.choices)
self.currentIndexChanged.connect(self.changed_signal.emit) self.currentIndexChanged.connect(self.changed_signal.emit)
init_opt(self, opt, layout) init_opt(self, opt, layout)

4
src/calibre/gui2/tag_browser/ui.py
View File

@ -600,8 +600,8 @@ class TagBrowserBar(QWidget): # {{{
find_shown = self.toggle_search_button.isChecked() find_shown = self.toggle_search_button.isChecked()
self.toggle_search_button.setVisible(not find_shown) self.toggle_search_button.setVisible(not find_shown)
l = self.layout() l = self.layout()
items = [l.itemAt(i) for i in range(l.count())] for i in (l.itemAt(i) for i in range(l.count())):
tuple(map(l.removeItem, items)) l.removeItem(i)
if find_shown: if find_shown:
l.addWidget(self.alter_tb) l.addWidget(self.alter_tb)
self.alter_tb.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly) self.alter_tb.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonIconOnly)

3
src/calibre/gui2/tweak_book/boss.py
View File

@ -391,7 +391,8 @@ class Boss(QObject):
if ef: if ef:
if isinstance(ef, str): if isinstance(ef, str):
ef = [ef] ef = [ef]
tuple(map(self.gui.file_list.request_edit, ef)) for i in ef:
self.gui.file_list.request_edit(i)
else: else:
if tprefs['restore_book_state']: if tprefs['restore_book_state']:
self.restore_book_edit_state() self.restore_book_edit_state()

3
src/calibre/gui2/tweak_book/file_list.py
View File

@ -1129,7 +1129,8 @@ class MergeDialog(QDialog): # {{{
buttons = self.buttons = [QRadioButton(n) for n in names] buttons = self.buttons = [QRadioButton(n) for n in names]
buttons[0].setChecked(True) buttons[0].setChecked(True)
tuple(map(w.l.addWidget, buttons)) for i in buttons:
w.l.addWidget(i)
sa.setWidget(w) sa.setWidget(w)
self.resize(self.sizeHint() + QSize(150, 20)) self.resize(self.sizeHint() + QSize(150, 20))

3
src/calibre/srv/http_response.py
View File

@ -254,7 +254,8 @@ class RequestData: # {{{
def filesystem_file_with_custom_etag(self, output, *etag_parts): def filesystem_file_with_custom_etag(self, output, *etag_parts):
etag = hashlib.sha1() etag = hashlib.sha1()
tuple(map(lambda x:etag.update(str(x).encode('utf-8')), etag_parts)) for i in etag_parts:
etag.update(str(i).encode('utf-8'))
return ETaggedFile(output, etag.hexdigest()) return ETaggedFile(output, etag.hexdigest())
def filesystem_file_with_constant_etag(self, output, etag_as_hexencoded_string): def filesystem_file_with_constant_etag(self, output, etag_as_hexencoded_string):

3
src/calibre/srv/render_book.py
View File

@ -194,7 +194,8 @@ def toc_anchor_map(toc):
if name and node['id'] not in seen_map[name]: if name and node['id'] not in seen_map[name]:
ans[name].append({'id':node['id'], 'frag':node['frag']}) ans[name].append({'id':node['id'], 'frag':node['frag']})
seen_map[name].add(node['id']) seen_map[name].add(node['id'])
tuple(map(process_node, node['children'])) for i in node['children']:
process_node(i)
process_node(toc) process_node(toc)
return dict(ans) return dict(ans)

3
src/calibre/utils/fonts/sfnt/subset.py
View File

@ -272,7 +272,8 @@ def main(args):
raise SystemExit(1) raise SystemExit(1)
if opts.codes: if opts.codes:
parts = tuple(map(conv_code, parts)) parts = tuple(map(conv_code, parts))
tuple(map(not_single, parts)) for i in parts:
not_single(i)
ranges.add(tuple(parts)) ranges.add(tuple(parts))
else: else:
if opts.codes: if opts.codes: