From 49a38d23d12bedbd8c2728f796535e60a3cc6525 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 20 Dec 2020 11:40:10 +0530 Subject: [PATCH] More stupid PyQt enums --- src/calibre/gui2/tweak_book/preview.py | 10 +++++----- src/calibre/gui2/viewer/web_view.py | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index d04e978220..6d892cc62a 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -12,7 +12,7 @@ from PyQt5.Qt import ( QApplication, QByteArray, QHBoxLayout, QIcon, QLabel, QMenu, QSize, QSizePolicy, QStackedLayout, Qt, QTimer, QToolBar, QUrl, QVBoxLayout, QWidget, pyqtSignal ) -from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler +from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob from PyQt5.QtWebEngineWidgets import ( QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings ) @@ -171,11 +171,11 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): def requestStarted(self, rq): if bytes(rq.requestMethod()) != b'GET': - rq.fail(rq.RequestDenied) + rq.fail(QWebEngineUrlRequestJob.Error.RequestDenied) return url = rq.requestUrl() if url.host() != FAKE_HOST or url.scheme() != FAKE_PROTOCOL: - rq.fail(rq.UrlNotFound) + rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound) return name = url.path()[1:] try: @@ -184,7 +184,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): return c = current_container() if not c.has_name(name): - rq.fail(rq.UrlNotFound) + rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound) return mime_type = c.mime_map.get(name, 'application/octet-stream') if mime_type in OEB_DOCS: @@ -205,7 +205,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): except Exception: import traceback traceback.print_exc() - rq.fail(rq.RequestFailed) + rq.fail(QWebEngineUrlRequestJob.Error.RequestFailed) def check_for_parse(self): remove = [] diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index 97a4df74aa..8f772c42bf 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -11,7 +11,7 @@ from PyQt5.Qt import ( QT_VERSION, QApplication, QBuffer, QByteArray, QFontDatabase, QFontInfo, QPalette, QEvent, QHBoxLayout, QMimeData, QSize, Qt, QTimer, QUrl, QWidget, pyqtSignal, QIODevice, QLocale ) -from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler +from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob from PyQt5.QtWebEngineWidgets import ( QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings ) @@ -124,14 +124,14 @@ def handle_mathjax_request(rq, name): raw = f.read() except EnvironmentError as err: prints("Failed to get mathjax file: {} with error: {}".format(name, err), file=sys.stderr) - rq.fail(rq.RequestFailed) + rq.fail(QWebEngineUrlRequestJob.Error.RequestFailed) return if name.endswith('/startup.js'): raw = P('pdf-mathjax-loader.js', data=True, allow_user_override=False) + raw send_reply(rq, mt, raw) else: prints("Failed to get mathjax file: {} outside mathjax directory".format(name), file=sys.stderr) - rq.fail(rq.RequestFailed) + rq.fail(QWebEngineUrlRequestJob.Error.RequestFailed) class UrlSchemeHandler(QWebEngineUrlSchemeHandler): @@ -142,7 +142,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): def requestStarted(self, rq): if bytes(rq.requestMethod()) != b'GET': - return self.fail_request(rq, rq.RequestDenied) + return self.fail_request(rq, QWebEngineUrlRequestJob.Error.RequestDenied) url = rq.requestUrl() host = url.host() if host not in self.allowed_hosts or url.scheme() != FAKE_PROTOCOL: @@ -161,7 +161,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): try: data, mime_type = get_data(name) if data is None: - rq.fail(rq.UrlNotFound) + rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound) return data = as_bytes(data) mime_type = { @@ -174,7 +174,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): except Exception: import traceback traceback.print_exc() - return self.fail_request(rq, rq.RequestFailed) + return self.fail_request(rq, QWebEngineUrlRequestJob.Error.RequestFailed) elif name == 'manifest': data = b'[' + set_book_path.manifest + b',' + set_book_path.metadata + b']' send_reply(rq, set_book_path.manifest_mime, data) @@ -183,7 +183,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): if data: send_reply(rq, mt, data) else: - rq.fail(rq.UrlNotFound) + rq.fail(QWebEngineUrlRequestJob.Error.UrlNotFound) elif name.startswith('mathjax/'): handle_mathjax_request(rq, name) elif not name: @@ -193,7 +193,7 @@ class UrlSchemeHandler(QWebEngineUrlSchemeHandler): def fail_request(self, rq, fail_code=None): if fail_code is None: - fail_code = rq.UrlNotFound + fail_code = QWebEngineUrlRequestJob.Error.UrlNotFound rq.fail(fail_code) prints("Blocking FAKE_PROTOCOL request: {}".format(rq.requestUrl().toString()))