From 6d2404f9cf5a5184b4f6329cacf73c102d856eca Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 26 Aug 2021 17:27:50 +0200 Subject: Adjust imports --- qutebrowser/browser/webengine/certificateerror.py | 2 +- qutebrowser/browser/webengine/notification.py | 2 +- qutebrowser/browser/webengine/webengineelem.py | 2 +- qutebrowser/browser/webengine/webengineinspector.py | 3 ++- qutebrowser/browser/webengine/webenginetab.py | 2 +- qutebrowser/browser/webengine/webview.py | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) (limited to 'qutebrowser') diff --git a/qutebrowser/browser/webengine/certificateerror.py b/qutebrowser/browser/webengine/certificateerror.py index e0d54f6e9..7ca2adf61 100644 --- a/qutebrowser/browser/webengine/certificateerror.py +++ b/qutebrowser/browser/webengine/certificateerror.py @@ -20,7 +20,7 @@ """Wrapper over a QWebEngineCertificateError.""" from PyQt6.QtCore import QUrl -from PyQt6.QtWebEngineWidgets import QWebEngineCertificateError +from PyQt6.QtWebEngineCore import QWebEngineCertificateError from qutebrowser.utils import usertypes, utils, debug diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py index 1c06127a6..0749724e8 100644 --- a/qutebrowser/browser/webengine/notification.py +++ b/qutebrowser/browser/webengine/notification.py @@ -238,7 +238,7 @@ class NotificationBridgePresenter(QObject): # Fixed in PyQtWebEngine 5.15.0 # PYQT_WEBENGINE_VERSION was added with PyQtWebEngine 5.13, but if we're here, # we already did a version check above. - from PyQt6.QtWebEngine import PYQT_WEBENGINE_VERSION + from PyQt6.QtWebEngineCore import PYQT_WEBENGINE_VERSION if PYQT_WEBENGINE_VERSION < 0x050F00: # PyQtWebEngine unrefs the callback after it's called, for some # reason. So we call setNotificationPresenter again to *increase* diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py index ed32ed469..f366a7475 100644 --- a/qutebrowser/browser/webengine/webengineelem.py +++ b/qutebrowser/browser/webengine/webengineelem.py @@ -24,7 +24,7 @@ from typing import ( from PyQt6.QtCore import QRect, QEventLoop from PyQt6.QtWidgets import QApplication -from PyQt6.QtWebEngineWidgets import QWebEngineSettings +from PyQt6.QtWebEngineCore import QWebEngineSettings from qutebrowser.utils import log, javascript, urlutils, usertypes, utils from qutebrowser.browser import webelem diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py index 1c3bf80fd..7ad51fd7b 100644 --- a/qutebrowser/browser/webengine/webengineinspector.py +++ b/qutebrowser/browser/webengine/webengineinspector.py @@ -22,7 +22,8 @@ import pathlib from PyQt6.QtCore import QLibraryInfo -from PyQt6.QtWebEngineWidgets import QWebEngineView, QWebEnginePage +from PyQt6.QtWebEngineWidgets import QWebEngineView +from PyQt6.QtWebEngineCore import QWebEnginePage from PyQt6.QtWidgets import QWidget from qutebrowser.browser import inspector diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index d71a31ad5..ae065cece 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -29,7 +29,7 @@ from typing import cast, Union, Optional from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QPointF, QUrl, QObject from PyQt6.QtNetwork import QAuthenticator from PyQt6.QtWidgets import QWidget -from PyQt6.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineHistory +from PyQt6.QtWebEngineCore import QWebEnginePage, QWebEngineScript, QWebEngineHistory from qutebrowser.config import config from qutebrowser.browser import browsertab, eventfilter, shared, webelem, greasemonkey diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index d82dbcff7..58592feef 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -23,7 +23,8 @@ from typing import List, Iterable from PyQt6.QtCore import pyqtSignal, QUrl from PyQt6.QtGui import QPalette -from PyQt6.QtWebEngineWidgets import QWebEngineView, QWebEnginePage +from PyQt6.QtWebEngineWidgets import QWebEngineView +from PyQt6.QtWebEngineCore import QWebEnginePage from qutebrowser.browser import shared from qutebrowser.browser.webengine import webenginesettings, certificateerror -- cgit v1.2.3-54-g00ecf