diff --git a/src/calibre/gui2/tweak_book/preview.py b/src/calibre/gui2/tweak_book/preview.py index d71b485901..62819da82e 100644 --- a/src/calibre/gui2/tweak_book/preview.py +++ b/src/calibre/gui2/tweak_book/preview.py @@ -14,7 +14,7 @@ from PyQt5.Qt import ( ) from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler from PyQt5.QtWebEngineWidgets import ( - QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView + QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings ) from threading import Thread @@ -287,8 +287,8 @@ def create_profile(): ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler) s = ans.settings() s.setDefaultTextEncoding('utf-8') - s.setAttribute(s.FullScreenSupportEnabled, False) - s.setAttribute(s.LinksIncludedInFocusChain, False) + s.setAttribute(QWebEngineSettings.WebAttribute.FullScreenSupportEnabled, False) + s.setAttribute(QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain, False) create_profile.ans = ans return ans diff --git a/src/calibre/gui2/viewer/web_view.py b/src/calibre/gui2/viewer/web_view.py index 955082cdc0..d815fcbc34 100644 --- a/src/calibre/gui2/viewer/web_view.py +++ b/src/calibre/gui2/viewer/web_view.py @@ -13,7 +13,7 @@ from PyQt5.Qt import ( ) from PyQt5.QtWebEngineCore import QWebEngineUrlSchemeHandler from PyQt5.QtWebEngineWidgets import ( - QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView + QWebEnginePage, QWebEngineProfile, QWebEngineScript, QWebEngineView, QWebEngineSettings ) from calibre import as_unicode, prints @@ -223,7 +223,7 @@ def create_profile(): ans.installUrlSchemeHandler(QByteArray(FAKE_PROTOCOL.encode('ascii')), url_handler) s = ans.settings() s.setDefaultTextEncoding('utf-8') - s.setAttribute(s.LinksIncludedInFocusChain, False) + s.setAttribute(QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain, False) create_profile.ans = ans return ans diff --git a/src/calibre/gui2/webengine.py b/src/calibre/gui2/webengine.py index d50ec12240..9c04e99338 100644 --- a/src/calibre/gui2/webengine.py +++ b/src/calibre/gui2/webengine.py @@ -6,7 +6,7 @@ import json from PyQt5.Qt import QObject, Qt, pyqtSignal -from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineView +from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineView, QWebEngineSettings from calibre import prints from calibre.utils.monotonic import monotonic @@ -18,17 +18,17 @@ def secure_webengine(view_or_page_or_settings, for_viewer=False): s = view_or_page_or_settings.settings() if hasattr( view_or_page_or_settings, 'settings') else view_or_page_or_settings a = s.setAttribute - a(s.PluginsEnabled, False) + a(QWebEngineSettings.WebAttribute.PluginsEnabled, False) if not for_viewer: - a(s.JavascriptEnabled, False) + a(QWebEngineSettings.WebAttribute.JavascriptEnabled, False) s.setUnknownUrlSchemePolicy(s.DisallowUnknownUrlSchemes) if hasattr(view_or_page_or_settings, 'setAudioMuted'): view_or_page_or_settings.setAudioMuted(True) - a(s.JavascriptCanOpenWindows, False) - a(s.JavascriptCanAccessClipboard, False) + a(QWebEngineSettings.WebAttribute.JavascriptCanOpenWindows, False) + a(QWebEngineSettings.WebAttribute.JavascriptCanAccessClipboard, False) # ensure javascript cannot read from local files - a(s.LocalContentCanAccessFileUrls, False) - a(s.AllowWindowActivationFromJavaScript, False) + a(QWebEngineSettings.WebAttribute.LocalContentCanAccessFileUrls, False) + a(QWebEngineSettings.WebAttribute.AllowWindowActivationFromJavaScript, False) return s