gryf/ebook-converter
1
0
Fork 0
mirror of https://github.com/gryf/ebook-converter.git synced 2026-03-10 19:45:51 +01: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

22
ebook_converter/css_selectors/select.py
View File

@@ -9,8 +9,6 @@ from ebook_converter.css_selectors.errors import ExpressionError
from ebook_converter.css_selectors.parser import parse, ascii_lower, Element, FunctionalPseudoElement
from ebook_converter.css_selectors.ordered_set import OrderedSet
from ebook_converter.polyglot.builtins import iteritems, itervalues
__license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
@@ -149,7 +147,7 @@ class Select(object):
self.invalidate_caches()
self.default_lang = default_lang
if trace:
self.dispatch_map = {k:trace_wrapper(v) for k, v in iteritems(self.dispatch_map)}
self.dispatch_map = {k:trace_wrapper(v) for k, v in self.dispatch_map.items()}
if ignore_inappropriate_pseudo_classes:
self.ignore_inappropriate_pseudo_classes = INAPPROPRIATE_PSEUDO_CLASSES
else:
@@ -237,7 +235,7 @@ class Select(object):
def map_attrib_name(x):
return ascii_lower(x.rpartition('}')[2])
for tag in self.itertag():
for attr, val in iteritems(tag.attrib):
for attr, val in tag.attrib.items():
am[map_attrib_name(attr)][val].add(tag)
return self._attrib_map
@@ -250,7 +248,7 @@ class Select(object):
def map_attrib_name(x):
return ascii_lower(x.rpartition('}')[2])
for tag in self.itertag():
for attr, val in iteritems(tag.attrib):
for attr, val in tag.attrib.items():
for v in val.split():
am[map_attrib_name(attr)][v].add(tag)
return self._attrib_space_map
@@ -269,7 +267,7 @@ class Select(object):
lang = normalize_language_tag(lang)
for dtag in self.itertag(tag):
lmap[dtag] = lang
for tag, langs in iteritems(lmap):
for tag, langs in lmap.items():
for lang in langs:
lm[lang].add(tag)
return self._lang_map
@@ -426,7 +424,7 @@ def select_attrib(cache, selector):
def select_exists(cache, attrib, value=None):
for elem_set in itervalues(cache.attrib_map[attrib]):
for elem_set in cache.attrib_map[attrib].values():
for elem in elem_set:
yield elem
@@ -444,7 +442,7 @@ def select_includes(cache, attrib, value):
def select_dashmatch(cache, attrib, value):
if value:
for val, elem_set in iteritems(cache.attrib_map[attrib]):
for val, elem_set in cache.attrib_map[attrib].items():
if val == value or val.startswith(value + '-'):
for elem in elem_set:
yield elem
@@ -452,7 +450,7 @@ def select_dashmatch(cache, attrib, value):
def select_prefixmatch(cache, attrib, value):
if value:
for val, elem_set in iteritems(cache.attrib_map[attrib]):
for val, elem_set in cache.attrib_map[attrib].items():
if val.startswith(value):
for elem in elem_set:
yield elem
@@ -460,7 +458,7 @@ def select_prefixmatch(cache, attrib, value):
def select_suffixmatch(cache, attrib, value):
if value:
for val, elem_set in iteritems(cache.attrib_map[attrib]):
for val, elem_set in cache.attrib_map[attrib].items():
if val.endswith(value):
for elem in elem_set:
yield elem
@@ -468,7 +466,7 @@ def select_suffixmatch(cache, attrib, value):
def select_substringmatch(cache, attrib, value):
if value:
for val, elem_set in iteritems(cache.attrib_map[attrib]):
for val, elem_set in cache.attrib_map[attrib].items():
if value in val:
for elem in elem_set:
yield elem
@@ -505,7 +503,7 @@ def select_lang(cache, function):
if lang:
lang = ascii_lower(lang)
lp = lang + '-'
for tlang, elem_set in iteritems(cache.lang_map):
for tlang, elem_set in cache.lang_map.items():
if tlang == lang or (tlang is not None and tlang.startswith(lp)):
for elem in elem_set:
yield elem