From c91d35ffa4b8f0fdb2769eba9c172e5ad4eadce8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 17 Dec 2021 08:38:03 +0530 Subject: [PATCH] Use the correct enum for acceptnavrequest --- src/calibre/gui2/tweak_book/preview.py | 6 +++--- src/calibre/gui2/viewer/web_view.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index adac53e6c6..9a1e72c902 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -14,8 +14,8 @@ from qt.core import ( ) from qt.webengine import ( QWebEngineContextMenuData, QWebEnginePage, QWebEngineProfile, QWebEngineScript, - QWebEngineSettings, QWebEngineUrlRequestInfo, QWebEngineUrlRequestJob, - QWebEngineUrlSchemeHandler, QWebEngineView + QWebEngineSettings, QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler, + QWebEngineView ) from threading import Thread @@ -341,7 +341,7 @@ class WebPage(QWebEnginePage): prints('%s:%s: %s' % (source_id, linenumber, msg)) def acceptNavigationRequest(self, url, req_type, is_main_frame): - if req_type in (QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload, QWebEngineUrlRequestInfo.NavigationType.NavigationTypeBackForward): + if req_type in (QWebEnginePage.NavigationType.NavigationTypeReload, QWebEnginePage.NavigationType.NavigationTypeBackForward): return True if url.scheme() in (FAKE_PROTOCOL, 'data'): return True diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index 4799c3bad9..4bff7f438e 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -13,7 +13,7 @@ from qt.core import ( QWidget, pyqtSignal, sip ) from qt.webengine import ( - QWebEngineUrlRequestInfo, QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler + QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler ) from qt.webengine import ( QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineSettings, @@ -370,7 +370,7 @@ class WebPage(QWebEnginePage): pass def acceptNavigationRequest(self, url, req_type, is_main_frame): - if req_type in (QWebEngineUrlRequestInfo.NavigationType.NavigationTypeReload, QWebEngineUrlRequestInfo.NavigationType.NavigationTypeBackForward): + if req_type in (QWebEnginePage.NavigationType.NavigationTypeReload, QWebEnginePage.NavigationType.NavigationTypeBackForward): return True if url.scheme() in (FAKE_PROTOCOL, 'data'): return True