gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-04-21 21:51:32 +02:00
Code Issues Projects Releases Wiki Activity

Removed iteritems and itervalues, which are redundant

Browse Source
This commit is contained in:
gryf
2020-04-21 18:20:08 +02:00
parent 9e076e0af4
commit 3234e4de27
82 changed files with 382 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebook_converter/ebooks/docx/styles.py
+8 -9
View File
@@ -4,7 +4,6 @@ from collections import OrderedDict, Counter
from ebook_converter.ebooks.docx.block_styles import ParagraphStyle, inherit, twips
from ebook_converter.ebooks.docx.char_styles import RunStyle
from ebook_converter.ebooks.docx.tables import TableStyle
from ebook_converter.polyglot.builtins import iteritems, itervalues
__license__ = 'GPL v3'
@@ -121,7 +120,7 @@ class Styles(object):
self.default_paragraph_style = self.default_character_style = None
def __iter__(self):
for s in itervalues(self.id_map):
for s in self.id_map.values():
yield s
def __getitem__(self, key):
@@ -340,7 +339,7 @@ class Styles(object):
setattr(s, prop, inherit)
setattr(block_style, prop, next(iter(vals)))
for p, runs in iteritems(layers):
for p, runs in layers.items():
has_links = '1' in {r.get('is-link', None) for r in runs}
char_styles = [self.resolve_run(r) for r in runs]
block_style = self.resolve_paragraph(p)
@@ -420,7 +419,7 @@ class Styles(object):
ps.pageBreakBefore = True
def register(self, css, prefix):
h = hash(frozenset(iteritems(css)))
h = hash(frozenset(css.items()))
ans, _ = self.classes.get(h, (None, None))
if ans is None:
self.counter[prefix] += 1
@@ -429,17 +428,17 @@ class Styles(object):
return ans
def generate_classes(self):
for bs in itervalues(self.para_cache):
for bs in self.para_cache.values():
css = bs.css
if css:
self.register(css, 'block')
for bs in itervalues(self.run_cache):
for bs in self.run_cache.values():
css = bs.css
if css:
self.register(css, 'text')
def class_name(self, css):
h = hash(frozenset(iteritems(css)))
h = hash(frozenset(css.items()))
return self.classes.get(h, (None, None))[0]
def generate_css(self, dest_dir, docx, notes_nopb, nosupsub):
@@ -494,8 +493,8 @@ class Styles(object):
prefix = ef + '\n' + prefix
ans = []
for (cls, css) in sorted(itervalues(self.classes), key=lambda x:x[0]):
b = ('\t%s: %s;' % (k, v) for k, v in iteritems(css))
for (cls, css) in sorted(self.classes.values(), key=lambda x:x[0]):
b = ('\t%s: %s;' % (k, v) for k, v in css.items())
b = '\n'.join(b)
ans.append('.%s {\n%s\n}\n' % (cls, b.rstrip(';')))
return prefix + '\n' + '\n'.join(ans)