Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 18:54:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use the correct enum for acceptnavrequest

Browse Source
This commit is contained in:
Kovid Goyal 2021-12-17 08:38:03 +05:30
parent 0759ab8589
commit c91d35ffa4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/gui2/tweak_book/preview.py
View File

@ -14,8 +14,8 @@ from qt.core import (
) )
from qt.webengine import ( from qt.webengine import (
QWebEngineContextMenuData, QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineContextMenuData, QWebEnginePage, QWebEngineProfile, QWebEngineScript,
QWebEngineSettings, QWebEngineUrlRequestInfo, QWebEngineUrlRequestJob, QWebEngineSettings, QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler,
QWebEngineUrlSchemeHandler, QWebEngineView QWebEngineView
) )
from threading import Thread from threading import Thread
@ -341,7 +341,7 @@ class WebPage(QWebEnginePage):
prints('%s:%s: %s' % (source_id, linenumber, msg)) prints('%s:%s: %s' % (source_id, linenumber, msg))
def acceptNavigationRequest(self, url, req_type, is_main_frame): 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 return True
if url.scheme() in (FAKE_PROTOCOL, 'data'): if url.scheme() in (FAKE_PROTOCOL, 'data'):
return True return True

4
src/calibre/gui2/viewer/web_view.py
View File

@ -13,7 +13,7 @@ from qt.core import (
QWidget, pyqtSignal, sip QWidget, pyqtSignal, sip
) )
from qt.webengine import ( from qt.webengine import (
QWebEngineUrlRequestInfo, QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler QWebEngineUrlRequestJob, QWebEngineUrlSchemeHandler
) )
from qt.webengine import ( from qt.webengine import (
QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineSettings,
@ -370,7 +370,7 @@ class WebPage(QWebEnginePage):
pass pass
def acceptNavigationRequest(self, url, req_type, is_main_frame): 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 return True
if url.scheme() in (FAKE_PROTOCOL, 'data'): if url.scheme() in (FAKE_PROTOCOL, 'data'):
return True return True