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

11
ebook_converter/library/field_metadata.py
View File

@@ -7,7 +7,6 @@ import traceback
from collections import OrderedDict
from ebook_converter.utils.config_base import tweaks
from ebook_converter.polyglot.builtins import iteritems, itervalues
category_icon_map = {
'authors' : 'user_profile.png',
@@ -485,7 +484,7 @@ class FieldMetadata(object):
yield key
def itervalues(self):
return itervalues(self._tb_cats)
return self._tb_cats.values()
def values(self):
return list(self._tb_cats.values())
@@ -496,7 +495,7 @@ class FieldMetadata(object):
iter_items = iteritems
def custom_iteritems(self):
for key, meta in iteritems(self._tb_custom_fields):
for key, meta in self._tb_custom_fields.items():
yield (key, meta)
def items(self):
@@ -683,8 +682,8 @@ def fm_as_dict(self):
'custom_fields': self._tb_custom_fields,
'search_term_map': self._search_term_map,
'custom_label_to_key_map': self.custom_label_to_key_map,
'user_categories': {k:v for k, v in iteritems(self._tb_cats) if v['kind'] == 'user'},
'search_categories': {k:v for k, v in iteritems(self._tb_cats) if v['kind'] == 'search'},
'user_categories': {k:v for k, v in self._tb_cats.items() if v['kind'] == 'user'},
'search_categories': {k:v for k, v in self._tb_cats.items() if v['kind'] == 'search'},
}
@@ -694,6 +693,6 @@ def fm_from_dict(src):
ans._search_term_map = src['search_term_map']
ans.custom_label_to_key_map = src['custom_label_to_key_map']
for q in ('custom_fields', 'user_categories', 'search_categories'):
for k, v in iteritems(src[q]):
for k, v in src[q].items():
ans._tb_cats[k] = v
return ans