diff options
| author | Florian Bruhin <me@the-compiler.org> | 2021-08-26 16:44:25 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2021-08-26 16:44:25 +0200 |
| commit | b13f2eb4485b03cf237ab699da88620ba88e7b4c (patch) | |
| tree | 8a395857a32dcb6781a0c986610da0a889e559d2 /qutebrowser | |
| parent | 2d9e9241265c526ebc97613af8a5063160daaee8 (diff) | |
| download | qutebrowser-b13f2eb4485b03cf237ab699da88620ba88e7b4c.tar.gz qutebrowser-b13f2eb4485b03cf237ab699da88620ba88e7b4c.zip | |
Blanket PyQt5 -> PyQt6
Diffstat (limited to 'qutebrowser')
135 files changed, 290 insertions, 290 deletions
diff --git a/qutebrowser/__init__.py b/qutebrowser/__init__.py index 29a8e4836..73ab78c58 100644 --- a/qutebrowser/__init__.py +++ b/qutebrowser/__init__.py @@ -17,7 +17,7 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see <https://www.gnu.org/licenses/>. -"""A keyboard-driven, vim-like browser based on PyQt5.""" +"""A keyboard-driven, vim-like browser based on PyQt6.""" import os.path @@ -28,6 +28,6 @@ __maintainer__ = __author__ __email__ = "mail@qutebrowser.org" __version__ = "2.3.1" __version_info__ = tuple(int(part) for part in __version__.split('.')) -__description__ = "A keyboard-driven, vim-like browser based on PyQt5." +__description__ = "A keyboard-driven, vim-like browser based on PyQt6." basedir = os.path.dirname(os.path.realpath(__file__)) diff --git a/qutebrowser/api/config.py b/qutebrowser/api/config.py index 19e2b3c3e..3e4cd7e59 100644 --- a/qutebrowser/api/config.py +++ b/qutebrowser/api/config.py @@ -21,7 +21,7 @@ from typing import cast, Any -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.config import config diff --git a/qutebrowser/api/downloads.py b/qutebrowser/api/downloads.py index cd33f5709..4e2511c54 100644 --- a/qutebrowser/api/downloads.py +++ b/qutebrowser/api/downloads.py @@ -23,7 +23,7 @@ import io -from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, QUrl +from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot, QUrl from qutebrowser.browser import downloads, qtnetworkdownloads from qutebrowser.utils import objreg diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 1ab28e8d0..b37db9164 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -46,9 +46,9 @@ import datetime import argparse from typing import Iterable, Optional -from PyQt5.QtWidgets import QApplication, QWidget -from PyQt5.QtGui import QDesktopServices, QPixmap, QIcon -from PyQt5.QtCore import pyqtSlot, QUrl, QObject, QEvent, pyqtSignal, Qt +from PyQt6.QtWidgets import QApplication, QWidget +from PyQt6.QtGui import QDesktopServices, QPixmap, QIcon +from PyQt6.QtCore import pyqtSlot, QUrl, QObject, QEvent, pyqtSignal, Qt import qutebrowser import qutebrowser.resources diff --git a/qutebrowser/browser/browsertab.py b/qutebrowser/browser/browsertab.py index b1827dbf4..04ebf321f 100644 --- a/qutebrowser/browser/browsertab.py +++ b/qutebrowser/browser/browsertab.py @@ -26,17 +26,17 @@ import dataclasses from typing import (cast, TYPE_CHECKING, Any, Callable, Iterable, List, Optional, Sequence, Set, Type, Union) -from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QUrl, QObject, QSizeF, Qt, +from PyQt6.QtCore import (pyqtSignal, pyqtSlot, QUrl, QObject, QSizeF, Qt, QEvent, QPoint, QRect) -from PyQt5.QtGui import QKeyEvent, QIcon, QPixmap -from PyQt5.QtWidgets import QWidget, QApplication, QDialog -from PyQt5.QtPrintSupport import QPrintDialog, QPrinter -from PyQt5.QtNetwork import QNetworkAccessManager +from PyQt6.QtGui import QKeyEvent, QIcon, QPixmap +from PyQt6.QtWidgets import QWidget, QApplication, QDialog +from PyQt6.QtPrintSupport import QPrintDialog, QPrinter +from PyQt6.QtNetwork import QNetworkAccessManager if TYPE_CHECKING: - from PyQt5.QtWebKit import QWebHistory, QWebHistoryItem - from PyQt5.QtWebKitWidgets import QWebPage - from PyQt5.QtWebEngineWidgets import ( + from PyQt6.QtWebKit import QWebHistory, QWebHistoryItem + from PyQt6.QtWebKitWidgets import QWebPage + from PyQt6.QtWebEngineWidgets import ( QWebEngineHistory, QWebEngineHistoryItem, QWebEnginePage) from qutebrowser.keyinput import modeman diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index 8cd73ae4f..291e51822 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -24,8 +24,8 @@ import shlex import functools from typing import cast, Callable, Dict, Union -from PyQt5.QtWidgets import QApplication, QTabBar -from PyQt5.QtCore import Qt, QUrl, QEvent, QUrlQuery +from PyQt6.QtWidgets import QApplication, QTabBar +from PyQt6.QtCore import Qt, QUrl, QEvent, QUrlQuery from qutebrowser.commands import userscripts, runners from qutebrowser.api import cmdutils diff --git a/qutebrowser/browser/downloads.py b/qutebrowser/browser/downloads.py index 4f7897c9d..ff12a7b53 100644 --- a/qutebrowser/browser/downloads.py +++ b/qutebrowser/browser/downloads.py @@ -30,7 +30,7 @@ import tempfile import enum from typing import Any, Dict, IO, List, MutableSequence, Optional, Union -from PyQt5.QtCore import (pyqtSlot, pyqtSignal, Qt, QObject, QModelIndex, +from PyQt6.QtCore import (pyqtSlot, pyqtSignal, Qt, QObject, QModelIndex, QTimer, QAbstractListModel, QUrl) from qutebrowser.browser import pdfjs diff --git a/qutebrowser/browser/downloadview.py b/qutebrowser/browser/downloadview.py index 69c58741a..0c76161f7 100644 --- a/qutebrowser/browser/downloadview.py +++ b/qutebrowser/browser/downloadview.py @@ -22,8 +22,8 @@ import functools from typing import Callable, MutableSequence, Tuple, Union -from PyQt5.QtCore import pyqtSlot, QSize, Qt -from PyQt5.QtWidgets import QListView, QSizePolicy, QMenu, QStyleFactory +from PyQt6.QtCore import pyqtSlot, QSize, Qt +from PyQt6.QtWidgets import QListView, QSizePolicy, QMenu, QStyleFactory from qutebrowser.browser import downloads from qutebrowser.config import stylesheet diff --git a/qutebrowser/browser/eventfilter.py b/qutebrowser/browser/eventfilter.py index 0b5fab096..860287dbc 100644 --- a/qutebrowser/browser/eventfilter.py +++ b/qutebrowser/browser/eventfilter.py @@ -19,7 +19,7 @@ """Event handling for a browser tab.""" -from PyQt5.QtCore import QObject, QEvent, Qt, QTimer +from PyQt6.QtCore import QObject, QEvent, Qt, QTimer from qutebrowser.config import config from qutebrowser.utils import message, log, usertypes, qtutils diff --git a/qutebrowser/browser/greasemonkey.py b/qutebrowser/browser/greasemonkey.py index d0245937f..7f5763812 100644 --- a/qutebrowser/browser/greasemonkey.py +++ b/qutebrowser/browser/greasemonkey.py @@ -29,7 +29,7 @@ import textwrap import dataclasses from typing import cast, List, Sequence -from PyQt5.QtCore import pyqtSignal, QObject, QUrl +from PyQt6.QtCore import pyqtSignal, QObject, QUrl from qutebrowser.utils import (log, standarddir, jinja, objreg, utils, javascript, urlmatch, version, usertypes, message) diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py index 6ac44adbc..33aa95eb5 100644 --- a/qutebrowser/browser/hints.py +++ b/qutebrowser/browser/hints.py @@ -30,8 +30,8 @@ from string import ascii_lowercase from typing import (TYPE_CHECKING, Callable, Dict, Iterable, Iterator, List, Mapping, MutableSequence, Optional, Sequence, Set) -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, Qt, QUrl -from PyQt5.QtWidgets import QLabel +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, Qt, QUrl +from PyQt6.QtWidgets import QLabel from qutebrowser.config import config, configexc from qutebrowser.keyinput import modeman, modeparsers, basekeyparser diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py index 559992327..64ac896b7 100644 --- a/qutebrowser/browser/history.py +++ b/qutebrowser/browser/history.py @@ -25,8 +25,8 @@ import contextlib import pathlib from typing import cast, Mapping, MutableSequence, Optional -from PyQt5.QtCore import pyqtSlot, QUrl, QObject, pyqtSignal -from PyQt5.QtWidgets import QProgressDialog, QApplication +from PyQt6.QtCore import pyqtSlot, QUrl, QObject, pyqtSignal +from PyQt6.QtWidgets import QProgressDialog, QApplication from qutebrowser.config import config from qutebrowser.api import cmdutils diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py index 2b40e97e4..33a30d2ac 100644 --- a/qutebrowser/browser/inspector.py +++ b/qutebrowser/browser/inspector.py @@ -24,9 +24,9 @@ import binascii import enum from typing import cast, Optional -from PyQt5.QtWidgets import QWidget -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent -from PyQt5.QtGui import QCloseEvent +from PyQt6.QtWidgets import QWidget +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent +from PyQt6.QtGui import QCloseEvent from qutebrowser.browser import eventfilter from qutebrowser.config import configfiles diff --git a/qutebrowser/browser/navigate.py b/qutebrowser/browser/navigate.py index 82bf57136..8368a7782 100644 --- a/qutebrowser/browser/navigate.py +++ b/qutebrowser/browser/navigate.py @@ -23,7 +23,7 @@ import re import posixpath from typing import Optional, Set -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import webelem from qutebrowser.config import config diff --git a/qutebrowser/browser/network/pac.py b/qutebrowser/browser/network/pac.py index 3a544c78f..7973cff2d 100644 --- a/qutebrowser/browser/network/pac.py +++ b/qutebrowser/browser/network/pac.py @@ -23,11 +23,11 @@ import sys import functools from typing import Optional -from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, QUrl -from PyQt5.QtNetwork import (QNetworkProxy, QNetworkRequest, QHostInfo, +from PyQt6.QtCore import QObject, pyqtSignal, pyqtSlot, QUrl +from PyQt6.QtNetwork import (QNetworkProxy, QNetworkRequest, QHostInfo, QNetworkReply, QNetworkAccessManager, QHostAddress) -from PyQt5.QtQml import QJSEngine, QJSValue +from PyQt6.QtQml import QJSEngine, QJSValue from qutebrowser.utils import log, utils, qtutils, resources diff --git a/qutebrowser/browser/network/proxy.py b/qutebrowser/browser/network/proxy.py index 2c0187837..9f938a35e 100644 --- a/qutebrowser/browser/network/proxy.py +++ b/qutebrowser/browser/network/proxy.py @@ -19,8 +19,8 @@ """Handling of proxies.""" -from PyQt5.QtCore import QUrl, pyqtSlot -from PyQt5.QtNetwork import QNetworkProxy, QNetworkProxyFactory +from PyQt6.QtCore import QUrl, pyqtSlot +from PyQt6.QtNetwork import QNetworkProxy, QNetworkProxyFactory from qutebrowser.config import config, configtypes from qutebrowser.utils import message, usertypes, urlutils, utils diff --git a/qutebrowser/browser/pdfjs.py b/qutebrowser/browser/pdfjs.py index c180c55f8..d531f71d2 100644 --- a/qutebrowser/browser/pdfjs.py +++ b/qutebrowser/browser/pdfjs.py @@ -22,7 +22,7 @@ import os -from PyQt5.QtCore import QUrl, QUrlQuery +from PyQt6.QtCore import QUrl, QUrlQuery from qutebrowser.utils import resources, javascript, jinja, standarddir, log from qutebrowser.config import config diff --git a/qutebrowser/browser/qtnetworkdownloads.py b/qutebrowser/browser/qtnetworkdownloads.py index f048d293d..2a2a67a69 100644 --- a/qutebrowser/browser/qtnetworkdownloads.py +++ b/qutebrowser/browser/qtnetworkdownloads.py @@ -26,9 +26,9 @@ import functools import dataclasses from typing import Dict, IO, Optional -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QTimer, QUrl -from PyQt5.QtWidgets import QApplication -from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager +from PyQt6.QtCore import pyqtSlot, pyqtSignal, QTimer, QUrl +from PyQt6.QtWidgets import QApplication +from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply, QNetworkAccessManager from qutebrowser.config import config, websettings from qutebrowser.utils import message, usertypes, log, urlutils, utils, debug, objreg diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 68e36d249..fdcd6cf39 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -34,7 +34,7 @@ import collections import secrets from typing import TypeVar, Callable, Dict, List, Optional, Union, Sequence, Tuple -from PyQt5.QtCore import QUrlQuery, QUrl +from PyQt6.QtCore import QUrlQuery, QUrl import qutebrowser from qutebrowser.browser import pdfjs, downloads, history diff --git a/qutebrowser/browser/shared.py b/qutebrowser/browser/shared.py index 8d3ebe730..b5e0c90cb 100644 --- a/qutebrowser/browser/shared.py +++ b/qutebrowser/browser/shared.py @@ -27,7 +27,7 @@ import netrc import tempfile from typing import Callable, Mapping, List, Optional, Iterable, Iterator -from PyQt5.QtCore import QUrl, pyqtBoundSignal +from PyQt6.QtCore import QUrl, pyqtBoundSignal from qutebrowser.config import config from qutebrowser.utils import (usertypes, message, log, objreg, jinja, utils, diff --git a/qutebrowser/browser/signalfilter.py b/qutebrowser/browser/signalfilter.py index 0b002e345..030185652 100644 --- a/qutebrowser/browser/signalfilter.py +++ b/qutebrowser/browser/signalfilter.py @@ -21,7 +21,7 @@ import functools -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from qutebrowser.utils import debug, log, objreg diff --git a/qutebrowser/browser/urlmarks.py b/qutebrowser/browser/urlmarks.py index 944ec23d4..dc0d37284 100644 --- a/qutebrowser/browser/urlmarks.py +++ b/qutebrowser/browser/urlmarks.py @@ -32,7 +32,7 @@ import functools import collections from typing import MutableMapping -from PyQt5.QtCore import pyqtSignal, QUrl, QObject +from PyQt6.QtCore import pyqtSignal, QUrl, QObject from qutebrowser.utils import (message, usertypes, qtutils, urlutils, standarddir, objreg, log) diff --git a/qutebrowser/browser/webelem.py b/qutebrowser/browser/webelem.py index 9ec29ce07..df534f99c 100644 --- a/qutebrowser/browser/webelem.py +++ b/qutebrowser/browser/webelem.py @@ -22,8 +22,8 @@ from typing import cast, TYPE_CHECKING, Iterator, Optional, Set, Union import collections.abc -from PyQt5.QtCore import QUrl, Qt, QEvent, QTimer, QRect, QPoint -from PyQt5.QtGui import QMouseEvent +from PyQt6.QtCore import QUrl, Qt, QEvent, QTimer, QRect, QPoint +from PyQt6.QtGui import QMouseEvent from qutebrowser.config import config from qutebrowser.keyinput import modeman diff --git a/qutebrowser/browser/webengine/certificateerror.py b/qutebrowser/browser/webengine/certificateerror.py index 4df7ce8ab..e0d54f6e9 100644 --- a/qutebrowser/browser/webengine/certificateerror.py +++ b/qutebrowser/browser/webengine/certificateerror.py @@ -19,8 +19,8 @@ """Wrapper over a QWebEngineCertificateError.""" -from PyQt5.QtCore import QUrl -from PyQt5.QtWebEngineWidgets import QWebEngineCertificateError +from PyQt6.QtCore import QUrl +from PyQt6.QtWebEngineWidgets import QWebEngineCertificateError from qutebrowser.utils import usertypes, utils, debug diff --git a/qutebrowser/browser/webengine/interceptor.py b/qutebrowser/browser/webengine/interceptor.py index 0b1040c4d..de7e1ae1f 100644 --- a/qutebrowser/browser/webengine/interceptor.py +++ b/qutebrowser/browser/webengine/interceptor.py @@ -19,8 +19,8 @@ """A request interceptor taking care of adblocking and custom headers.""" -from PyQt5.QtCore import QUrl, QByteArray -from PyQt5.QtWebEngineCore import (QWebEngineUrlRequestInterceptor, +from PyQt6.QtCore import QUrl, QByteArray +from PyQt6.QtWebEngineCore import (QWebEngineUrlRequestInterceptor, QWebEngineUrlRequestInfo) from qutebrowser.config import websettings, config diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py index e40b3e736..f7264ecd6 100644 --- a/qutebrowser/browser/webengine/notification.py +++ b/qutebrowser/browser/webengine/notification.py @@ -50,18 +50,18 @@ import functools import subprocess from typing import Any, List, Dict, Optional, Iterator, TYPE_CHECKING -from PyQt5.QtCore import (Qt, QObject, QVariant, QMetaType, QByteArray, pyqtSlot, +from PyQt6.QtCore import (Qt, QObject, QVariant, QMetaType, QByteArray, pyqtSlot, pyqtSignal, QTimer, QProcess, QUrl) -from PyQt5.QtGui import QImage, QIcon, QPixmap -from PyQt5.QtDBus import (QDBusConnection, QDBusInterface, QDBus, QDBusServiceWatcher, +from PyQt6.QtGui import QImage, QIcon, QPixmap +from PyQt6.QtDBus import (QDBusConnection, QDBusInterface, QDBus, QDBusServiceWatcher, QDBusArgument, QDBusMessage, QDBusError) -from PyQt5.QtWidgets import QSystemTrayIcon +from PyQt6.QtWidgets import QSystemTrayIcon if TYPE_CHECKING: # putting these behind TYPE_CHECKING also means this module is importable # on installs that don't have these - from PyQt5.QtWebEngineCore import QWebEngineNotification - from PyQt5.QtWebEngineWidgets import QWebEngineProfile + from PyQt6.QtWebEngineCore import QWebEngineNotification + from PyQt6.QtWebEngineWidgets import QWebEngineProfile from qutebrowser.config import config from qutebrowser.misc import objects @@ -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 PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION + from PyQt6.QtWebEngine 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/tabhistory.py b/qutebrowser/browser/webengine/tabhistory.py index ab4b05fe9..db166647f 100644 --- a/qutebrowser/browser/webengine/tabhistory.py +++ b/qutebrowser/browser/webengine/tabhistory.py @@ -19,7 +19,7 @@ """QWebHistory serializer for QtWebEngine.""" -from PyQt5.QtCore import QByteArray, QDataStream, QIODevice, QUrl +from PyQt6.QtCore import QByteArray, QDataStream, QIODevice, QUrl from qutebrowser.utils import qtutils diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py index a6a2a1b93..85d7a4ce5 100644 --- a/qutebrowser/browser/webengine/webenginedownloads.py +++ b/qutebrowser/browser/webengine/webenginedownloads.py @@ -23,8 +23,8 @@ import re import os.path import functools -from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QObject -from PyQt5.QtWebEngineWidgets import QWebEngineDownloadItem +from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QObject +from PyQt6.QtWebEngineWidgets import QWebEngineDownloadItem from qutebrowser.browser import downloads, pdfjs from qutebrowser.utils import (debug, usertypes, message, log, objreg, urlutils, diff --git a/qutebrowser/browser/webengine/webengineelem.py b/qutebrowser/browser/webengine/webengineelem.py index 5d4c6ad9a..a992d9d99 100644 --- a/qutebrowser/browser/webengine/webengineelem.py +++ b/qutebrowser/browser/webengine/webengineelem.py @@ -22,9 +22,9 @@ from typing import ( TYPE_CHECKING, Any, Callable, Dict, Iterator, Optional, Set, Tuple, Union) -from PyQt5.QtCore import QRect, QEventLoop -from PyQt5.QtWidgets import QApplication -from PyQt5.QtWebEngineWidgets import QWebEngineSettings +from PyQt6.QtCore import QRect, QEventLoop +from PyQt6.QtWidgets import QApplication +from PyQt6.QtWebEngineWidgets 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 ae31c0bee..7d6a5308c 100644 --- a/qutebrowser/browser/webengine/webengineinspector.py +++ b/qutebrowser/browser/webengine/webengineinspector.py @@ -21,9 +21,9 @@ import pathlib -from PyQt5.QtCore import QLibraryInfo -from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import QLibraryInfo +from PyQt6.QtWebEngineWidgets import QWebEngineView, QWebEnginePage +from PyQt6.QtWidgets import QWidget from qutebrowser.browser import inspector from qutebrowser.browser.webengine import webenginesettings diff --git a/qutebrowser/browser/webengine/webenginequtescheme.py b/qutebrowser/browser/webengine/webenginequtescheme.py index 64361f7c4..100817977 100644 --- a/qutebrowser/browser/webengine/webenginequtescheme.py +++ b/qutebrowser/browser/webengine/webenginequtescheme.py @@ -19,8 +19,8 @@ """QtWebEngine specific qute://* handlers and glue code.""" -from PyQt5.QtCore import QBuffer, QIODevice, QUrl -from PyQt5.QtWebEngineCore import (QWebEngineUrlSchemeHandler, +from PyQt6.QtCore import QBuffer, QIODevice, QUrl +from PyQt6.QtWebEngineCore import (QWebEngineUrlSchemeHandler, QWebEngineUrlRequestJob, QWebEngineUrlScheme) diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 5430cec77..0d0c3b502 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -28,9 +28,9 @@ import os import operator from typing import cast, Any, List, Optional, Tuple, Union, TYPE_CHECKING -from PyQt5.QtGui import QFont -from PyQt5.QtWidgets import QApplication -from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEngineProfile +from PyQt6.QtGui import QFont +from PyQt6.QtWidgets import QApplication +from PyQt6.QtWebEngineWidgets import QWebEngineSettings, QWebEngineProfile from qutebrowser.browser import history from qutebrowser.browser.webengine import (spell, webenginequtescheme, cookies, diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index ace23d14a..6cad141f5 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -26,10 +26,10 @@ import re import html as html_utils from typing import cast, Union, Optional -from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QPoint, QPointF, QUrl, QObject -from PyQt5.QtNetwork import QAuthenticator -from PyQt5.QtWidgets import QWidget -from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineScript, QWebEngineHistory +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 qutebrowser.config import config from qutebrowser.browser import browsertab, eventfilter, shared, webelem, greasemonkey @@ -125,7 +125,7 @@ class _WebEngineSearchWrapHandler: try: # pylint: disable=unused-import - from PyQt5.QtWebEngineCore import QWebEngineFindTextResult + from PyQt6.QtWebEngineCore import QWebEngineFindTextResult except ImportError: # WORKAROUND for some odd PyQt/packaging bug where the # findTextResult signal is available, but QWebEngineFindTextResult @@ -1671,7 +1671,7 @@ class WebEngineTab(browsertab.AbstractTab): try: # pylint: disable=unused-import - from PyQt5.QtWebEngineWidgets import ( + from PyQt6.QtWebEngineWidgets import ( QWebEngineClientCertificateSelection) except ImportError: pass diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index 76ce1a42e..6ca96716b 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -21,9 +21,9 @@ from typing import List, Iterable -from PyQt5.QtCore import pyqtSignal, QUrl -from PyQt5.QtGui import QPalette -from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage +from PyQt6.QtCore import pyqtSignal, QUrl +from PyQt6.QtGui import QPalette +from PyQt6.QtWebEngineWidgets import QWebEngineView, QWebEnginePage from qutebrowser.browser import shared from qutebrowser.browser.webengine import webenginesettings, certificateerror diff --git a/qutebrowser/browser/webkit/cache.py b/qutebrowser/browser/webkit/cache.py index 8494a8477..bad38e2e0 100644 --- a/qutebrowser/browser/webkit/cache.py +++ b/qutebrowser/browser/webkit/cache.py @@ -22,7 +22,7 @@ from typing import cast import os.path -from PyQt5.QtNetwork import QNetworkDiskCache +from PyQt6.QtNetwork import QNetworkDiskCache from qutebrowser.config import config from qutebrowser.utils import utils, standarddir diff --git a/qutebrowser/browser/webkit/certificateerror.py b/qutebrowser/browser/webkit/certificateerror.py index 09237dae9..5abd56d18 100644 --- a/qutebrowser/browser/webkit/certificateerror.py +++ b/qutebrowser/browser/webkit/certificateerror.py @@ -21,7 +21,7 @@ from typing import Sequence -from PyQt5.QtNetwork import QSslError +from PyQt6.QtNetwork import QSslError from qutebrowser.utils import usertypes, utils, debug, jinja diff --git a/qutebrowser/browser/webkit/cookies.py b/qutebrowser/browser/webkit/cookies.py index 055ef64d8..496f8240f 100644 --- a/qutebrowser/browser/webkit/cookies.py +++ b/qutebrowser/browser/webkit/cookies.py @@ -21,8 +21,8 @@ from typing import Sequence -from PyQt5.QtNetwork import QNetworkCookie, QNetworkCookieJar -from PyQt5.QtCore import pyqtSignal, QDateTime +from PyQt6.QtNetwork import QNetworkCookie, QNetworkCookieJar +from PyQt6.QtCore import pyqtSignal, QDateTime from qutebrowser.config import config from qutebrowser.utils import utils, standarddir, objreg, log diff --git a/qutebrowser/browser/webkit/http.py b/qutebrowser/browser/webkit/http.py index eacb95679..6a6165767 100644 --- a/qutebrowser/browser/webkit/http.py +++ b/qutebrowser/browser/webkit/http.py @@ -25,7 +25,7 @@ import dataclasses import os.path from typing import Type -from PyQt5.QtNetwork import QNetworkRequest +from PyQt6.QtNetwork import QNetworkRequest from qutebrowser.utils import log, utils diff --git a/qutebrowser/browser/webkit/mhtml.py b/qutebrowser/browser/webkit/mhtml.py index d9f2d484e..551aaf168 100644 --- a/qutebrowser/browser/webkit/mhtml.py +++ b/qutebrowser/browser/webkit/mhtml.py @@ -36,7 +36,7 @@ import quopri import dataclasses from typing import MutableMapping, Set, Tuple, Callable -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import downloads from qutebrowser.browser.webkit import webkitelem diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index c97c91d66..cf18822c8 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -24,8 +24,8 @@ import html import dataclasses from typing import TYPE_CHECKING, Dict, MutableMapping, Optional, Set -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QUrl, QByteArray -from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslSocket, +from PyQt6.QtCore import pyqtSlot, pyqtSignal, QUrl, QByteArray +from PyQt6.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslSocket, QNetworkProxy) from qutebrowser.config import config diff --git a/qutebrowser/browser/webkit/network/networkreply.py b/qutebrowser/browser/webkit/network/networkreply.py index c1ead3209..5f762d806 100644 --- a/qutebrowser/browser/webkit/network/networkreply.py +++ b/qutebrowser/browser/webkit/network/networkreply.py @@ -26,8 +26,8 @@ """Special network replies..""" -from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest -from PyQt5.QtCore import pyqtSlot, QIODevice, QByteArray, QTimer +from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest +from PyQt6.QtCore import pyqtSlot, QIODevice, QByteArray, QTimer class FixedDataNetworkReply(QNetworkReply): diff --git a/qutebrowser/browser/webkit/network/webkitqutescheme.py b/qutebrowser/browser/webkit/network/webkitqutescheme.py index bccdd1acd..2e6462425 100644 --- a/qutebrowser/browser/webkit/network/webkitqutescheme.py +++ b/qutebrowser/browser/webkit/network/webkitqutescheme.py @@ -19,8 +19,8 @@ """QtWebKit specific qute://* handlers and glue code.""" -from PyQt5.QtCore import QUrl -from PyQt5.QtNetwork import QNetworkReply, QNetworkAccessManager +from PyQt6.QtCore import QUrl +from PyQt6.QtNetwork import QNetworkReply, QNetworkAccessManager from qutebrowser.browser import qutescheme from qutebrowser.browser.webkit.network import networkreply diff --git a/qutebrowser/browser/webkit/tabhistory.py b/qutebrowser/browser/webkit/tabhistory.py index a707030d1..186ad8a7f 100644 --- a/qutebrowser/browser/webkit/tabhistory.py +++ b/qutebrowser/browser/webkit/tabhistory.py @@ -21,7 +21,7 @@ from typing import Any, List, Mapping -from PyQt5.QtCore import QByteArray, QDataStream, QIODevice, QUrl +from PyQt6.QtCore import QByteArray, QDataStream, QIODevice, QUrl from qutebrowser.utils import qtutils diff --git a/qutebrowser/browser/webkit/webkitelem.py b/qutebrowser/browser/webkit/webkitelem.py index 5bf96a610..f70ce0559 100644 --- a/qutebrowser/browser/webkit/webkitelem.py +++ b/qutebrowser/browser/webkit/webkitelem.py @@ -21,9 +21,9 @@ from typing import cast, TYPE_CHECKING, Iterator, List, Optional, Set -from PyQt5.QtCore import QRect, Qt -from PyQt5.QtWebKit import QWebElement, QWebSettings -from PyQt5.QtWebKitWidgets import QWebFrame +from PyQt6.QtCore import QRect, Qt +from PyQt6.QtWebKit import QWebElement, QWebSettings +from PyQt6.QtWebKitWidgets import QWebFrame from qutebrowser.config import config from qutebrowser.utils import log, utils, javascript, usertypes diff --git a/qutebrowser/browser/webkit/webkithistory.py b/qutebrowser/browser/webkit/webkithistory.py index 4149bda88..7e6073eaf 100644 --- a/qutebrowser/browser/webkit/webkithistory.py +++ b/qutebrowser/browser/webkit/webkithistory.py @@ -21,7 +21,7 @@ import functools -from PyQt5.QtWebKit import QWebHistoryInterface +from PyQt6.QtWebKit import QWebHistoryInterface from qutebrowser.utils import debug from qutebrowser.misc import debugcachestats diff --git a/qutebrowser/browser/webkit/webkitinspector.py b/qutebrowser/browser/webkit/webkitinspector.py index 57bcd40ea..be26860cc 100644 --- a/qutebrowser/browser/webkit/webkitinspector.py +++ b/qutebrowser/browser/webkit/webkitinspector.py @@ -19,9 +19,9 @@ """Customized QWebInspector for QtWebKit.""" -from PyQt5.QtWebKit import QWebSettings -from PyQt5.QtWebKitWidgets import QWebInspector, QWebPage -from PyQt5.QtWidgets import QWidget +from PyQt6.QtWebKit import QWebSettings +from PyQt6.QtWebKitWidgets import QWebInspector, QWebPage +from PyQt6.QtWidgets import QWidget from qutebrowser.browser import inspector from qutebrowser.misc import miscwidgets diff --git a/qutebrowser/browser/webkit/webkitsettings.py b/qutebrowser/browser/webkit/webkitsettings.py index cac6236ce..cc67c8494 100644 --- a/qutebrowser/browser/webkit/webkitsettings.py +++ b/qutebrowser/browser/webkit/webkitsettings.py @@ -27,10 +27,10 @@ Module attributes: from typing import cast import os.path -from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QFont -from PyQt5.QtWebKit import QWebSettings -from PyQt5.QtWebKitWidgets import QWebPage +from PyQt6.QtCore import QUrl +from PyQt6.QtGui import QFont +from PyQt6.QtWebKit import QWebSettings +from PyQt6.QtWebKitWidgets import QWebPage from qutebrowser.config import config, websettings from qutebrowser.config.websettings import AttributeInfo as Attr diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index df3491ec2..6c2710fb4 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -24,12 +24,12 @@ import functools import xml.etree.ElementTree from typing import cast, Iterable, Optional -from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QPoint, QTimer, QSizeF, QSize -from PyQt5.QtGui import QIcon -from PyQt5.QtWidgets import QWidget -from PyQt5.QtWebKitWidgets import QWebPage, QWebFrame -from PyQt5.QtWebKit import QWebSettings, QWebHistory, QWebElement -from PyQt5.QtPrintSupport import QPrinter +from PyQt6.QtCore import pyqtSlot, Qt, QUrl, QPoint, QTimer, QSizeF, QSize +from PyQt6.QtGui import QIcon +from PyQt6.QtWidgets import QWidget +from PyQt6.QtWebKitWidgets import QWebPage, QWebFrame +from PyQt6.QtWebKit import QWebSettings, QWebHistory, QWebElement +from PyQt6.QtPrintSupport import QPrinter from qutebrowser.browser import browsertab, shared from qutebrowser.browser.webkit import (webview, tabhistory, webkitelem, diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py index ddbd78de2..747b2d382 100644 --- a/qutebrowser/browser/webkit/webpage.py +++ b/qutebrowser/browser/webkit/webpage.py @@ -23,12 +23,12 @@ import html import functools from typing import cast -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QPoint -from PyQt5.QtGui import QDesktopServices -from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest -from PyQt5.QtWidgets import QFileDialog -from PyQt5.QtPrintSupport import QPrintDialog -from PyQt5.QtWebKitWidgets import QWebPage, QWebFrame +from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QUrl, QPoint +from PyQt6.QtGui import QDesktopServices +from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest +from PyQt6.QtWidgets import QFileDialog +from PyQt6.QtPrintSupport import QPrintDialog +from PyQt6.QtWebKitWidgets import QWebPage, QWebFrame from qutebrowser.config import websettings, config from qutebrowser.browser import pdfjs, shared, downloads, greasemonkey diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py index 0242bed0c..2fbbafe0a 100644 --- a/qutebrowser/browser/webkit/webview.py +++ b/qutebrowser/browser/webkit/webview.py @@ -19,9 +19,9 @@ """The main browser widgets.""" -from PyQt5.QtCore import pyqtSignal, Qt, QUrl -from PyQt5.QtWebKit import QWebSettings -from PyQt5.QtWebKitWidgets import QWebView, QWebPage +from PyQt6.QtCore import pyqtSignal, Qt, QUrl +from PyQt6.QtWebKit import QWebSettings +from PyQt6.QtWebKitWidgets import QWebView, QWebPage from qutebrowser.config import config, stylesheet from qutebrowser.keyinput import modeman diff --git a/qutebrowser/commands/argparser.py b/qutebrowser/commands/argparser.py index f8f083b72..1d57a7031 100644 --- a/qutebrowser/commands/argparser.py +++ b/qutebrowser/commands/argparser.py @@ -21,7 +21,7 @@ import argparse -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.commands import cmdexc from qutebrowser.utils import utils, objreg, log diff --git a/qutebrowser/commands/runners.py b/qutebrowser/commands/runners.py index 5fb054455..b6b0ddd33 100644 --- a/qutebrowser/commands/runners.py +++ b/qutebrowser/commands/runners.py @@ -24,7 +24,7 @@ import re import contextlib from typing import TYPE_CHECKING, Callable, Dict, Iterator, Mapping, MutableMapping -from PyQt5.QtCore import pyqtSlot, QUrl, QObject +from PyQt6.QtCore import pyqtSlot, QUrl, QObject from qutebrowser.api import cmdutils from qutebrowser.commands import cmdexc, parser diff --git a/qutebrowser/commands/userscripts.py b/qutebrowser/commands/userscripts.py index 70c639207..c7ed7e419 100644 --- a/qutebrowser/commands/userscripts.py +++ b/qutebrowser/commands/userscripts.py @@ -24,7 +24,7 @@ import os.path import tempfile from typing import cast, Any, MutableMapping, Tuple -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QSocketNotifier +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QSocketNotifier import qutebrowser from qutebrowser.utils import message, log, objreg, standarddir, utils diff --git a/qutebrowser/completion/completer.py b/qutebrowser/completion/completer.py index 778333854..9d23f3a90 100644 --- a/qutebrowser/completion/completer.py +++ b/qutebrowser/completion/completer.py @@ -22,7 +22,7 @@ import dataclasses from typing import TYPE_CHECKING -from PyQt5.QtCore import pyqtSlot, QObject, QTimer +from PyQt6.QtCore import pyqtSlot, QObject, QTimer from qutebrowser.config import config from qutebrowser.commands import parser, cmdexc diff --git a/qutebrowser/completion/completiondelegate.py b/qutebrowser/completion/completiondelegate.py index 9ea82e876..1ab389e0d 100644 --- a/qutebrowser/completion/completiondelegate.py +++ b/qutebrowser/completion/completiondelegate.py @@ -25,9 +25,9 @@ We use this to be able to highlight parts of the text. import re import html -from PyQt5.QtWidgets import QStyle, QStyleOptionViewItem, QStyledItemDelegate -from PyQt5.QtCore import QRectF, QRegularExpression, QSize, Qt -from PyQt5.QtGui import (QIcon, QPalette, QTextDocument, QTextOption, +from PyQt6.QtWidgets import QStyle, QStyleOptionViewItem, QStyledItemDelegate +from PyQt6.QtCore import QRectF, QRegularExpression, QSize, Qt +from PyQt6.QtGui import (QIcon, QPalette, QTextDocument, QTextOption, QAbstractTextDocumentLayout, QSyntaxHighlighter, QTextCharFormat) diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py index dd8e267fe..a559531ec 100644 --- a/qutebrowser/completion/completionwidget.py +++ b/qutebrowser/completion/completionwidget.py @@ -25,8 +25,8 @@ subclasses to provide completions. from typing import TYPE_CHECKING, Optional -from PyQt5.QtWidgets import QTreeView, QSizePolicy, QStyleFactory, QWidget -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QItemSelectionModel, QSize +from PyQt6.QtWidgets import QTreeView, QSizePolicy, QStyleFactory, QWidget +from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QItemSelectionModel, QSize from qutebrowser.config import config, stylesheet from qutebrowser.completion import completiondelegate diff --git a/qutebrowser/completion/models/completionmodel.py b/qutebrowser/completion/models/completionmodel.py index 81f4bba8e..1499cd352 100644 --- a/qutebrowser/completion/models/completionmodel.py +++ b/qutebrowser/completion/models/completionmodel.py @@ -21,7 +21,7 @@ from typing import MutableSequence -from PyQt5.QtCore import Qt, QModelIndex, QAbstractItemModel +from PyQt6.QtCore import Qt, QModelIndex, QAbstractItemModel from qutebrowser.utils import log, qtutils, utils from qutebrowser.api import cmdutils diff --git a/qutebrowser/completion/models/filepathcategory.py b/qutebrowser/completion/models/filepathcategory.py index b7d74f57a..bcbf881d7 100644 --- a/qutebrowser/completion/models/filepathcategory.py +++ b/qutebrowser/completion/models/filepathcategory.py @@ -31,7 +31,7 @@ import os import os.path from typing import List, Optional, Iterable -from PyQt5.QtCore import QAbstractListModel, QModelIndex, QObject, Qt, QUrl +from PyQt6.QtCore import QAbstractListModel, QModelIndex, QObject, Qt, QUrl from qutebrowser.config import config from qutebrowser.utils import log diff --git a/qutebrowser/completion/models/histcategory.py b/qutebrowser/completion/models/histcategory.py index 8dd1be838..1e5d4e05d 100644 --- a/qutebrowser/completion/models/histcategory.py +++ b/qutebrowser/completion/models/histcategory.py @@ -21,8 +21,8 @@ from typing import Optional -from PyQt5.QtSql import QSqlQueryModel -from PyQt5.QtWidgets import QWidget +from PyQt6.QtSql import QSqlQueryModel +from PyQt6.QtWidgets import QWidget from qutebrowser.misc import sql from qutebrowser.utils import debug, message, log diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py index 352151ebb..1098928eb 100644 --- a/qutebrowser/completion/models/listcategory.py +++ b/qutebrowser/completion/models/listcategory.py @@ -22,9 +22,9 @@ import re from typing import Iterable, Tuple -from PyQt5.QtCore import QSortFilterProxyModel, QRegularExpression -from PyQt5.QtGui import QStandardItem, QStandardItemModel -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import QSortFilterProxyModel, QRegularExpression +from PyQt6.QtGui import QStandardItem, QStandardItemModel +from PyQt6.QtWidgets import QWidget from qutebrowser.completion.models import util from qutebrowser.utils import qtutils, log diff --git a/qutebrowser/completion/models/urlmodel.py b/qutebrowser/completion/models/urlmodel.py index 56af1f7c7..35cac9542 100644 --- a/qutebrowser/completion/models/urlmodel.py +++ b/qutebrowser/completion/models/urlmodel.py @@ -21,7 +21,7 @@ from typing import Dict, Sequence -from PyQt5.QtCore import QAbstractItemModel +from PyQt6.QtCore import QAbstractItemModel from qutebrowser.completion.models import (completionmodel, filepathcategory, listcategory, histcategory) diff --git a/qutebrowser/components/braveadblock.py b/qutebrowser/components/braveadblock.py index 21319cb1b..ecd64e7ec 100644 --- a/qutebrowser/components/braveadblock.py +++ b/qutebrowser/components/braveadblock.py @@ -27,7 +27,7 @@ import contextlib import subprocess from typing import Optional, IO, Iterator -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.api import ( hook, diff --git a/qutebrowser/components/hostblock.py b/qutebrowser/components/hostblock.py index 1860b734c..10781bcc6 100644 --- a/qutebrowser/components/hostblock.py +++ b/qutebrowser/components/hostblock.py @@ -26,7 +26,7 @@ import logging import pathlib from typing import cast, IO, Set -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.api import ( hook, diff --git a/qutebrowser/components/misccommands.py b/qutebrowser/components/misccommands.py index 120806bfe..1df8f258e 100644 --- a/qutebrowser/components/misccommands.py +++ b/qutebrowser/components/misccommands.py @@ -31,8 +31,8 @@ try: except ImportError: hunter = None -from PyQt5.QtCore import Qt -from PyQt5.QtPrintSupport import QPrintPreviewDialog +from PyQt6.QtCore import Qt +from PyQt6.QtPrintSupport import QPrintPreviewDialog from qutebrowser.api import cmdutils, apitypes, message, config diff --git a/qutebrowser/components/readlinecommands.py b/qutebrowser/components/readlinecommands.py index da9c515dd..41e6f4d29 100644 --- a/qutebrowser/components/readlinecommands.py +++ b/qutebrowser/components/readlinecommands.py @@ -21,7 +21,7 @@ from typing import Iterable, Optional, MutableMapping -from PyQt5.QtWidgets import QApplication, QLineEdit +from PyQt6.QtWidgets import QApplication, QLineEdit from qutebrowser.api import cmdutils diff --git a/qutebrowser/components/utils/blockutils.py b/qutebrowser/components/utils/blockutils.py index bd27baece..d177e6634 100644 --- a/qutebrowser/components/utils/blockutils.py +++ b/qutebrowser/components/utils/blockutils.py @@ -24,7 +24,7 @@ import os import functools from typing import IO, List, Optional -from PyQt5.QtCore import QUrl, QObject, pyqtSignal +from PyQt6.QtCore import QUrl, QObject, pyqtSignal from qutebrowser.api import downloads, message, config diff --git a/qutebrowser/config/config.py b/qutebrowser/config/config.py index 437a54a33..efdb17ff6 100644 --- a/qutebrowser/config/config.py +++ b/qutebrowser/config/config.py @@ -25,7 +25,7 @@ import functools from typing import (TYPE_CHECKING, Any, Callable, Dict, Iterator, List, Mapping, MutableMapping, MutableSequence, Optional, Tuple, cast) -from PyQt5.QtCore import pyqtSignal, QObject, QUrl +from PyQt6.QtCore import pyqtSignal, QObject, QUrl from qutebrowser.commands import cmdexc, parser from qutebrowser.config import configdata, configexc, configutils diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py index 143b02fca..42abdcb1a 100644 --- a/qutebrowser/config/configcommands.py +++ b/qutebrowser/config/configcommands.py @@ -23,7 +23,7 @@ import os.path import contextlib from typing import TYPE_CHECKING, Iterator, List, Optional, Any, Tuple -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.api import cmdutils from qutebrowser.completion.models import configmodel diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py index 6f0d0b13c..bfbd05da9 100644 --- a/qutebrowser/config/configfiles.py +++ b/qutebrowser/config/configfiles.py @@ -33,7 +33,7 @@ from typing import (TYPE_CHECKING, Any, Dict, Iterable, Iterator, List, Mapping, MutableMapping, Optional, Tuple, cast) import yaml -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings, qVersion +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QSettings, qVersion import qutebrowser from qutebrowser.config import (configexc, config, configdata, configutils, @@ -118,7 +118,7 @@ class StateConfig(configparser.ConfigParser): Note that it's too early to use objects.backend here... """ try: - import PyQt5.QtWebEngineWidgets # pylint: disable=unused-import + import PyQt6.QtWebEngineWidgets # pylint: disable=unused-import except ImportError: return 'no' return str(version.qtwebengine_versions(avoid_init=True).webengine) diff --git a/qutebrowser/config/configinit.py b/qutebrowser/config/configinit.py index 15e587ea2..54f4ee21b 100644 --- a/qutebrowser/config/configinit.py +++ b/qutebrowser/config/configinit.py @@ -23,7 +23,7 @@ import argparse import os.path import sys -from PyQt5.QtWidgets import QMessageBox +from PyQt6.QtWidgets import QMessageBox from qutebrowser.api import config as configapi from qutebrowser.config import (config, configdata, configfiles, configtypes, diff --git a/qutebrowser/config/configtypes.py b/qutebrowser/config/configtypes.py index d3d5e3fb8..1af4a71d8 100644 --- a/qutebrowser/config/configtypes.py +++ b/qutebrowser/config/configtypes.py @@ -55,10 +55,10 @@ from typing import (Any, Callable, Dict as DictType, Iterable, Iterator, List as ListType, Optional, Pattern, Sequence, Tuple, Union) import yaml -from PyQt5.QtCore import QUrl, Qt -from PyQt5.QtGui import QColor -from PyQt5.QtWidgets import QTabWidget, QTabBar -from PyQt5.QtNetwork import QNetworkProxy +from PyQt6.QtCore import QUrl, Qt +from PyQt6.QtGui import QColor +from PyQt6.QtWidgets import QTabWidget, QTabBar +from PyQt6.QtNetwork import QNetworkProxy from qutebrowser.misc import objects, debugcachestats from qutebrowser.config import configexc, configutils diff --git a/qutebrowser/config/configutils.py b/qutebrowser/config/configutils.py index 480bbd85f..73a1e87e5 100644 --- a/qutebrowser/config/configutils.py +++ b/qutebrowser/config/configutils.py @@ -28,9 +28,9 @@ from typing import ( TYPE_CHECKING, Any, Dict, Iterator, List, Optional, Sequence, Set, Union, MutableMapping) -from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QFontDatabase -from PyQt5.QtWidgets import QApplication +from PyQt6.QtCore import QUrl +from PyQt6.QtGui import QFontDatabase +from PyQt6.QtWidgets import QApplication from qutebrowser.utils import utils, urlmatch, urlutils, usertypes, qtutils from qutebrowser.config import configexc diff --git a/qutebrowser/config/qtargs.py b/qutebrowser/config/qtargs.py index c38ef5b01..d39c2f7ed 100644 --- a/qutebrowser/config/qtargs.py +++ b/qutebrowser/config/qtargs.py @@ -25,7 +25,7 @@ import argparse import pathlib from typing import Any, Dict, Iterator, List, Optional, Sequence, Tuple -from PyQt5.QtCore import QLibraryInfo, QLocale +from PyQt6.QtCore import QLibraryInfo, QLocale from qutebrowser.config import config from qutebrowser.misc import objects diff --git a/qutebrowser/config/stylesheet.py b/qutebrowser/config/stylesheet.py index 2927aec08..42fb39c15 100644 --- a/qutebrowser/config/stylesheet.py +++ b/qutebrowser/config/stylesheet.py @@ -22,7 +22,7 @@ import functools from typing import Optional, FrozenSet -from PyQt5.QtCore import pyqtSlot, QObject +from PyQt6.QtCore import pyqtSlot, QObject from qutebrowser.config import config from qutebrowser.misc import debugcachestats diff --git a/qutebrowser/config/websettings.py b/qutebrowser/config/websettings.py index 7556d2b6d..b879d290e 100644 --- a/qutebrowser/config/websettings.py +++ b/qutebrowser/config/websettings.py @@ -25,8 +25,8 @@ import functools import dataclasses from typing import Any, Callable, Dict, Optional, Union -from PyQt5.QtCore import QUrl, pyqtSlot, qVersion -from PyQt5.QtGui import QFont +from PyQt6.QtCore import QUrl, pyqtSlot, qVersion +from PyQt6.QtGui import QFont import qutebrowser from qutebrowser.config import config diff --git a/qutebrowser/extensions/interceptors.py b/qutebrowser/extensions/interceptors.py index dfafeb7e3..155b5f4bc 100644 --- a/qutebrowser/extensions/interceptors.py +++ b/qutebrowser/extensions/interceptors.py @@ -23,7 +23,7 @@ import enum import dataclasses from typing import Callable, List, Optional -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl class ResourceType(enum.Enum): diff --git a/qutebrowser/extensions/loader.py b/qutebrowser/extensions/loader.py index 7ae45023b..878dc1fb5 100644 --- a/qutebrowser/extensions/loader.py +++ b/qutebrowser/extensions/loader.py @@ -28,7 +28,7 @@ import argparse import dataclasses from typing import Callable, Iterator, List, Optional, Set, Tuple -from PyQt5.QtCore import pyqtSlot +from PyQt6.QtCore import pyqtSlot from qutebrowser import components from qutebrowser.config import config diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py index 7e688dab1..ade336249 100644 --- a/qutebrowser/keyinput/basekeyparser.py +++ b/qutebrowser/keyinput/basekeyparser.py @@ -24,8 +24,8 @@ import types import dataclasses from typing import Mapping, MutableMapping, Optional, Sequence -from PyQt5.QtCore import pyqtSignal, QObject, Qt -from PyQt5.QtGui import QKeySequence, QKeyEvent +from PyQt6.QtCore import pyqtSignal, QObject, Qt +from PyQt6.QtGui import QKeySequence, QKeyEvent from qutebrowser.config import config from qutebrowser.utils import usertypes, log, utils diff --git a/qutebrowser/keyinput/eventfilter.py b/qutebrowser/keyinput/eventfilter.py index 4d016bea6..df4ea5847 100644 --- a/qutebrowser/keyinput/eventfilter.py +++ b/qutebrowser/keyinput/eventfilter.py @@ -21,8 +21,8 @@ from typing import cast -from PyQt5.QtCore import pyqtSlot, QObject, QEvent -from PyQt5.QtGui import QKeyEvent, QWindow +from PyQt6.QtCore import pyqtSlot, QObject, QEvent +from PyQt6.QtGui import QKeyEvent, QWindow from qutebrowser.keyinput import modeman from qutebrowser.misc import quitter, objects diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py index 6bd8c99b8..f70a9c36c 100644 --- a/qutebrowser/keyinput/keyutils.py +++ b/qutebrowser/keyinput/keyutils.py @@ -35,8 +35,8 @@ import itertools import dataclasses from typing import cast, overload, Iterable, Iterator, List, Mapping, Optional, Union -from PyQt5.QtCore import Qt, QEvent -from PyQt5.QtGui import QKeySequence, QKeyEvent +from PyQt6.QtCore import Qt, QEvent +from PyQt6.QtGui import QKeySequence, QKeyEvent from qutebrowser.utils import utils diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py index 3c47fafe3..e80a33ec3 100644 --- a/qutebrowser/keyinput/modeman.py +++ b/qutebrowser/keyinput/modeman.py @@ -23,8 +23,8 @@ import functools import dataclasses from typing import Mapping, Callable, MutableMapping, Union, Set, cast -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QObject, QEvent -from PyQt5.QtGui import QKeyEvent +from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QObject, QEvent +from PyQt6.QtGui import QKeyEvent from qutebrowser.commands import runners from qutebrowser.keyinput import modeparsers, basekeyparser diff --git a/qutebrowser/keyinput/modeparsers.py b/qutebrowser/keyinput/modeparsers.py index bd5d4e801..65f0f54bf 100644 --- a/qutebrowser/keyinput/modeparsers.py +++ b/qutebrowser/keyinput/modeparsers.py @@ -27,8 +27,8 @@ import traceback import enum from typing import TYPE_CHECKING, Sequence -from PyQt5.QtCore import pyqtSlot, Qt, QObject -from PyQt5.QtGui import QKeySequence, QKeyEvent +from PyQt6.QtCore import pyqtSlot, Qt, QObject +from PyQt6.QtGui import QKeySequence, QKeyEvent from qutebrowser.browser import hints from qutebrowser.commands import cmdexc diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py index d0723742a..067c5b8c0 100644 --- a/qutebrowser/mainwindow/mainwindow.py +++ b/qutebrowser/mainwindow/mainwindow.py @@ -25,10 +25,10 @@ import itertools import functools from typing import List, MutableSequence, Optional, Tuple, cast -from PyQt5.QtCore import (pyqtBoundSignal, pyqtSlot, QRect, QPoint, QTimer, Qt, +from PyQt6.QtCore import (pyqtBoundSignal, pyqtSlot, QRect, QPoint, QTimer, Qt, QCoreApplication, QEventLoop, QByteArray) -from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy -from PyQt5.QtGui import QPalette +from PyQt6.QtWidgets import QWidget, QVBoxLayout, QSizePolicy +from PyQt6.QtGui import QPalette from qutebrowser.commands import runners from qutebrowser.api import cmdutils diff --git a/qutebrowser/mainwindow/messageview.py b/qutebrowser/mainwindow/messageview.py index 58fcb3683..e4906badd 100644 --- a/qutebrowser/mainwindow/messageview.py +++ b/qutebrowser/mainwindow/messageview.py @@ -21,8 +21,8 @@ from typing import MutableSequence, Optional -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QTimer, Qt -from PyQt5.QtWidgets import QWidget, QVBoxLayout, QLabel, QSizePolicy +from PyQt6.QtCore import pyqtSlot, pyqtSignal, QTimer, Qt +from PyQt6.QtWidgets import QWidget, QVBoxLayout, QLabel, QSizePolicy from qutebrowser.config import config, stylesheet from qutebrowser.utils import usertypes diff --git a/qutebrowser/mainwindow/prompt.py b/qutebrowser/mainwindow/prompt.py index c8cbe572b..9ba02b93e 100644 --- a/qutebrowser/mainwindow/prompt.py +++ b/qutebrowser/mainwindow/prompt.py @@ -26,9 +26,9 @@ import functools import dataclasses from typing import Deque, MutableSequence, Optional, cast -from PyQt5.QtCore import (pyqtSlot, pyqtSignal, Qt, QTimer, QDir, QModelIndex, +from PyQt6.QtCore import (pyqtSlot, pyqtSignal, Qt, QTimer, QDir, QModelIndex, QItemSelectionModel, QObject, QEventLoop) -from PyQt5.QtWidgets import (QWidget, QGridLayout, QVBoxLayout, QLineEdit, +from PyQt6.QtWidgets import (QWidget, QGridLayout, QVBoxLayout, QLineEdit, QLabel, QFileSystemModel, QTreeView, QSizePolicy, QSpacerItem) diff --git a/qutebrowser/mainwindow/statusbar/bar.py b/qutebrowser/mainwindow/statusbar/bar.py index 8bad290be..3f881a3d2 100644 --- a/qutebrowser/mainwindow/statusbar/bar.py +++ b/qutebrowser/mainwindow/statusbar/bar.py @@ -22,9 +22,9 @@ import enum import dataclasses -from PyQt5.QtCore import (pyqtSignal, pyqtSlot, # type: ignore[attr-defined] +from PyQt6.QtCore import (pyqtSignal, pyqtSlot, # type: ignore[attr-defined] pyqtProperty, Qt, QSize, QTimer) -from PyQt5.QtWidgets import QWidget, QHBoxLayout, QStackedLayout, QSizePolicy +from PyQt6.QtWidgets import QWidget, QHBoxLayout, QStackedLayout, QSizePolicy from qutebrowser.browser import browsertab from qutebrowser.config import config, stylesheet diff --git a/qutebrowser/mainwindow/statusbar/command.py b/qutebrowser/mainwindow/statusbar/command.py index 92408d34f..fe90c216d 100644 --- a/qutebrowser/mainwindow/statusbar/command.py +++ b/qutebrowser/mainwindow/statusbar/command.py @@ -20,9 +20,9 @@ """The commandline in the statusbar.""" -from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QSize -from PyQt5.QtGui import QKeyEvent -from PyQt5.QtWidgets import QSizePolicy, QWidget +from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt, QSize +from PyQt6.QtGui import QKeyEvent +from PyQt6.QtWidgets import QSizePolicy, QWidget from qutebrowser.keyinput import modeman, modeparsers from qutebrowser.api import cmdutils diff --git a/qutebrowser/mainwindow/statusbar/keystring.py b/qutebrowser/mainwindow/statusbar/keystring.py index 590dbda93..70bc2f1a9 100644 --- a/qutebrowser/mainwindow/statusbar/keystring.py +++ b/qutebrowser/mainwindow/statusbar/keystring.py @@ -19,7 +19,7 @@ """Keychain string displayed in the statusbar.""" -from PyQt5.QtCore import pyqtSlot +from PyQt6.QtCore import pyqtSlot from qutebrowser.mainwindow.statusbar import textbase from qutebrowser.utils import usertypes diff --git a/qutebrowser/mainwindow/statusbar/percentage.py b/qutebrowser/mainwindow/statusbar/percentage.py index 122a4d4b4..b16112e7e 100644 --- a/qutebrowser/mainwindow/statusbar/percentage.py +++ b/qutebrowser/mainwindow/statusbar/percentage.py @@ -19,7 +19,7 @@ """Scroll percentage displayed in the statusbar.""" -from PyQt5.QtCore import pyqtSlot, Qt +from PyQt6.QtCore import pyqtSlot, Qt from qutebrowser.mainwindow.statusbar import textbase from qutebrowser.misc import throttle diff --git a/qutebrowser/mainwindow/statusbar/progress.py b/qutebrowser/mainwindow/statusbar/progress.py index 9d56cd03f..0fad084a0 100644 --- a/qutebrowser/mainwindow/statusbar/progress.py +++ b/qutebrowser/mainwindow/statusbar/progress.py @@ -19,8 +19,8 @@ """The progress bar in the statusbar.""" -from PyQt5.QtCore import pyqtSlot, QSize -from PyQt5.QtWidgets import QProgressBar, QSizePolicy +from PyQt6.QtCore import pyqtSlot, QSize +from PyQt6.QtWidgets import QProgressBar, QSizePolicy from qutebrowser.config import stylesheet from qutebrowser.utils import utils, usertypes diff --git a/qutebrowser/mainwindow/statusbar/tabindex.py b/qutebrowser/mainwindow/statusbar/tabindex.py index 635d3817b..ee1b3e6cd 100644 --- a/qutebrowser/mainwindow/statusbar/tabindex.py +++ b/qutebrowser/mainwindow/statusbar/tabindex.py @@ -19,7 +19,7 @@ """TabIndex displayed in the statusbar.""" -from PyQt5.QtCore import pyqtSlot +from PyQt6.QtCore import pyqtSlot from qutebrowser.mainwindow.statusbar import textbase diff --git a/qutebrowser/mainwindow/statusbar/textbase.py b/qutebrowser/mainwindow/statusbar/textbase.py index cb454b902..3bce38782 100644 --- a/qutebrowser/mainwindow/statusbar/textbase.py +++ b/qutebrowser/mainwindow/statusbar/textbase.py @@ -19,9 +19,9 @@ """Base text widgets for statusbar.""" -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QLabel, QSizePolicy -from PyQt5.QtGui import QPainter +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import QLabel, QSizePolicy +from PyQt6.QtGui import QPainter from qutebrowser.utils import qtutils, utils diff --git a/qutebrowser/mainwindow/statusbar/url.py b/qutebrowser/mainwindow/statusbar/url.py index 99818e284..f05e45d09 100644 --- a/qutebrowser/mainwindow/statusbar/url.py +++ b/qutebrowser/mainwindow/statusbar/url.py @@ -21,7 +21,7 @@ import enum -from PyQt5.QtCore import (pyqtSlot, pyqtProperty, # type: ignore[attr-defined] +from PyQt6.QtCore import (pyqtSlot, pyqtProperty, # type: ignore[attr-defined] QUrl) from qutebrowser.mainwindow.statusbar import textbase diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index e081284ee..c9017f548 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -27,8 +27,8 @@ import dataclasses from typing import ( Any, Deque, List, Mapping, MutableMapping, MutableSequence, Optional, Tuple) -from PyQt5.QtWidgets import QSizePolicy, QWidget, QApplication -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QTimer, QUrl +from PyQt6.QtWidgets import QSizePolicy, QWidget, QApplication +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QTimer, QUrl from qutebrowser.config import config from qutebrowser.keyinput import modeman diff --git a/qutebrowser/mainwindow/tabwidget.py b/qutebrowser/mainwindow/tabwidget.py index 7983127d5..30cd39570 100644 --- a/qutebrowser/mainwindow/tabwidget.py +++ b/qutebrowser/mainwindow/tabwidget.py @@ -24,12 +24,12 @@ import contextlib import dataclasses from typing import Optional, cast -from PyQt5.QtCore import (pyqtSignal, pyqtSlot, Qt, QSize, QRect, QPoint, +from PyQt6.QtCore import (pyqtSignal, pyqtSlot, Qt, QSize, QRect, QPoint, QTimer, QUrl) -from PyQt5.QtWidgets import (QTabWidget, QTabBar, QSizePolicy, QCommonStyle, +from PyQt6.QtWidgets import (QTabWidget, QTabBar, QSizePolicy, QCommonStyle, QStyle, QStylePainter, QStyleOptionTab, QStyleFactory, QWidget) -from PyQt5.QtGui import QIcon, QPalette, QColor +from PyQt6.QtGui import QIcon, QPalette, QColor from qutebrowser.utils import qtutils, objreg, utils, usertypes, log from qutebrowser.config import config, stylesheet diff --git a/qutebrowser/mainwindow/windowundo.py b/qutebrowser/mainwindow/windowundo.py index ea7e1a987..ba960ac65 100644 --- a/qutebrowser/mainwindow/windowundo.py +++ b/qutebrowser/mainwindow/windowundo.py @@ -23,7 +23,7 @@ import collections import dataclasses from typing import MutableSequence, cast, TYPE_CHECKING -from PyQt5.QtCore import QObject, QByteArray +from PyQt6.QtCore import QObject, QByteArray from qutebrowser.config import config from qutebrowser.mainwindow import mainwindow diff --git a/qutebrowser/misc/autoupdate.py b/qutebrowser/misc/autoupdate.py index 73afdde54..68a1c6956 100644 --- a/qutebrowser/misc/autoupdate.py +++ b/qutebrowser/misc/autoupdate.py @@ -21,7 +21,7 @@ import json -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl from qutebrowser.misc import httpclient diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py index 3e14719e0..9a490aac9 100644 --- a/qutebrowser/misc/backendproblem.py +++ b/qutebrowser/misc/backendproblem.py @@ -29,10 +29,10 @@ import argparse import dataclasses from typing import Any, List, Sequence, Tuple, Optional -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import (QDialog, QPushButton, QHBoxLayout, QVBoxLayout, QLabel, +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import (QDialog, QPushButton, QHBoxLayout, QVBoxLayout, QLabel, QMessageBox, QWidget) -from PyQt5.QtNetwork import QSslSocket +from PyQt6.QtNetwork import QSslSocket from qutebrowser.config import config, configfiles from qutebrowser.utils import (usertypes, version, qtutils, log, utils, @@ -270,9 +270,9 @@ class _BackendProblemChecker: results = _BackendImports() try: - from PyQt5 import QtWebKit - from PyQt5.QtWebKit import qWebKitVersion - from PyQt5 import QtWebKitWidgets + from PyQt6 import QtWebKit + from PyQt6.QtWebKit import qWebKitVersion + from PyQt6 import QtWebKitWidgets except (ImportError, ValueError) as e: results.webkit_error = str(e) else: @@ -280,7 +280,7 @@ class _BackendProblemChecker: results.webkit_error = "Unsupported legacy QtWebKit found" try: - from PyQt5 import QtWebEngineWidgets + from PyQt6 import QtWebEngineWidgets except (ImportError, ValueError) as e: results.webengine_error = str(e) diff --git a/qutebrowser/misc/cmdhistory.py b/qutebrowser/misc/cmdhistory.py index e4218832c..0ba328317 100644 --- a/qutebrowser/misc/cmdhistory.py +++ b/qutebrowser/misc/cmdhistory.py @@ -21,7 +21,7 @@ from typing import MutableSequence -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject +from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject from qutebrowser.utils import usertypes, log, standarddir, objreg from qutebrowser.misc import lineparser diff --git a/qutebrowser/misc/consolewidget.py b/qutebrowser/misc/consolewidget.py index a826a4ed8..ad78037b1 100644 --- a/qutebrowser/misc/consolewidget.py +++ b/qutebrowser/misc/consolewidget.py @@ -23,9 +23,9 @@ import sys import code from typing import MutableSequence -from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt -from PyQt5.QtWidgets import QTextEdit, QWidget, QVBoxLayout, QApplication -from PyQt5.QtGui import QTextCursor +from PyQt6.QtCore import pyqtSignal, pyqtSlot, Qt +from PyQt6.QtWidgets import QTextEdit, QWidget, QVBoxLayout, QApplication +from PyQt6.QtGui import QTextCursor from qutebrowser.config import stylesheet from qutebrowser.misc import cmdhistory, miscwidgets diff --git a/qutebrowser/misc/crashdialog.py b/qutebrowser/misc/crashdialog.py index 430553433..c04220747 100644 --- a/qutebrowser/misc/crashdialog.py +++ b/qutebrowser/misc/crashdialog.py @@ -30,8 +30,8 @@ import datetime import enum from typing import List, Tuple -from PyQt5.QtCore import pyqtSlot, Qt, QSize -from PyQt5.QtWidgets import (QDialog, QLabel, QTextEdit, QPushButton, +from PyQt6.QtCore import pyqtSlot, Qt, QSize +from PyQt6.QtWidgets import (QDialog, QLabel, QTextEdit, QPushButton, QVBoxLayout, QHBoxLayout, QCheckBox, QDialogButtonBox, QMessageBox) diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py index 45c52f54c..6b7cdf984 100644 --- a/qutebrowser/misc/crashsignal.py +++ b/qutebrowser/misc/crashsignal.py @@ -32,9 +32,9 @@ import faulthandler import dataclasses from typing import TYPE_CHECKING, Optional, MutableMapping, cast, List -from PyQt5.QtCore import (pyqtSlot, qInstallMessageHandler, QObject, +from PyQt6.QtCore import (pyqtSlot, qInstallMessageHandler, QObject, QSocketNotifier, QTimer, QUrl) -from PyQt5.QtWidgets import QApplication +from PyQt6.QtWidgets import QApplication from qutebrowser.api import cmdutils from qutebrowser.misc import earlyinit, crashdialog, ipc, objects diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index c4ff0bb85..357f8fd3e 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -78,8 +78,8 @@ def _die(message, exception=None): message: The message to display. exception: The exception object if we're handling an exception. """ - from PyQt5.QtWidgets import QApplication, QMessageBox - from PyQt5.QtCore import Qt + from PyQt6.QtWidgets import QApplication, QMessageBox + from PyQt6.QtCore import Qt if (('--debug' in sys.argv or '--no-err-windows' in sys.argv) and exception is not None): print(file=sys.stderr) @@ -132,7 +132,7 @@ def init_faulthandler(fileobj=sys.__stderr__): def check_pyqt(): """Check if PyQt core modules (QtCore/QtWidgets) are installed.""" - for name in ['PyQt5.QtCore', 'PyQt5.QtWidgets']: + for name in ['PyQt6.QtCore', 'PyQt6.QtWidgets']: try: importlib.import_module(name) except ImportError as e: @@ -156,10 +156,10 @@ def check_pyqt(): def qt_version(qversion=None, qt_version_str=None): """Get a Qt version string based on the runtime/compiled versions.""" if qversion is None: - from PyQt5.QtCore import qVersion + from PyQt6.QtCore import qVersion qversion = qVersion() if qt_version_str is None: - from PyQt5.QtCore import QT_VERSION_STR + from PyQt6.QtCore import QT_VERSION_STR qt_version_str = QT_VERSION_STR if qversion != qt_version_str: @@ -170,9 +170,9 @@ def qt_version(qversion=None, qt_version_str=None): def check_qt_version(): """Check if the Qt version is recent enough.""" - from PyQt5.QtCore import QT_VERSION, PYQT_VERSION, PYQT_VERSION_STR + from PyQt6.QtCore import QT_VERSION, PYQT_VERSION, PYQT_VERSION_STR try: - from PyQt5.QtCore import QVersionNumber, QLibraryInfo + from PyQt6.QtCore import QVersionNumber, QLibraryInfo qt_ver = QLibraryInfo.version().normalized() recent_qt_runtime = qt_ver >= QVersionNumber(5, 12) # type: ignore[operator] except (ImportError, AttributeError): @@ -194,7 +194,7 @@ def check_qt_version(): def check_ssl_support(): """Check if SSL support is available.""" try: - from PyQt5.QtNetwork import QSslSocket # pylint: disable=unused-import + from PyQt6.QtNetwork import QSslSocket # pylint: disable=unused-import except ImportError: _die("Fatal error: Your Qt is built without SSL support.") @@ -232,10 +232,10 @@ def check_libraries(): 'jinja2': _missing_str("jinja2"), 'yaml': _missing_str("PyYAML"), 'dataclasses': _missing_str("dataclasses"), - 'PyQt5.QtQml': _missing_str("PyQt5.QtQml"), - 'PyQt5.QtSql': _missing_str("PyQt5.QtSql"), - 'PyQt5.QtOpenGL': _missing_str("PyQt5.QtOpenGL"), - 'PyQt5.QtDBus': _missing_str("PyQt5.QtDBus"), + 'PyQt6.QtQml': _missing_str("PyQt6.QtQml"), + 'PyQt6.QtSql': _missing_str("PyQt6.QtSql"), + 'PyQt6.QtOpenGL': _missing_str("PyQt6.QtOpenGL"), + 'PyQt6.QtDBus': _missing_str("PyQt6.QtDBus"), } if sys.version_info < (3, 9): # Backport required @@ -249,7 +249,7 @@ def configure_pyqt(): Doing this means we can't use the interactive shell anymore (which we don't anyways), but we can use pdb instead. """ - from PyQt5 import QtCore + from PyQt6 import QtCore QtCore.pyqtRemoveInputHook() try: QtCore.pyqt5_enable_new_onexit_scheme(True) # type: ignore[attr-defined] @@ -290,7 +290,7 @@ def webengine_early_import(): error messages in backendproblem.py are accurate. """ try: - from PyQt5 import QtWebEngineWidgets # pylint: disable=unused-import + from PyQt6 import QtWebEngineWidgets # pylint: disable=unused-import except ImportError: pass diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py index d561a7b96..5d61afd57 100644 --- a/qutebrowser/misc/editor.py +++ b/qutebrowser/misc/editor.py @@ -22,7 +22,7 @@ import os import tempfile -from PyQt5.QtCore import (pyqtSignal, pyqtSlot, QObject, QProcess, +from PyQt6.QtCore import (pyqtSignal, pyqtSlot, QObject, QProcess, QFileSystemWatcher) from qutebrowser.config import config diff --git a/qutebrowser/misc/elf.py b/qutebrowser/misc/elf.py index bf824880a..ddda87972 100644 --- a/qutebrowser/misc/elf.py +++ b/qutebrowser/misc/elf.py @@ -32,7 +32,7 @@ to the QtWebEngine version (as that can be older/newer). Since there will be a QtWebEngine 5.15.3 release, but not Qt itself (due to LTS licensing restrictions), this isn't a reliable source of information. -b) Look at the PyQtWebEngine version (PyQt5.QtWebEngine.PYQT_WEBENGINE_VERSION_STR). +b) Look at the PyQtWebEngine version (PyQt6.QtWebEngine.PYQT_WEBENGINE_VERSION_STR). This is a good first guess (especially for our Windows/macOS releases), but still isn't certain. Linux distributions often push a newer QtWebEngine before the corresponding PyQtWebEngine release, and some (*cough* Gentoo *cough*) even publish QtWebEngine @@ -67,7 +67,7 @@ import mmap import pathlib from typing import Any, IO, ClassVar, Dict, Optional, Tuple, cast -from PyQt5.QtCore import QLibraryInfo +from PyQt6.QtCore import QLibraryInfo from qutebrowser.utils import log, version diff --git a/qutebrowser/misc/guiprocess.py b/qutebrowser/misc/guiprocess.py index e5ccd1b8b..640d7f1e6 100644 --- a/qutebrowser/misc/guiprocess.py +++ b/qutebrowser/misc/guiprocess.py @@ -24,7 +24,7 @@ import locale import shlex from typing import Mapping, Sequence, Dict, Optional -from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess, +from PyQt6.QtCore import (pyqtSlot, pyqtSignal, QObject, QProcess, QProcessEnvironment, QByteArray, QUrl, Qt) from qutebrowser.utils import message, log, utils, usertypes diff --git a/qutebrowser/misc/httpclient.py b/qutebrowser/misc/httpclient.py index d4a8e7673..4cd825814 100644 --- a/qutebrowser/misc/httpclient.py +++ b/qutebrowser/misc/httpclient.py @@ -23,8 +23,8 @@ import functools import urllib.parse from typing import MutableMapping -from PyQt5.QtCore import pyqtSignal, QObject, QTimer -from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkRequest, +from PyQt6.QtCore import pyqtSignal, QObject, QTimer +from PyQt6.QtNetwork import (QNetworkAccessManager, QNetworkRequest, QNetworkReply) from qutebrowser.utils import log diff --git a/qutebrowser/misc/ipc.py b/qutebrowser/misc/ipc.py index 77b9e8f6c..06daf2d7f 100644 --- a/qutebrowser/misc/ipc.py +++ b/qutebrowser/misc/ipc.py @@ -26,8 +26,8 @@ import getpass import binascii import hashlib -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, Qt -from PyQt5.QtNetwork import QLocalSocket, QLocalServer, QAbstractSocket +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, Qt +from PyQt6.QtNetwork import QLocalSocket, QLocalServer, QAbstractSocket import qutebrowser from qutebrowser.utils import log, usertypes, error, standarddir, utils diff --git a/qutebrowser/misc/keyhintwidget.py b/qutebrowser/misc/keyhintwidget.py index 4fcef72e4..392b03ae4 100644 --- a/qutebrowser/misc/keyhintwidget.py +++ b/qutebrowser/misc/keyhintwidget.py @@ -28,8 +28,8 @@ import html import fnmatch import re -from PyQt5.QtWidgets import QLabel, QSizePolicy -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt +from PyQt6.QtWidgets import QLabel, QSizePolicy +from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt from qutebrowser.config import config, stylesheet from qutebrowser.utils import utils, usertypes diff --git a/qutebrowser/misc/lineparser.py b/qutebrowser/misc/lineparser.py index 9d35692e9..a0ed70608 100644 --- a/qutebrowser/misc/lineparser.py +++ b/qutebrowser/misc/lineparser.py @@ -24,7 +24,7 @@ import os.path import contextlib from typing import Sequence -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject +from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject from qutebrowser.utils import log, utils, qtutils from qutebrowser.config import config diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py index b89288fc7..1dfbdff6a 100644 --- a/qutebrowser/misc/miscwidgets.py +++ b/qutebrowser/misc/miscwidgets.py @@ -21,11 +21,11 @@ from typing import Optional -from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QSize, QTimer -from PyQt5.QtWidgets import (QLineEdit, QWidget, QHBoxLayout, QLabel, +from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QSize, QTimer +from PyQt6.QtWidgets import (QLineEdit, QWidget, QHBoxLayout, QLabel, QStyleOption, QStyle, QLayout, QApplication, QSplitter) -from PyQt5.QtGui import QValidator, QPainter, QResizeEvent +from PyQt6.QtGui import QValidator, QPainter, QResizeEvent from qutebrowser.config import config, configfiles from qutebrowser.utils import utils, log, usertypes diff --git a/qutebrowser/misc/msgbox.py b/qutebrowser/misc/msgbox.py index 9d5fbf601..e75f0af87 100644 --- a/qutebrowser/misc/msgbox.py +++ b/qutebrowser/misc/msgbox.py @@ -19,8 +19,8 @@ """Convenience functions to show message boxes.""" -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QMessageBox +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import QMessageBox from qutebrowser.misc import objects from qutebrowser.utils import log diff --git a/qutebrowser/misc/objects.py b/qutebrowser/misc/objects.py index 00a1ef35d..28e4d7b4f 100644 --- a/qutebrowser/misc/objects.py +++ b/qutebrowser/misc/objects.py @@ -26,7 +26,7 @@ import argparse from typing import TYPE_CHECKING, Any, Dict, Set, Union, cast if TYPE_CHECKING: - from PyQt5.QtWidgets import QApplication + from PyQt6.QtWidgets import QApplication from qutebrowser.utils import usertypes from qutebrowser.commands import command diff --git a/qutebrowser/misc/pastebin.py b/qutebrowser/misc/pastebin.py index a4e0a196f..8f58906a8 100644 --- a/qutebrowser/misc/pastebin.py +++ b/qutebrowser/misc/pastebin.py @@ -21,7 +21,7 @@ import urllib.parse -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QUrl class PastebinClient(QObject): diff --git a/qutebrowser/misc/quitter.py b/qutebrowser/misc/quitter.py index a51891685..f8e20934f 100644 --- a/qutebrowser/misc/quitter.py +++ b/qutebrowser/misc/quitter.py @@ -31,7 +31,7 @@ import functools import subprocess from typing import Iterable, Mapping, MutableSequence, Sequence, cast -from PyQt5.QtCore import QObject, pyqtSignal, QTimer +from PyQt6.QtCore import QObject, pyqtSignal, QTimer try: import hunter except ImportError: diff --git a/qutebrowser/misc/savemanager.py b/qutebrowser/misc/savemanager.py index ee22ba14d..f2eb8307f 100644 --- a/qutebrowser/misc/savemanager.py +++ b/qutebrowser/misc/savemanager.py @@ -23,7 +23,7 @@ import os.path import collections from typing import MutableMapping -from PyQt5.QtCore import pyqtSlot, QObject, QTimer +from PyQt6.QtCore import pyqtSlot, QObject, QTimer from qutebrowser.config import config from qutebrowser.api import cmdutils diff --git a/qutebrowser/misc/sessions.py b/qutebrowser/misc/sessions.py index 11af329e0..d791cc1a0 100644 --- a/qutebrowser/misc/sessions.py +++ b/qutebrowser/misc/sessions.py @@ -27,7 +27,7 @@ import shutil import pathlib from typing import Any, Iterable, MutableMapping, MutableSequence, Optional, Union, cast -from PyQt5.QtCore import Qt, QUrl, QObject, QPoint, QTimer, QDateTime +from PyQt6.QtCore import Qt, QUrl, QObject, QPoint, QTimer, QDateTime import yaml from qutebrowser.utils import (standarddir, objreg, qtutils, log, message, diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py index 814eb2bb0..8d732774e 100644 --- a/qutebrowser/misc/sql.py +++ b/qutebrowser/misc/sql.py @@ -25,8 +25,8 @@ import dataclasses import types from typing import Any, Dict, Iterator, List, Mapping, MutableSequence, Optional, Type -from PyQt5.QtCore import QObject, pyqtSignal -from PyQt5.QtSql import QSqlDatabase, QSqlError, QSqlQuery +from PyQt6.QtCore import QObject, pyqtSignal +from PyQt6.QtSql import QSqlDatabase, QSqlError, QSqlQuery from qutebrowser.qt import sip from qutebrowser.utils import debug, log diff --git a/qutebrowser/misc/throttle.py b/qutebrowser/misc/throttle.py index ac565b68d..fe5b5eda2 100644 --- a/qutebrowser/misc/throttle.py +++ b/qutebrowser/misc/throttle.py @@ -23,7 +23,7 @@ import dataclasses import time from typing import Any, Callable, Mapping, Optional, Sequence -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from qutebrowser.utils import usertypes diff --git a/qutebrowser/misc/utilcmds.py b/qutebrowser/misc/utilcmds.py index 7ba45bdc3..55db4d0ed 100644 --- a/qutebrowser/misc/utilcmds.py +++ b/qutebrowser/misc/utilcmds.py @@ -26,8 +26,8 @@ import os import traceback from typing import Optional -from PyQt5.QtCore import QUrl -from PyQt5.QtWidgets import QApplication +from PyQt6.QtCore import QUrl +from PyQt6.QtWidgets import QApplication from qutebrowser.browser import qutescheme from qutebrowser.utils import log, objreg, usertypes, message, debug, utils diff --git a/qutebrowser/qt.py b/qutebrowser/qt.py index 5e0f80538..8d9262d58 100644 --- a/qutebrowser/qt.py +++ b/qutebrowser/qt.py @@ -21,9 +21,9 @@ # pylint: disable=unused-import -# While upstream recommends using PyQt5.sip ever since PyQt5 5.11, some distributions -# still package later versions of PyQt5 with a top-level "sip" rather than "PyQt5.sip". +# While upstream recommends using PyQt6.sip ever since PyQt6 5.11, some distributions +# still package later versions of PyQt6 with a top-level "sip" rather than "PyQt6.sip". try: - from PyQt5 import sip + from PyQt6 import sip except ImportError: import sip # type: ignore[import, no-redef] diff --git a/qutebrowser/resources.py b/qutebrowser/resources.py index ebe256809..ab170aa9a 100644 --- a/qutebrowser/resources.py +++ b/qutebrowser/resources.py @@ -2,11 +2,11 @@ # Resource object code # -# Created by: The Resource Compiler for PyQt5 (Qt v5.6.0) +# Created by: The Resource Compiler for PyQt6 (Qt v5.6.0) # # WARNING! All changes made in this file will be lost! -from PyQt5 import QtCore +from PyQt6 import QtCore qt_resource_data = b"\ \x00\x00\x22\xfe\ diff --git a/qutebrowser/utils/debug.py b/qutebrowser/utils/debug.py index 7d069909a..220618f53 100644 --- a/qutebrowser/utils/debug.py +++ b/qutebrowser/utils/debug.py @@ -28,7 +28,7 @@ import types from typing import ( Any, Callable, List, Mapping, MutableSequence, Optional, Sequence, Type, Union) -from PyQt5.QtCore import Qt, QEvent, QMetaMethod, QObject, pyqtBoundSignal +from PyQt6.QtCore import Qt, QEvent, QMetaMethod, QObject, pyqtBoundSignal from qutebrowser.utils import log, utils, qtutils, objreg from qutebrowser.misc import objects diff --git a/qutebrowser/utils/error.py b/qutebrowser/utils/error.py index a5889f977..1ead83788 100644 --- a/qutebrowser/utils/error.py +++ b/qutebrowser/utils/error.py @@ -19,7 +19,7 @@ """Tools related to error printing/displaying.""" -from PyQt5.QtWidgets import QMessageBox +from PyQt6.QtWidgets import QMessageBox from qutebrowser.utils import log, utils diff --git a/qutebrowser/utils/jinja.py b/qutebrowser/utils/jinja.py index a44a0235e..ab4876934 100644 --- a/qutebrowser/utils/jinja.py +++ b/qutebrowser/utils/jinja.py @@ -29,7 +29,7 @@ from typing import Any, Callable, FrozenSet, Iterator, List, Set, Tuple import jinja2 import jinja2.nodes -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import utils, urlutils, log, qtutils, resources from qutebrowser.misc import debugcachestats diff --git a/qutebrowser/utils/log.py b/qutebrowser/utils/log.py index 9cd07e2e3..07fb9e108 100644 --- a/qutebrowser/utils/log.py +++ b/qutebrowser/utils/log.py @@ -35,7 +35,7 @@ import argparse from typing import (TYPE_CHECKING, Any, Iterator, Mapping, MutableSequence, Optional, Set, Tuple, Union) -from PyQt5 import QtCore +from PyQt6 import QtCore # Optional imports try: import colorama diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py index 50a438637..406c77f02 100644 --- a/qutebrowser/utils/message.py +++ b/qutebrowser/utils/message.py @@ -25,7 +25,7 @@ import traceback from typing import Any, Callable, Iterable, List, Tuple, Union, Optional -from PyQt5.QtCore import pyqtSignal, pyqtBoundSignal, QObject +from PyQt6.QtCore import pyqtSignal, pyqtBoundSignal, QObject from qutebrowser.utils import usertypes, log diff --git a/qutebrowser/utils/objreg.py b/qutebrowser/utils/objreg.py index 0819a5d0a..e46d936b5 100644 --- a/qutebrowser/utils/objreg.py +++ b/qutebrowser/utils/objreg.py @@ -25,9 +25,9 @@ import functools from typing import (TYPE_CHECKING, Any, Callable, MutableMapping, MutableSequence, Optional, Sequence, Union) -from PyQt5.QtCore import QObject, QTimer -from PyQt5.QtWidgets import QApplication -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import QObject, QTimer +from PyQt6.QtWidgets import QApplication +from PyQt6.QtWidgets import QWidget from qutebrowser.utils import log, usertypes, utils if TYPE_CHECKING: diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py index ff8983c50..0a46c87f5 100644 --- a/qutebrowser/utils/qtutils.py +++ b/qutebrowser/utils/qtutils.py @@ -34,17 +34,17 @@ import contextlib from typing import (Any, AnyStr, TYPE_CHECKING, BinaryIO, IO, Iterator, Optional, Union, Tuple, cast) -from PyQt5.QtCore import (qVersion, QEventLoop, QDataStream, QByteArray, +from PyQt6.QtCore import (qVersion, QEventLoop, QDataStream, QByteArray, QIODevice, QFileDevice, QSaveFile, QT_VERSION_STR, PYQT_VERSION_STR, QObject, QUrl) -from PyQt5.QtGui import QColor +from PyQt6.QtGui import QColor try: - from PyQt5.QtWebKit import qWebKitVersion + from PyQt6.QtWebKit import qWebKitVersion except ImportError: # pragma: no cover qWebKitVersion = None # type: ignore[assignment] # noqa: N816 if TYPE_CHECKING: - from PyQt5.QtWebKit import QWebHistory - from PyQt5.QtWebEngineWidgets import QWebEngineHistory + from PyQt6.QtWebKit import QWebHistory + from PyQt6.QtWebEngineWidgets import QWebEngineHistory from qutebrowser.misc import objects from qutebrowser.utils import usertypes, utils diff --git a/qutebrowser/utils/standarddir.py b/qutebrowser/utils/standarddir.py index f1bd01a5f..ccb61436f 100644 --- a/qutebrowser/utils/standarddir.py +++ b/qutebrowser/utils/standarddir.py @@ -27,8 +27,8 @@ import enum import argparse from typing import Iterator, Optional -from PyQt5.QtCore import QStandardPaths -from PyQt5.QtWidgets import QApplication +from PyQt6.QtCore import QStandardPaths +from PyQt6.QtWidgets import QApplication from qutebrowser.utils import log, debug, utils, version diff --git a/qutebrowser/utils/urlmatch.py b/qutebrowser/utils/urlmatch.py index f14c2083d..7212e3c05 100644 --- a/qutebrowser/utils/urlmatch.py +++ b/qutebrowser/utils/urlmatch.py @@ -34,7 +34,7 @@ import fnmatch import urllib.parse from typing import Any, Optional, Tuple -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import utils, qtutils diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py index 002f10411..5f7afdc0e 100644 --- a/qutebrowser/utils/urlutils.py +++ b/qutebrowser/utils/urlutils.py @@ -28,8 +28,8 @@ import urllib.parse import mimetypes from typing import Optional, Tuple, Union, Iterable -from PyQt5.QtCore import QUrl -from PyQt5.QtNetwork import QHostInfo, QHostAddress, QNetworkProxy +from PyQt6.QtCore import QUrl +from PyQt6.QtNetwork import QHostInfo, QHostAddress, QNetworkProxy from qutebrowser.api import cmdutils from qutebrowser.config import config diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py index ee0f899cc..69be8f574 100644 --- a/qutebrowser/utils/usertypes.py +++ b/qutebrowser/utils/usertypes.py @@ -25,8 +25,8 @@ import enum import dataclasses from typing import Optional, Sequence, TypeVar, Union -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QTimer -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QTimer +from PyQt6.QtCore import QUrl from qutebrowser.utils import log, qtutils, utils diff --git a/qutebrowser/utils/utils.py b/qutebrowser/utils/utils.py index a56769255..360a4d128 100644 --- a/qutebrowser/utils/utils.py +++ b/qutebrowser/utils/utils.py @@ -44,9 +44,9 @@ except ImportError: # pragma: no cover """Empty stub at runtime.""" -from PyQt5.QtCore import QUrl, QVersionNumber, QRect -from PyQt5.QtGui import QClipboard, QDesktopServices -from PyQt5.QtWidgets import QApplication +from PyQt6.QtCore import QUrl, QVersionNumber, QRect +from PyQt6.QtGui import QClipboard, QDesktopServices +from PyQt6.QtWidgets import QApplication import yaml try: diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 8cd244fca..488ddfa54 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -38,18 +38,18 @@ from typing import (Mapping, Optional, Sequence, Tuple, ClassVar, Dict, cast, TYPE_CHECKING) -from PyQt5.QtCore import PYQT_VERSION_STR, QLibraryInfo, qVersion -from PyQt5.QtNetwork import QSslSocket -from PyQt5.QtGui import (QOpenGLContext, QOpenGLVersionProfile, +from PyQt6.QtCore import PYQT_VERSION_STR, QLibraryInfo, qVersion +from PyQt6.QtNetwork import QSslSocket +from PyQt6.QtGui import (QOpenGLContext, QOpenGLVersionProfile, QOffscreenSurface) -from PyQt5.QtWidgets import QApplication +from PyQt6.QtWidgets import QApplication try: - from PyQt5.QtWebKit import qWebKitVersion + from PyQt6.QtWebKit import qWebKitVersion except ImportError: # pragma: no cover qWebKitVersion = None # type: ignore[assignment] # noqa: N816 try: - from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION_STR + from PyQt6.QtWebEngine import PYQT_WEBENGINE_VERSION_STR except ImportError: # pragma: no cover # Added in PyQt 5.13 PYQT_WEBENGINE_VERSION_STR = None # type: ignore[assignment] @@ -404,9 +404,9 @@ MODULE_INFO: Mapping[str, ModuleInfo] = collections.OrderedDict([ ('pygments', ['__version__']), ('yaml', ['__version__']), ('adblock', ['__version__'], "0.3.2"), - ('PyQt5.QtWebEngineWidgets', []), - ('PyQt5.QtWebEngine', ['PYQT_WEBENGINE_VERSION_STR']), - ('PyQt5.QtWebKitWidgets', []), + ('PyQt6.QtWebEngineWidgets', []), + ('PyQt6.QtWebEngine', ['PYQT_WEBENGINE_VERSION_STR']), + ('PyQt6.QtWebKitWidgets', []), ] ]) @@ -699,7 +699,7 @@ class WebEngineVersions: # be using QtWebEngine 5.15.3 (87-based). For now, we play it safe, and only # do this kind of "downgrade" when we know we're using PyInstaller. frozen = hasattr(sys, 'frozen') - log.misc.debug(f"PyQt5 >= 5.15.3, frozen {frozen}") + log.misc.debug(f"PyQt6 >= 5.15.3, frozen {frozen}") if frozen: parsed = utils.VersionNumber(5, 15, 2) |