diff --git a/src/calibre/db/legacy.py b/src/calibre/db/legacy.py index d93491a032..2dddab5c99 100644 --- a/src/calibre/db/legacy.py +++ b/src/calibre/db/legacy.py @@ -289,11 +289,11 @@ class LibraryDatabase: return [[k, v] for k, v in self.new_api.get_usage_count_by_id(field).items()] def field_id_map(self, field): - return list(iteritems(self.new_api.get_id_map(field))) + return list(self.new_api.get_id_map(field).items()) def get_custom_items_with_ids(self, label=None, num=None): try: - return [[k, v] for k, v in iteritems(self.new_api.get_id_map(self.custom_field_name(label, num)))] + return [[k, v] for k, v in self.new_api.get_id_map(self.custom_field_name(label, num)).items()] except ValueError: return [] diff --git a/src/calibre/ebooks/oeb/transforms/split.py b/src/calibre/ebooks/oeb/transforms/split.py index a01f03af34..782a390312 100644 --- a/src/calibre/ebooks/oeb/transforms/split.py +++ b/src/calibre/ebooks/oeb/transforms/split.py @@ -25,7 +25,6 @@ from calibre.ebooks.epub import rules from calibre.ebooks.oeb.base import OEB_STYLES, XHTML, rewrite_links, urldefrag, urlnormalize from calibre.ebooks.oeb.base import XPNSMAP as NAMESPACES from calibre.ebooks.oeb.polish.split import do_split -from polyglot.builtins import iteritems from polyglot.urllib import unquote XPath = functools.partial(_XPath, namespaces=NAMESPACES) @@ -268,7 +267,7 @@ class FlowSplitter: self.trees = [orig_tree] while ordered_ids: - pb_id, (pattern, before) = next(iteritems(ordered_ids)) + pb_id, (pattern, before) = next(iter(ordered_ids.items())) del ordered_ids[pb_id] for i in range(len(self.trees)-1, -1, -1): tree = self.trees[i] diff --git a/src/calibre/gui2/tweak_book/widgets.py b/src/calibre/gui2/tweak_book/widgets.py index 62a577d97a..e6d640fde4 100644 --- a/src/calibre/gui2/tweak_book/widgets.py +++ b/src/calibre/gui2/tweak_book/widgets.py @@ -588,7 +588,7 @@ class NamesModel(QAbstractListModel): if not query: self.items = tuple((text, None) for text in self.names) else: - self.items = tuple(iteritems(self.matcher(query))) + self.items = tuple(self.matcher(query).items()) self.endResetModel() self.filtered.emit(not bool(query)) diff --git a/src/calibre/utils/matcher.py b/src/calibre/utils/matcher.py index 8948676f7e..6547c632e7 100644 --- a/src/calibre/utils/matcher.py +++ b/src/calibre/utils/matcher.py @@ -21,7 +21,6 @@ from calibre.constants import filesystem_encoding from calibre.utils.icu import lower as icu_lower from calibre.utils.icu import primary_collator, primary_find, primary_sort_key from calibre.utils.icu import upper as icu_upper -from polyglot.builtins import iteritems DEFAULT_LEVEL1 = '/' DEFAULT_LEVEL2 = '-_ 0123456789' @@ -360,7 +359,7 @@ def main(basedir=None, query=None): break if not query: break - for path, positions in islice(iteritems(m(query)), 0, 10): + for path, positions in islice(m(query).items(), 0, 10): positions = list(positions) p = 0 while positions: