From 9c897eb9269f2ba7c1e133a2bbad18adb8585cf6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 26 Mar 2019 18:07:42 +0530 Subject: [PATCH] Some more iteritems fixes --- src/calibre/gui2/tweak_book/preview.py | 4 ++-- src/calibre/gui2/viewer2/web_view.py | 3 ++- src/calibre/gui2/webengine.py | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index 8125b8ba06..eb818ec645 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -37,7 +37,7 @@ from calibre.gui2.webengine import ( ) from calibre.gui2.widgets2 import HistoryLineEdit2 from calibre.utils.ipc.simple_worker import offload_worker -from polyglot.builtins import unicode_type +from polyglot.builtins import iteritems, unicode_type from polyglot.queue import Empty, Queue from polyglot.urllib import urlparse @@ -206,7 +206,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): def check_for_parse(self): remove = [] - for name, requests in self.requests.iteritems(): + for name, requests in iteritems(self.requests): data = parse_worker.get_data(name) if data is not None: if not isinstance(data, bytes): diff --git a/src/calibre/gui2/viewer2/web_view.py b/src/calibre/gui2/viewer2/web_view.py index 038db07f51..448c798d35 100644 --- a/src/calibre/gui2/viewer2/web_view.py +++ b/src/calibre/gui2/viewer2/web_view.py @@ -25,6 +25,7 @@ from calibre.gui2.webengine import ( secure_webengine, to_js ) from calibre.utils.config import JSONConfig +from polyglot.builtins import iteritems try: from PyQt5 import sip @@ -301,7 +302,7 @@ class WebView(RestartingWebEngineView): return self._page.bridge def on_bridge_ready(self): - for func, args in self.pending_bridge_ready_actions.iteritems(): + for func, args in iteritems(self.pending_bridge_ready_actions): getattr(self.bridge, func)(*args) def start_book_load(self): diff --git a/src/calibre/gui2/webengine.py b/src/calibre/gui2/webengine.py index 1c56c6f762..f2e00d289e 100644 --- a/src/calibre/gui2/webengine.py +++ b/src/calibre/gui2/webengine.py @@ -12,6 +12,7 @@ from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngin from calibre import prints from calibre.utils.monotonic import monotonic from calibre.utils.rapydscript import special_title +from polyglot.builtins import iteritems def secure_webengine(view_or_page_or_settings, for_viewer=False): @@ -77,10 +78,10 @@ class Bridge(QObject): def __init__(self, page): QObject.__init__(self, page) - self._signals = json.dumps(tuple({k for k, v in self.__class__.__dict__.iteritems() if isinstance(v, pyqtSignal)})) + self._signals = json.dumps(tuple({k for k, v in iteritems(self.__class__.__dict__) if isinstance(v, pyqtSignal)})) self._signals_registered = False page.titleChanged.connect(self._title_changed) - for k, v in self.__class__.__dict__.iteritems(): + for k, v in iteritems(self.__class__.__dict__): if isinstance(v, to_js): v.name = k @@ -98,7 +99,7 @@ class Bridge(QObject): def _register_signals(self): self._signals_registered = True - for k, v in self.__class__.__dict__.iteritems(): + for k, v in iteritems(self.__class__.__dict__): if isinstance(v, to_js): setattr(self, k, to_js_bound(self, k)) self.page.runJavaScript('python_comm._register_signals(' + self._signals + ')', QWebEngineScript.ApplicationWorld)