From b13f2eb4485b03cf237ab699da88620ba88e7b4c Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Thu, 26 Aug 2021 16:44:25 +0200 Subject: Blanket PyQt5 -> PyQt6 --- tests/conftest.py | 4 ++-- tests/end2end/conftest.py | 4 ++-- tests/end2end/features/downloads.feature | 2 +- tests/end2end/features/keyinput.feature | 2 +- tests/end2end/features/misc.feature | 4 ++-- tests/end2end/features/test_downloads_bdd.py | 2 +- tests/end2end/features/test_editor_bdd.py | 2 +- tests/end2end/fixtures/notificationserver.py | 6 +++--- tests/end2end/fixtures/quteprocess.py | 16 ++++++++-------- tests/end2end/fixtures/test_testprocess.py | 2 +- tests/end2end/fixtures/testprocess.py | 4 ++-- tests/end2end/fixtures/webserver.py | 2 +- tests/end2end/test_dirbrowser.py | 2 +- tests/end2end/test_invocations.py | 6 +++--- tests/helpers/fixtures.py | 18 +++++++++--------- tests/helpers/messagemock.py | 2 +- tests/helpers/stubs.py | 8 ++++---- tests/helpers/testutils.py | 6 +++--- tests/unit/browser/test_caret.py | 2 +- tests/unit/browser/test_downloadview.py | 2 +- tests/unit/browser/test_hints.py | 2 +- tests/unit/browser/test_history.py | 10 +++++----- tests/unit/browser/test_inspector.py | 2 +- tests/unit/browser/test_navigate.py | 2 +- tests/unit/browser/test_pdfjs.py | 2 +- tests/unit/browser/test_qutescheme.py | 2 +- tests/unit/browser/test_signalfilter.py | 2 +- tests/unit/browser/test_urlmarks.py | 2 +- tests/unit/browser/webengine/test_webengine_cookies.py | 8 ++++---- .../unit/browser/webengine/test_webenginedownloads.py | 4 ++-- .../browser/webengine/test_webengineinterceptor.py | 4 ++-- tests/unit/browser/webengine/test_webenginesettings.py | 2 +- tests/unit/browser/webengine/test_webenginetab.py | 2 +- tests/unit/browser/webkit/http/test_http.py | 2 +- tests/unit/browser/webkit/network/test_filescheme.py | 4 ++-- tests/unit/browser/webkit/network/test_networkreply.py | 4 ++-- tests/unit/browser/webkit/network/test_pac.py | 4 ++-- tests/unit/browser/webkit/test_cache.py | 4 ++-- tests/unit/browser/webkit/test_certificateerror.py | 2 +- tests/unit/browser/webkit/test_cookies.py | 4 ++-- tests/unit/browser/webkit/test_tabhistory.py | 6 +++--- tests/unit/browser/webkit/test_webkitelem.py | 4 ++-- tests/unit/browser/webkit/test_webkitsettings.py | 2 +- tests/unit/commands/test_argparser.py | 2 +- tests/unit/commands/test_userscripts.py | 2 +- tests/unit/completion/test_completer.py | 4 ++-- tests/unit/completion/test_completiondelegate.py | 6 +++--- tests/unit/completion/test_completionmodel.py | 2 +- tests/unit/completion/test_completionwidget.py | 2 +- tests/unit/completion/test_models.py | 6 +++--- tests/unit/components/test_blockutils.py | 2 +- tests/unit/components/test_braveadblock.py | 2 +- tests/unit/components/test_hostblock.py | 2 +- tests/unit/components/test_readlinecommands.py | 2 +- tests/unit/config/test_config.py | 4 ++-- tests/unit/config/test_configcommands.py | 2 +- tests/unit/config/test_configfiles.py | 6 +++--- tests/unit/config/test_configinit.py | 2 +- tests/unit/config/test_configtypes.py | 6 +++--- tests/unit/config/test_configutils.py | 4 ++-- tests/unit/config/test_qtargs.py | 2 +- tests/unit/config/test_qtargs_locale_workaround.py | 4 ++-- tests/unit/config/test_stylesheet.py | 2 +- tests/unit/javascript/conftest.py | 2 +- .../javascript/position_caret/test_position_caret.py | 4 ++-- tests/unit/javascript/stylesheet/test_stylesheet_js.py | 2 +- tests/unit/javascript/test_greasemonkey.py | 2 +- tests/unit/javascript/test_js_execution.py | 6 +++--- tests/unit/javascript/test_js_quirks.py | 2 +- tests/unit/keyinput/key_data.py | 2 +- tests/unit/keyinput/test_basekeyparser.py | 2 +- tests/unit/keyinput/test_bindingtrie.py | 2 +- tests/unit/keyinput/test_keyutils.py | 6 +++--- tests/unit/keyinput/test_modeman.py | 2 +- tests/unit/keyinput/test_modeparsers.py | 4 ++-- tests/unit/mainwindow/statusbar/test_textbase.py | 2 +- tests/unit/mainwindow/statusbar/test_url.py | 2 +- tests/unit/mainwindow/test_messageview.py | 2 +- tests/unit/mainwindow/test_prompt.py | 2 +- tests/unit/mainwindow/test_tabwidget.py | 2 +- tests/unit/misc/test_autoupdate.py | 2 +- tests/unit/misc/test_editor.py | 2 +- tests/unit/misc/test_elf.py | 2 +- tests/unit/misc/test_guiprocess.py | 2 +- tests/unit/misc/test_ipc.py | 6 +++--- tests/unit/misc/test_miscwidgets.py | 4 ++-- tests/unit/misc/test_msgbox.py | 4 ++-- tests/unit/misc/test_pastebin.py | 2 +- tests/unit/misc/test_sessions.py | 4 ++-- tests/unit/misc/test_sql.py | 2 +- tests/unit/misc/test_throttle.py | 2 +- tests/unit/misc/test_utilcmds.py | 2 +- tests/unit/test_app.py | 2 +- tests/unit/utils/test_debug.py | 10 +++++----- tests/unit/utils/test_error.py | 4 ++-- tests/unit/utils/test_jinja.py | 2 +- tests/unit/utils/test_log.py | 2 +- tests/unit/utils/test_qtutils.py | 4 ++-- tests/unit/utils/test_standarddir.py | 4 ++-- tests/unit/utils/test_urlmatch.py | 2 +- tests/unit/utils/test_urlutils.py | 4 ++-- tests/unit/utils/test_utils.py | 6 +++--- tests/unit/utils/test_version.py | 10 +++++----- tests/unit/utils/usertypes/test_timer.py | 2 +- 104 files changed, 186 insertions(+), 186 deletions(-) (limited to 'tests') diff --git a/tests/conftest.py b/tests/conftest.py index 40631af34..cb0b112f6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -28,7 +28,7 @@ import warnings import pytest import hypothesis -from PyQt5.QtCore import PYQT_VERSION +from PyQt6.QtCore import PYQT_VERSION pytest.register_assert_rewrite('helpers') @@ -224,7 +224,7 @@ def pytest_configure(config): config.webengine = webengine_arg or webengine_env == 'true' # Fail early if QtWebEngine is not available if config.webengine: - import PyQt5.QtWebEngineWidgets + import PyQt6.QtWebEngineWidgets earlyinit.configure_pyqt() diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index a4a089cea..8f7fc155b 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -30,7 +30,7 @@ import pstats import operator import pytest -from PyQt5.QtCore import PYQT_VERSION, QCoreApplication +from PyQt6.QtCore import PYQT_VERSION, QCoreApplication pytest.register_assert_rewrite('end2end.fixtures') @@ -117,7 +117,7 @@ def _get_version_tag(tag): ) elif package == 'pyqtwebengine': try: - from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION + from PyQt6.QtWebEngine import PYQT_WEBENGINE_VERSION except ImportError: running_version = PYQT_VERSION else: diff --git a/tests/end2end/features/downloads.feature b/tests/end2end/features/downloads.feature index dfdb24704..79ff94860 100644 --- a/tests/end2end/features/downloads.feature +++ b/tests/end2end/features/downloads.feature @@ -338,7 +338,7 @@ Feature: Downloading things from a website. Scenario: Cancelling an MHTML download (issue 1535) When I open data/downloads/issue1535.html And I run :download --mhtml - And I wait for "fetch: PyQt5.QtCore.QUrl('http://localhost:*/drip?numbytes=128&duration=2') -> drip" in the log + And I wait for "fetch: PyQt6.QtCore.QUrl('http://localhost:*/drip?numbytes=128&duration=2') -> drip" in the log And I run :download-cancel Then no crash should happen diff --git a/tests/end2end/features/keyinput.feature b/tests/end2end/features/keyinput.feature index 556914e4d..3a62d0ff9 100644 --- a/tests/end2end/features/keyinput.feature +++ b/tests/end2end/features/keyinput.feature @@ -42,7 +42,7 @@ Feature: Keyboard input Scenario: :fake-key sending key to the website with other window focused When I open data/keyinput/log.html And I run :devtools - And I wait for "Focus object changed: " in the log + And I wait for "Focus object changed: " in the log And I run :fake-key x And I run :devtools And I wait for "Focus object changed: " in the log diff --git a/tests/end2end/features/misc.feature b/tests/end2end/features/misc.feature index e6a02e038..7b3ac82a5 100644 --- a/tests/end2end/features/misc.feature +++ b/tests/end2end/features/misc.feature @@ -174,7 +174,7 @@ Feature: Various utility commands. @no_xvfb @posix @qtwebengine_skip Scenario: Inspector smoke test When I run :devtools - And I wait for "Focus object changed: " in the log + And I wait for "Focus object changed: " in the log And I run :devtools And I wait for "Focus object changed: *" in the log Then no crash should happen @@ -183,7 +183,7 @@ Feature: Various utility commands. @no_xvfb @posix @qtwebengine_skip Scenario: Inspector smoke test 2 When I run :devtools - And I wait for "Focus object changed: " in the log + And I wait for "Focus object changed: " in the log And I run :devtools And I wait for "Focus object changed: *" in the log Then no crash should happen diff --git a/tests/end2end/features/test_downloads_bdd.py b/tests/end2end/features/test_downloads_bdd.py index 804ed40fe..fb8f623bf 100644 --- a/tests/end2end/features/test_downloads_bdd.py +++ b/tests/end2end/features/test_downloads_bdd.py @@ -23,7 +23,7 @@ import shlex import pytest import pytest_bdd as bdd -from PyQt5.QtNetwork import QSslSocket +from PyQt6.QtNetwork import QSslSocket bdd.scenarios('downloads.feature') diff --git a/tests/end2end/features/test_editor_bdd.py b/tests/end2end/features/test_editor_bdd.py index 40f77a0f7..d9cd7e670 100644 --- a/tests/end2end/features/test_editor_bdd.py +++ b/tests/end2end/features/test_editor_bdd.py @@ -26,7 +26,7 @@ import time import pytest import pytest_bdd as bdd -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QFileSystemWatcher +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject, QFileSystemWatcher bdd.scenarios('editor.feature') from qutebrowser.utils import utils diff --git a/tests/end2end/fixtures/notificationserver.py b/tests/end2end/fixtures/notificationserver.py index b643e848b..abadde794 100644 --- a/tests/end2end/fixtures/notificationserver.py +++ b/tests/end2end/fixtures/notificationserver.py @@ -21,9 +21,9 @@ import dataclasses import itertools from typing import Dict, List -from PyQt5.QtCore import QObject, QByteArray, QUrl, pyqtSlot -from PyQt5.QtGui import QImage -from PyQt5.QtDBus import QDBusConnection, QDBusArgument, QDBusMessage +from PyQt6.QtCore import QObject, QByteArray, QUrl, pyqtSlot +from PyQt6.QtGui import QImage +from PyQt6.QtDBus import QDBusConnection, QDBusArgument, QDBusMessage import pytest from qutebrowser.browser.webengine import notification diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 3cbea01ad..1552f51b4 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -33,8 +33,8 @@ import json import yaml import pytest -from PyQt5.QtCore import pyqtSignal, QUrl, QPoint -from PyQt5.QtGui import QImage, QColor +from PyQt6.QtCore import pyqtSignal, QUrl, QPoint +from PyQt6.QtGui import QImage, QColor from qutebrowser.misc import ipc from qutebrowser.utils import log, utils, javascript @@ -107,10 +107,10 @@ def is_ignored_lowlevel_message(message): # DevTools listening on ws://127.0.0.1:37945/devtools/browser/... 'DevTools listening on *', # /home/travis/build/qutebrowser/qutebrowser/.tox/py36-pyqt511-cov/lib/ - # python3.6/site-packages/PyQt5/Qt/libexec/QtWebEngineProcess: + # python3.6/site-packages/PyQt6/Qt/libexec/QtWebEngineProcess: # /lib/x86_64-linux-gnu/libdbus-1.so.3: no version information # available (required by /home/travis/build/qutebrowser/qutebrowser/ - # .tox/py36-pyqt511-cov/lib/python3.6/site-packages/PyQt5/Qt/libexec/ + # .tox/py36-pyqt511-cov/lib/python3.6/site-packages/PyQt6/Qt/libexec/ # ../lib/libQt5WebEngineCore.so.5) '*/QtWebEngineProcess: /lib/x86_64-linux-gnu/libdbus-1.so.3: no ' 'version information available (required by ' @@ -601,11 +601,11 @@ class QuteProc(testprocess.Process): raise ValueError("Either both x/y or neither must be given!") if x is None and y is None: - point = 'PyQt5.QtCore.QPoint(*, *)' # not counting 0/0 here + point = 'PyQt6.QtCore.QPoint(*, *)' # not counting 0/0 here elif x == '0' and y == '0': - point = 'PyQt5.QtCore.QPoint()' + point = 'PyQt6.QtCore.QPoint()' else: - point = 'PyQt5.QtCore.QPoint({}, {})'.format(x, y) + point = 'PyQt6.QtCore.QPoint({}, {})'.format(x, y) self.wait_for(category='webview', message='Scroll position changed to ' + point) @@ -859,7 +859,7 @@ class QuteProc(testprocess.Process): pattern = re.compile( r"(load status for : LoadStatus\.{load_status}|fetch: " - r"PyQt5\.QtCore\.QUrl\('{url}'\) -> .*)".format( + r"PyQt6\.QtCore\.QUrl\('{url}'\) -> .*)".format( load_status=re.escape(load_status), url=re.escape(url))) try: diff --git a/tests/end2end/fixtures/test_testprocess.py b/tests/end2end/fixtures/test_testprocess.py index aa6f19c67..0cf5e6041 100644 --- a/tests/end2end/fixtures/test_testprocess.py +++ b/tests/end2end/fixtures/test_testprocess.py @@ -25,7 +25,7 @@ import contextlib import datetime import pytest -from PyQt5.QtCore import QProcess +from PyQt6.QtCore import QProcess from end2end.fixtures import testprocess diff --git a/tests/end2end/fixtures/testprocess.py b/tests/end2end/fixtures/testprocess.py index 96e700390..c74a1a2b8 100644 --- a/tests/end2end/fixtures/testprocess.py +++ b/tests/end2end/fixtures/testprocess.py @@ -26,9 +26,9 @@ import dataclasses import pytest import pytestqt.wait_signal -from PyQt5.QtCore import (pyqtSlot, pyqtSignal, QProcess, QObject, +from PyQt6.QtCore import (pyqtSlot, pyqtSignal, QProcess, QObject, QElapsedTimer, QProcessEnvironment) -from PyQt5.QtTest import QSignalSpy +from PyQt6.QtTest import QSignalSpy from helpers import testutils diff --git a/tests/end2end/fixtures/webserver.py b/tests/end2end/fixtures/webserver.py index 0fc32cd88..d9fd48990 100644 --- a/tests/end2end/fixtures/webserver.py +++ b/tests/end2end/fixtures/webserver.py @@ -28,7 +28,7 @@ import dataclasses from http import HTTPStatus import pytest -from PyQt5.QtCore import pyqtSignal, QUrl +from PyQt6.QtCore import pyqtSignal, QUrl from end2end.fixtures import testprocess diff --git a/tests/end2end/test_dirbrowser.py b/tests/end2end/test_dirbrowser.py index c2aa19233..08eee7bc7 100644 --- a/tests/end2end/test_dirbrowser.py +++ b/tests/end2end/test_dirbrowser.py @@ -27,7 +27,7 @@ from typing import List import pytest import bs4 -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import urlutils from helpers import testutils diff --git a/tests/end2end/test_invocations.py b/tests/end2end/test_invocations.py index b860feed0..3b8b2f1c8 100644 --- a/tests/end2end/test_invocations.py +++ b/tests/end2end/test_invocations.py @@ -29,7 +29,7 @@ import json import platform import pytest -from PyQt5.QtCore import QProcess, QPoint +from PyQt6.QtCore import QProcess, QPoint from helpers import testutils from qutebrowser.utils import qtutils, utils @@ -786,8 +786,8 @@ def test_unavailable_backend(request, quteproc_new): that the chosen backend is actually available - i.e., that the error message is properly printed, rather than an unhandled exception. """ - qtwe_module = "PyQt5.QtWebEngineWidgets" - qtwk_module = "PyQt5.QtWebKitWidgets" + qtwe_module = "PyQt6.QtWebEngineWidgets" + qtwk_module = "PyQt6.QtWebKitWidgets" # Note we want to try the *opposite* backend here. if request.config.webengine: pytest.importorskip(qtwe_module) diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py index cd3778b8a..82159233c 100644 --- a/tests/helpers/fixtures.py +++ b/tests/helpers/fixtures.py @@ -37,9 +37,9 @@ import dataclasses import pytest import py.path # pylint: disable=no-name-in-module -from PyQt5.QtCore import QSize, Qt -from PyQt5.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout -from PyQt5.QtNetwork import QNetworkCookieJar +from PyQt6.QtCore import QSize, Qt +from PyQt6.QtWidgets import QWidget, QHBoxLayout, QVBoxLayout +from PyQt6.QtNetwork import QNetworkCookieJar import helpers.stubs as stubsmod import qutebrowser @@ -177,7 +177,7 @@ def testdata_scheme(qapp): try: global _qute_scheme_handler from qutebrowser.browser.webengine import webenginequtescheme - from PyQt5.QtWebEngineWidgets import QWebEngineProfile + from PyQt6.QtWebEngineWidgets import QWebEngineProfile webenginequtescheme.init() _qute_scheme_handler = webenginequtescheme.QuteSchemeHandler( parent=qapp) @@ -432,7 +432,7 @@ def unicode_encode_err(): @pytest.fixture(scope='session') def qnam(qapp): """Session-wide QNetworkAccessManager.""" - from PyQt5.QtNetwork import QNetworkAccessManager + from PyQt6.QtNetwork import QNetworkAccessManager nam = QNetworkAccessManager() nam.setNetworkAccessible(QNetworkAccessManager.NotAccessible) return nam @@ -441,7 +441,7 @@ def qnam(qapp): @pytest.fixture def webengineview(qtbot, monkeypatch, web_tab_setup): """Get a QWebEngineView if QtWebEngine is available.""" - QtWebEngineWidgets = pytest.importorskip('PyQt5.QtWebEngineWidgets') + QtWebEngineWidgets = pytest.importorskip('PyQt6.QtWebEngineWidgets') monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebEngine) view = QtWebEngineWidgets.QWebEngineView() qtbot.add_widget(view) @@ -452,7 +452,7 @@ def webengineview(qtbot, monkeypatch, web_tab_setup): @pytest.fixture def webpage(qnam, monkeypatch): """Get a new QWebPage object.""" - QtWebKitWidgets = pytest.importorskip('PyQt5.QtWebKitWidgets') + QtWebKitWidgets = pytest.importorskip('PyQt6.QtWebKitWidgets') monkeypatch.setattr(objects, 'backend', usertypes.Backend.QtWebKit) class WebPageStub(QtWebKitWidgets.QWebPage): @@ -477,7 +477,7 @@ def webpage(qnam, monkeypatch): @pytest.fixture def webview(qtbot, webpage): """Get a new QWebView object.""" - QtWebKitWidgets = pytest.importorskip('PyQt5.QtWebKitWidgets') + QtWebKitWidgets = pytest.importorskip('PyQt6.QtWebKitWidgets') view = QtWebKitWidgets.QWebView() qtbot.add_widget(view) @@ -734,7 +734,7 @@ def webengine_versions(testdata_scheme): Calling qtwebengine_versions() initializes QtWebEngine, so we depend on testdata_scheme here, to make sure that happens before. """ - pytest.importorskip('PyQt5.QtWebEngineWidgets') + pytest.importorskip('PyQt6.QtWebEngineWidgets') return version.qtwebengine_versions() diff --git a/tests/helpers/messagemock.py b/tests/helpers/messagemock.py index 41f0bac64..3208932a3 100644 --- a/tests/helpers/messagemock.py +++ b/tests/helpers/messagemock.py @@ -23,7 +23,7 @@ import logging import dataclasses import pytest -from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject +from PyQt6.QtCore import pyqtSlot, pyqtSignal, QObject from qutebrowser.utils import usertypes, message diff --git a/tests/helpers/stubs.py b/tests/helpers/stubs.py index 6998958b8..e4cf9bcc7 100644 --- a/tests/helpers/stubs.py +++ b/tests/helpers/stubs.py @@ -30,11 +30,11 @@ import builtins import importlib import types -from PyQt5.QtCore import pyqtSignal, QPoint, QProcess, QObject, QUrl, QByteArray -from PyQt5.QtGui import QIcon -from PyQt5.QtNetwork import (QNetworkRequest, QAbstractNetworkCache, +from PyQt6.QtCore import pyqtSignal, QPoint, QProcess, QObject, QUrl, QByteArray +from PyQt6.QtGui import QIcon +from PyQt6.QtNetwork import (QNetworkRequest, QAbstractNetworkCache, QNetworkCacheMetaData) -from PyQt5.QtWidgets import QCommonStyle, QLineEdit, QWidget, QTabBar +from PyQt6.QtWidgets import QCommonStyle, QLineEdit, QWidget, QTabBar from qutebrowser.browser import browsertab, downloads from qutebrowser.utils import usertypes diff --git a/tests/helpers/testutils.py b/tests/helpers/testutils.py index 8bb622133..1de6af104 100644 --- a/tests/helpers/testutils.py +++ b/tests/helpers/testutils.py @@ -31,10 +31,10 @@ import importlib.machinery import pytest -from PyQt5.QtCore import qVersion -from PyQt5.QtGui import QColor +from PyQt6.QtCore import qVersion +from PyQt6.QtGui import QColor try: - from PyQt5.QtWebEngine import PYQT_WEBENGINE_VERSION_STR + from PyQt6.QtWebEngine import PYQT_WEBENGINE_VERSION_STR except ImportError: PYQT_WEBENGINE_VERSION_STR = None diff --git a/tests/unit/browser/test_caret.py b/tests/unit/browser/test_caret.py index 288471ea0..d9663141d 100644 --- a/tests/unit/browser/test_caret.py +++ b/tests/unit/browser/test_caret.py @@ -22,7 +22,7 @@ import textwrap import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import usertypes from qutebrowser.browser import browsertab diff --git a/tests/unit/browser/test_downloadview.py b/tests/unit/browser/test_downloadview.py index 84b50fad2..728ca2ca5 100644 --- a/tests/unit/browser/test_downloadview.py +++ b/tests/unit/browser/test_downloadview.py @@ -20,7 +20,7 @@ import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import downloads, qtnetworkdownloads, downloadview diff --git a/tests/unit/browser/test_hints.py b/tests/unit/browser/test_hints.py index 85c0a642c..15b213a0b 100644 --- a/tests/unit/browser/test_hints.py +++ b/tests/unit/browser/test_hints.py @@ -23,7 +23,7 @@ import itertools import operator import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import usertypes import qutebrowser.browser.hints diff --git a/tests/unit/browser/test_history.py b/tests/unit/browser/test_history.py index 7906d385c..1518395b7 100644 --- a/tests/unit/browser/test_history.py +++ b/tests/unit/browser/test_history.py @@ -22,7 +22,7 @@ import logging import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import history from qutebrowser.utils import urlutils, usertypes @@ -276,7 +276,7 @@ class TestHistoryInterface: @pytest.fixture def hist_interface(self, web_history): # pylint: disable=invalid-name - QtWebKit = pytest.importorskip('PyQt5.QtWebKit') + QtWebKit = pytest.importorskip('PyQt6.QtWebKit') from qutebrowser.browser.webkit import webkithistory QWebHistoryInterface = QtWebKit.QWebHistoryInterface # pylint: enable=invalid-name @@ -304,7 +304,7 @@ class TestInit: history.web_history.setParent(None) history.web_history = None try: - from PyQt5.QtWebKit import QWebHistoryInterface + from PyQt6.QtWebKit import QWebHistoryInterface QWebHistoryInterface.setDefaultInterface(None) except ImportError: pass @@ -313,7 +313,7 @@ class TestInit: usertypes.Backend.QtWebKit]) def test_init(self, backend, qapp, tmpdir, data_tmpdir, monkeypatch, cleanup_init): if backend == usertypes.Backend.QtWebKit: - pytest.importorskip('PyQt5.QtWebKitWidgets') + pytest.importorskip('PyQt6.QtWebKitWidgets') else: assert backend == usertypes.Backend.QtWebEngine @@ -322,7 +322,7 @@ class TestInit: assert history.web_history.parent() is qapp try: - from PyQt5.QtWebKit import QWebHistoryInterface + from PyQt6.QtWebKit import QWebHistoryInterface except ImportError: QWebHistoryInterface = None diff --git a/tests/unit/browser/test_inspector.py b/tests/unit/browser/test_inspector.py index f7f532050..96aeb05da 100644 --- a/tests/unit/browser/test_inspector.py +++ b/tests/unit/browser/test_inspector.py @@ -19,7 +19,7 @@ import pytest -from PyQt5.QtWidgets import QWidget +from PyQt6.QtWidgets import QWidget from qutebrowser.browser import inspector from qutebrowser.misc import miscwidgets diff --git a/tests/unit/browser/test_navigate.py b/tests/unit/browser/test_navigate.py index 9813705ca..f8742aa84 100644 --- a/tests/unit/browser/test_navigate.py +++ b/tests/unit/browser/test_navigate.py @@ -20,7 +20,7 @@ import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import navigate from qutebrowser.utils import urlutils diff --git a/tests/unit/browser/test_pdfjs.py b/tests/unit/browser/test_pdfjs.py index 86b875be5..eb3317d01 100644 --- a/tests/unit/browser/test_pdfjs.py +++ b/tests/unit/browser/test_pdfjs.py @@ -21,7 +21,7 @@ import logging import os.path import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import pdfjs from qutebrowser.utils import urlmatch diff --git a/tests/unit/browser/test_qutescheme.py b/tests/unit/browser/test_qutescheme.py index 45474102d..86c67ecb2 100644 --- a/tests/unit/browser/test_qutescheme.py +++ b/tests/unit/browser/test_qutescheme.py @@ -24,7 +24,7 @@ import time import logging import py.path # pylint: disable=no-name-in-module -from PyQt5.QtCore import QUrl, QUrlQuery +from PyQt6.QtCore import QUrl, QUrlQuery import pytest from qutebrowser.browser import qutescheme, pdfjs, downloads diff --git a/tests/unit/browser/test_signalfilter.py b/tests/unit/browser/test_signalfilter.py index 35c7f3557..6af4512c5 100644 --- a/tests/unit/browser/test_signalfilter.py +++ b/tests/unit/browser/test_signalfilter.py @@ -23,7 +23,7 @@ import logging import dataclasses import pytest -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject +from PyQt6.QtCore import pyqtSignal, pyqtSlot, QObject from qutebrowser.browser import signalfilter diff --git a/tests/unit/browser/test_urlmarks.py b/tests/unit/browser/test_urlmarks.py index 6b8d429a9..6962b5398 100644 --- a/tests/unit/browser/test_urlmarks.py +++ b/tests/unit/browser/test_urlmarks.py @@ -22,7 +22,7 @@ import unittest.mock import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser import urlmarks diff --git a/tests/unit/browser/webengine/test_webengine_cookies.py b/tests/unit/browser/webengine/test_webengine_cookies.py index 1a74dfb3e..1612a55a5 100644 --- a/tests/unit/browser/webengine/test_webengine_cookies.py +++ b/tests/unit/browser/webengine/test_webengine_cookies.py @@ -18,10 +18,10 @@ # along with qutebrowser. If not, see . import pytest -from PyQt5.QtCore import QUrl -pytest.importorskip('PyQt5.QtWebEngineCore') -from PyQt5.QtWebEngineCore import QWebEngineCookieStore -from PyQt5.QtWebEngineWidgets import QWebEngineProfile +from PyQt6.QtCore import QUrl +pytest.importorskip('PyQt6.QtWebEngineCore') +from PyQt6.QtWebEngineCore import QWebEngineCookieStore +from PyQt6.QtWebEngineWidgets import QWebEngineProfile from qutebrowser.browser.webengine import cookies from qutebrowser.utils import urlmatch diff --git a/tests/unit/browser/webengine/test_webenginedownloads.py b/tests/unit/browser/webengine/test_webenginedownloads.py index 877af3c9a..aa6b67a2c 100644 --- a/tests/unit/browser/webengine/test_webenginedownloads.py +++ b/tests/unit/browser/webengine/test_webenginedownloads.py @@ -22,8 +22,8 @@ import base64 import dataclasses import pytest -pytest.importorskip('PyQt5.QtWebEngineWidgets') -from PyQt5.QtWebEngineWidgets import QWebEngineProfile +pytest.importorskip('PyQt6.QtWebEngineWidgets') +from PyQt6.QtWebEngineWidgets import QWebEngineProfile from qutebrowser.utils import urlutils, usertypes, utils from qutebrowser.browser.webengine import webenginedownloads diff --git a/tests/unit/browser/webengine/test_webengineinterceptor.py b/tests/unit/browser/webengine/test_webengineinterceptor.py index eb71e0c6e..11074f782 100644 --- a/tests/unit/browser/webengine/test_webengineinterceptor.py +++ b/tests/unit/browser/webengine/test_webengineinterceptor.py @@ -22,9 +22,9 @@ import pytest -pytest.importorskip('PyQt5.QtWebEngineWidgets') +pytest.importorskip('PyQt6.QtWebEngineWidgets') -from PyQt5.QtWebEngineCore import QWebEngineUrlRequestInfo +from PyQt6.QtWebEngineCore import QWebEngineUrlRequestInfo from qutebrowser.browser.webengine import interceptor diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py index 0f803a172..7dc72869b 100644 --- a/tests/unit/browser/webengine/test_webenginesettings.py +++ b/tests/unit/browser/webengine/test_webenginesettings.py @@ -21,7 +21,7 @@ import logging import pytest -QtWebEngineWidgets = pytest.importorskip('PyQt5.QtWebEngineWidgets') +QtWebEngineWidgets = pytest.importorskip('PyQt6.QtWebEngineWidgets') from qutebrowser.browser.webengine import webenginesettings from qutebrowser.utils import usertypes diff --git a/tests/unit/browser/webengine/test_webenginetab.py b/tests/unit/browser/webengine/test_webenginetab.py index 3d8eec663..92705a3aa 100644 --- a/tests/unit/browser/webengine/test_webenginetab.py +++ b/tests/unit/browser/webengine/test_webenginetab.py @@ -23,7 +23,7 @@ import logging import textwrap import pytest -QtWebEngineWidgets = pytest.importorskip("PyQt5.QtWebEngineWidgets") +QtWebEngineWidgets = pytest.importorskip("PyQt6.QtWebEngineWidgets") QWebEnginePage = QtWebEngineWidgets.QWebEnginePage QWebEngineScriptCollection = QtWebEngineWidgets.QWebEngineScriptCollection QWebEngineScript = QtWebEngineWidgets.QWebEngineScript diff --git a/tests/unit/browser/webkit/http/test_http.py b/tests/unit/browser/webkit/http/test_http.py index 4db78f4ff..a2d0a0c9a 100644 --- a/tests/unit/browser/webkit/http/test_http.py +++ b/tests/unit/browser/webkit/http/test_http.py @@ -24,7 +24,7 @@ import logging import pytest import hypothesis from hypothesis import strategies -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.browser.webkit import http diff --git a/tests/unit/browser/webkit/network/test_filescheme.py b/tests/unit/browser/webkit/network/test_filescheme.py index 12cacb5a2..0f92cbf6b 100644 --- a/tests/unit/browser/webkit/network/test_filescheme.py +++ b/tests/unit/browser/webkit/network/test_filescheme.py @@ -24,8 +24,8 @@ from typing import List import pytest import bs4 -from PyQt5.QtCore import QUrl -from PyQt5.QtNetwork import QNetworkRequest +from PyQt6.QtCore import QUrl +from PyQt6.QtNetwork import QNetworkRequest from qutebrowser.browser.webkit.network import filescheme from qutebrowser.utils import urlutils, utils diff --git a/tests/unit/browser/webkit/network/test_networkreply.py b/tests/unit/browser/webkit/network/test_networkreply.py index 3cffb2fd7..a64f45589 100644 --- a/tests/unit/browser/webkit/network/test_networkreply.py +++ b/tests/unit/browser/webkit/network/test_networkreply.py @@ -21,8 +21,8 @@ import pytest -from PyQt5.QtCore import QUrl, QIODevice -from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply +from PyQt6.QtCore import QUrl, QIODevice +from PyQt6.QtNetwork import QNetworkRequest, QNetworkReply from qutebrowser.browser.webkit.network import networkreply diff --git a/tests/unit/browser/webkit/network/test_pac.py b/tests/unit/browser/webkit/network/test_pac.py index 79b34be9a..8849e011c 100644 --- a/tests/unit/browser/webkit/network/test_pac.py +++ b/tests/unit/browser/webkit/network/test_pac.py @@ -22,8 +22,8 @@ import threading import logging import pytest -from PyQt5.QtCore import QUrl -from PyQt5.QtNetwork import (QNetworkProxy, QNetworkProxyQuery, QHostInfo, +from PyQt6.QtCore import QUrl +from PyQt6.QtNetwork import (QNetworkProxy, QNetworkProxyQuery, QHostInfo, QHostAddress) from qutebrowser.browser.network import pac diff --git a/tests/unit/browser/webkit/test_cache.py b/tests/unit/browser/webkit/test_cache.py index 83d5054d7..2d35e7683 100644 --- a/tests/unit/browser/webkit/test_cache.py +++ b/tests/unit/browser/webkit/test_cache.py @@ -19,8 +19,8 @@ # along with qutebrowser. If not, see . import pytest -from PyQt5.QtCore import QUrl, QDateTime -from PyQt5.QtNetwork import QNetworkDiskCache, QNetworkCacheMetaData +from PyQt6.QtCore import QUrl, QDateTime +from PyQt6.QtNetwork import QNetworkDiskCache, QNetworkCacheMetaData from qutebrowser.browser.webkit import cache diff --git a/tests/unit/browser/webkit/test_certificateerror.py b/tests/unit/browser/webkit/test_certificateerror.py index e615854ca..0f298a030 100644 --- a/tests/unit/browser/webkit/test_certificateerror.py +++ b/tests/unit/browser/webkit/test_certificateerror.py @@ -18,7 +18,7 @@ # along with qutebrowser. If not, see . import pytest -from PyQt5.QtNetwork import QSslError +from PyQt6.QtNetwork import QSslError from qutebrowser.browser.webkit import certificateerror diff --git a/tests/unit/browser/webkit/test_cookies.py b/tests/unit/browser/webkit/test_cookies.py index 81da561ce..6b8b731a5 100644 --- a/tests/unit/browser/webkit/test_cookies.py +++ b/tests/unit/browser/webkit/test_cookies.py @@ -18,8 +18,8 @@ # You should have received a copy of the GNU General Public License # along with qutebrowser. If not, see . -from PyQt5.QtNetwork import QNetworkCookie -from PyQt5.QtCore import QUrl +from PyQt6.QtNetwork import QNetworkCookie +from PyQt6.QtCore import QUrl import pytest from qutebrowser.browser.webkit import cookies diff --git a/tests/unit/browser/webkit/test_tabhistory.py b/tests/unit/browser/webkit/test_tabhistory.py index d1c4a25a4..325d1fa3d 100644 --- a/tests/unit/browser/webkit/test_tabhistory.py +++ b/tests/unit/browser/webkit/test_tabhistory.py @@ -23,9 +23,9 @@ import dataclasses from typing import Any import pytest -pytest.importorskip('PyQt5.QtWebKit') -from PyQt5.QtCore import QUrl, QPoint -from PyQt5.QtWebKit import QWebHistory +pytest.importorskip('PyQt6.QtWebKit') +from PyQt6.QtCore import QUrl, QPoint +from PyQt6.QtWebKit import QWebHistory from qutebrowser.browser.webkit import tabhistory from qutebrowser.misc.sessions import TabHistoryItem as Item diff --git a/tests/unit/browser/webkit/test_webkitelem.py b/tests/unit/browser/webkit/test_webkitelem.py index 593896e96..75317dec3 100644 --- a/tests/unit/browser/webkit/test_webkitelem.py +++ b/tests/unit/browser/webkit/test_webkitelem.py @@ -27,8 +27,8 @@ import itertools import dataclasses import pytest -from PyQt5.QtCore import QRect, QPoint, QUrl -QWebElement = pytest.importorskip('PyQt5.QtWebKit').QWebElement +from PyQt6.QtCore import QRect, QPoint, QUrl +QWebElement = pytest.importorskip('PyQt6.QtWebKit').QWebElement from qutebrowser.browser import browsertab from qutebrowser.browser.webkit import webkitelem diff --git a/tests/unit/browser/webkit/test_webkitsettings.py b/tests/unit/browser/webkit/test_webkitsettings.py index 8b30b85aa..56d3d8a53 100644 --- a/tests/unit/browser/webkit/test_webkitsettings.py +++ b/tests/unit/browser/webkit/test_webkitsettings.py @@ -18,7 +18,7 @@ # along with qutebrowser. If not, see . import pytest -pytest.importorskip('PyQt5.QtWebKitWidgets') +pytest.importorskip('PyQt6.QtWebKitWidgets') from qutebrowser.browser.webkit import webkitsettings diff --git a/tests/unit/commands/test_argparser.py b/tests/unit/commands/test_argparser.py index cfa94c552..4b6be7655 100644 --- a/tests/unit/commands/test_argparser.py +++ b/tests/unit/commands/test_argparser.py @@ -23,7 +23,7 @@ import inspect import enum import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.commands import argparser, cmdexc diff --git a/tests/unit/commands/test_userscripts.py b/tests/unit/commands/test_userscripts.py index 436e9e2a7..03ec9c094 100644 --- a/tests/unit/commands/test_userscripts.py +++ b/tests/unit/commands/test_userscripts.py @@ -25,7 +25,7 @@ import logging import signal import pytest -from PyQt5.QtCore import QFileSystemWatcher +from PyQt6.QtCore import QFileSystemWatcher from qutebrowser.commands import userscripts from qutebrowser.utils import utils diff --git a/tests/unit/completion/test_completer.py b/tests/unit/completion/test_completer.py index 467357d32..bffb4f42d 100644 --- a/tests/unit/completion/test_completer.py +++ b/tests/unit/completion/test_completer.py @@ -22,8 +22,8 @@ import unittest.mock import pytest -from PyQt5.QtCore import QObject -from PyQt5.QtGui import QStandardItemModel +from PyQt6.QtCore import QObject +from PyQt6.QtGui import QStandardItemModel from qutebrowser.completion import completer from qutebrowser.commands import command diff --git a/tests/unit/completion/test_completiondelegate.py b/tests/unit/completion/test_completiondelegate.py index ad081ccbf..1db96a904 100644 --- a/tests/unit/completion/test_completiondelegate.py +++ b/tests/unit/completion/test_completiondelegate.py @@ -21,9 +21,9 @@ from unittest import mock import hypothesis import hypothesis.strategies import pytest -from PyQt5.QtCore import Qt -from PyQt5.QtGui import QTextDocument, QColor -from PyQt5.QtWidgets import QTextEdit +from PyQt6.QtCore import Qt +from PyQt6.QtGui import QTextDocument, QColor +from PyQt6.QtWidgets import QTextEdit from qutebrowser.completion import completiondelegate diff --git a/tests/unit/completion/test_completionmodel.py b/tests/unit/completion/test_completionmodel.py index 2130f1f1c..888987942 100644 --- a/tests/unit/completion/test_completionmodel.py +++ b/tests/unit/completion/test_completionmodel.py @@ -24,7 +24,7 @@ import hypothesis from hypothesis import strategies import pytest -from PyQt5.QtCore import QModelIndex +from PyQt6.QtCore import QModelIndex from qutebrowser.completion.models import completionmodel, listcategory from qutebrowser.utils import qtutils diff --git a/tests/unit/completion/test_completionwidget.py b/tests/unit/completion/test_completionwidget.py index 89390cbf1..f9983e5f1 100644 --- a/tests/unit/completion/test_completionwidget.py +++ b/tests/unit/completion/test_completionwidget.py @@ -22,7 +22,7 @@ from unittest import mock import pytest -from PyQt5.QtCore import QRect +from PyQt6.QtCore import QRect from qutebrowser.completion import completionwidget from qutebrowser.completion.models import completionmodel, listcategory diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py index c20fe293c..4777f17f6 100644 --- a/tests/unit/completion/test_models.py +++ b/tests/unit/completion/test_models.py @@ -31,9 +31,9 @@ from unittest import mock import hypothesis import hypothesis.strategies as hst import pytest -from PyQt5.QtCore import QUrl, QDateTime, QProcess +from PyQt6.QtCore import QUrl, QDateTime, QProcess try: - from PyQt5.QtWebEngineWidgets import ( + from PyQt6.QtWebEngineWidgets import ( QWebEngineHistory, QWebEngineHistoryItem ) except ImportError: @@ -1320,7 +1320,7 @@ def test_url_completion_benchmark(benchmark, info, @pytest.fixture def tab_with_history(fake_web_tab, tabbed_browser_stubs, info, monkeypatch): """Returns a fake tab with some fake history items.""" - pytest.importorskip('PyQt5.QtWebEngineWidgets') + pytest.importorskip('PyQt6.QtWebEngineWidgets') tab = fake_web_tab(QUrl('https://github.com'), 'GitHub', 0) current_idx = 2 monkeypatch.setattr( diff --git a/tests/unit/components/test_blockutils.py b/tests/unit/components/test_blockutils.py index 08d8cee60..a10b6484c 100644 --- a/tests/unit/components/test_blockutils.py +++ b/tests/unit/components/test_blockutils.py @@ -21,7 +21,7 @@ import io from typing import IO -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl import pytest diff --git a/tests/unit/components/test_braveadblock.py b/tests/unit/components/test_braveadblock.py index fc50cb595..0f8f78f1b 100644 --- a/tests/unit/components/test_braveadblock.py +++ b/tests/unit/components/test_braveadblock.py @@ -22,7 +22,7 @@ import logging import csv from typing import Iterable, Tuple -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl import pytest diff --git a/tests/unit/components/test_hostblock.py b/tests/unit/components/test_hostblock.py index 6a71058ea..f85a3e803 100644 --- a/tests/unit/components/test_hostblock.py +++ b/tests/unit/components/test_hostblock.py @@ -24,7 +24,7 @@ import logging import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.components import hostblock from qutebrowser.utils import urlmatch diff --git a/tests/unit/components/test_readlinecommands.py b/tests/unit/components/test_readlinecommands.py index 334e2ef9e..d044d9f59 100644 --- a/tests/unit/components/test_readlinecommands.py +++ b/tests/unit/components/test_readlinecommands.py @@ -20,7 +20,7 @@ import re import inspect -from PyQt5.QtWidgets import QLineEdit, QApplication +from PyQt6.QtWidgets import QLineEdit, QApplication import pytest from qutebrowser.components import readlinecommands diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py index b88bc2f8d..c69e42f4d 100644 --- a/tests/unit/config/test_config.py +++ b/tests/unit/config/test_config.py @@ -23,8 +23,8 @@ import unittest.mock import functools import pytest -from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QColor +from PyQt6.QtCore import QUrl +from PyQt6.QtGui import QColor from qutebrowser.config import config, configdata, configexc from qutebrowser.utils import usertypes, urlmatch diff --git a/tests/unit/config/test_configcommands.py b/tests/unit/config/test_configcommands.py index 0375503e8..42348daad 100644 --- a/tests/unit/config/test_configcommands.py +++ b/tests/unit/config/test_configcommands.py @@ -23,7 +23,7 @@ import functools import unittest.mock import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.config import configcommands from qutebrowser.api import cmdutils diff --git a/tests/unit/config/test_configfiles.py b/tests/unit/config/test_configfiles.py index 65952ddb4..9ce859b3f 100644 --- a/tests/unit/config/test_configfiles.py +++ b/tests/unit/config/test_configfiles.py @@ -25,7 +25,7 @@ import textwrap import logging import pytest -from PyQt5.QtCore import QSettings +from PyQt6.QtCore import QSettings from qutebrowser.config import (config, configfiles, configexc, configdata, configtypes) @@ -167,7 +167,7 @@ def state_writer(data_tmpdir): @pytest.fixture def qtwe_version_patcher(monkeypatch): try: - from PyQt5 import QtWebEngineWidgets # pylint: disable=unused-import + from PyQt6 import QtWebEngineWidgets # pylint: disable=unused-import except ImportError: pytest.skip("QtWebEngine not available") @@ -223,7 +223,7 @@ def test_qtwe_version_changed(state_writer, qtwe_version_patcher, def test_qtwe_version_changed_webkit(stubs, monkeypatch, state_writer): - fake = stubs.ImportFake({'PyQt5.QtWebEngineWidgets': False}, monkeypatch) + fake = stubs.ImportFake({'PyQt6.QtWebEngineWidgets': False}, monkeypatch) fake.patch() state_writer('qtwe_version', 'no') diff --git a/tests/unit/config/test_configinit.py b/tests/unit/config/test_configinit.py index 870c3826b..36f3fa391 100644 --- a/tests/unit/config/test_configinit.py +++ b/tests/unit/config/test_configinit.py @@ -427,7 +427,7 @@ def test_get_backend(monkeypatch, args, config_stub, real_import = __import__ def fake_import(name, *args, **kwargs): - if name != 'PyQt5.QtWebKit': + if name != 'PyQt6.QtWebKit': return real_import(name, *args, **kwargs) raise ImportError diff --git a/tests/unit/config/test_configtypes.py b/tests/unit/config/test_configtypes.py index 66b152937..fbffa1fb5 100644 --- a/tests/unit/config/test_configtypes.py +++ b/tests/unit/config/test_configtypes.py @@ -30,9 +30,9 @@ import dataclasses import pytest import hypothesis from hypothesis import strategies -from PyQt5.QtCore import QUrl -from PyQt5.QtGui import QColor, QFont -from PyQt5.QtNetwork import QNetworkProxy +from PyQt6.QtCore import QUrl +from PyQt6.QtGui import QColor, QFont +from PyQt6.QtNetwork import QNetworkProxy from qutebrowser.misc import objects from qutebrowser.config import configtypes, configexc diff --git a/tests/unit/config/test_configutils.py b/tests/unit/config/test_configutils.py index e7ce15aff..2f0c02d31 100644 --- a/tests/unit/config/test_configutils.py +++ b/tests/unit/config/test_configutils.py @@ -20,8 +20,8 @@ import hypothesis from hypothesis import strategies import pytest -from PyQt5.QtCore import QUrl -from PyQt5.QtWidgets import QLabel +from PyQt6.QtCore import QUrl +from PyQt6.QtWidgets import QLabel from qutebrowser.config import configutils, configdata, configtypes, configexc from qutebrowser.utils import urlmatch, usertypes, qtutils diff --git a/tests/unit/config/test_qtargs.py b/tests/unit/config/test_qtargs.py index 4c31c5b07..c4202a58a 100644 --- a/tests/unit/config/test_qtargs.py +++ b/tests/unit/config/test_qtargs.py @@ -126,7 +126,7 @@ class TestWebEngineArgs: @pytest.fixture(autouse=True) def ensure_webengine(self, monkeypatch): """Skip all tests if QtWebEngine is unavailable.""" - pytest.importorskip("PyQt5.QtWebEngine") + pytest.importorskip("PyQt6.QtWebEngine") monkeypatch.setattr(qtargs.objects, 'backend', usertypes.Backend.QtWebEngine) @pytest.mark.parametrize('backend, qt_version, expected', [ diff --git a/tests/unit/config/test_qtargs_locale_workaround.py b/tests/unit/config/test_qtargs_locale_workaround.py index 4a4152b80..f1d7b216b 100644 --- a/tests/unit/config/test_qtargs_locale_workaround.py +++ b/tests/unit/config/test_qtargs_locale_workaround.py @@ -20,13 +20,13 @@ import os import pathlib import pytest -from PyQt5.QtCore import QLocale +from PyQt6.QtCore import QLocale from qutebrowser.utils import utils from qutebrowser.config import qtargs -pytest.importorskip('PyQt5.QtWebEngineWidgets') +pytest.importorskip('PyQt6.QtWebEngineWidgets') @pytest.fixture(autouse=True) diff --git a/tests/unit/config/test_stylesheet.py b/tests/unit/config/test_stylesheet.py index 4ffa107ed..981b52880 100644 --- a/tests/unit/config/test_stylesheet.py +++ b/tests/unit/config/test_stylesheet.py @@ -18,7 +18,7 @@ import pytest -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from qutebrowser.config import stylesheet diff --git a/tests/unit/javascript/conftest.py b/tests/unit/javascript/conftest.py index 4a7f09204..272ec2af9 100644 --- a/tests/unit/javascript/conftest.py +++ b/tests/unit/javascript/conftest.py @@ -23,7 +23,7 @@ import pathlib import pytest import jinja2 -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl import qutebrowser from qutebrowser.utils import usertypes diff --git a/tests/unit/javascript/position_caret/test_position_caret.py b/tests/unit/javascript/position_caret/test_position_caret.py index 70a1df333..ef5ce952c 100644 --- a/tests/unit/javascript/position_caret/test_position_caret.py +++ b/tests/unit/javascript/position_caret/test_position_caret.py @@ -21,8 +21,8 @@ import pytest -QWebSettings = pytest.importorskip("PyQt5.QtWebKit").QWebSettings -QWebPage = pytest.importorskip("PyQt5.QtWebKitWidgets").QWebPage +QWebSettings = pytest.importorskip("PyQt6.QtWebKit").QWebSettings +QWebPage = pytest.importorskip("PyQt6.QtWebKitWidgets").QWebPage @pytest.fixture(autouse=True) diff --git a/tests/unit/javascript/stylesheet/test_stylesheet_js.py b/tests/unit/javascript/stylesheet/test_stylesheet_js.py index 1eebe3b7f..237af660a 100644 --- a/tests/unit/javascript/stylesheet/test_stylesheet_js.py +++ b/tests/unit/javascript/stylesheet/test_stylesheet_js.py @@ -22,7 +22,7 @@ import pathlib import pytest -QtWebEngineWidgets = pytest.importorskip("PyQt5.QtWebEngineWidgets") +QtWebEngineWidgets = pytest.importorskip("PyQt6.QtWebEngineWidgets") QWebEngineProfile = QtWebEngineWidgets.QWebEngineProfile from qutebrowser.utils import javascript diff --git a/tests/unit/javascript/test_greasemonkey.py b/tests/unit/javascript/test_greasemonkey.py index 17847816d..5bbc6bda1 100644 --- a/tests/unit/javascript/test_greasemonkey.py +++ b/tests/unit/javascript/test_greasemonkey.py @@ -23,7 +23,7 @@ import textwrap import pytest import py.path # pylint: disable=no-name-in-module -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import usertypes, version from qutebrowser.browser import greasemonkey diff --git a/tests/unit/javascript/test_js_execution.py b/tests/unit/javascript/test_js_execution.py index e371e0f36..a98ca1175 100644 --- a/tests/unit/javascript/test_js_execution.py +++ b/tests/unit/javascript/test_js_execution.py @@ -28,7 +28,7 @@ def test_simple_js_webkit(webview, js_enabled, expected): """With QtWebKit, evaluateJavaScript works when JS is on.""" # If we get there (because of the webview fixture) we can be certain # QtWebKit is available - from PyQt5.QtWebKit import QWebSettings + from PyQt6.QtWebKit import QWebSettings webview.settings().setAttribute(QWebSettings.JavascriptEnabled, js_enabled) result = webview.page().mainFrame().evaluateJavaScript('1 + 1') assert result == expected @@ -39,7 +39,7 @@ def test_element_js_webkit(webview, js_enabled, expected): """With QtWebKit, evaluateJavaScript on an element works with JS off.""" # If we get there (because of the webview fixture) we can be certain # QtWebKit is available - from PyQt5.QtWebKit import QWebSettings + from PyQt6.QtWebKit import QWebSettings webview.settings().setAttribute(QWebSettings.JavascriptEnabled, js_enabled) elem = webview.page().mainFrame().documentElement() result = elem.evaluateJavaScript('1 + 1') @@ -63,7 +63,7 @@ def test_simple_js_webengine(qtbot, webengineview, qapp, """With QtWebEngine, runJavaScript works even when JS is off.""" # If we get there (because of the webengineview fixture) we can be certain # QtWebEngine is available - from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEngineScript + from PyQt6.QtWebEngineWidgets import QWebEngineSettings, QWebEngineScript assert world in [QWebEngineScript.MainWorld, QWebEngineScript.ApplicationWorld, diff --git a/tests/unit/javascript/test_js_quirks.py b/tests/unit/javascript/test_js_quirks.py index 7036dcfc9..31dad62f9 100644 --- a/tests/unit/javascript/test_js_quirks.py +++ b/tests/unit/javascript/test_js_quirks.py @@ -26,7 +26,7 @@ the native functionality exists. import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import usertypes diff --git a/tests/unit/keyinput/key_data.py b/tests/unit/keyinput/key_data.py index c451d2534..ffa375d16 100644 --- a/tests/unit/keyinput/key_data.py +++ b/tests/unit/keyinput/key_data.py @@ -25,7 +25,7 @@ import dataclasses from typing import Optional -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt @dataclasses.dataclass(order=True) diff --git a/tests/unit/keyinput/test_basekeyparser.py b/tests/unit/keyinput/test_basekeyparser.py index 30ee36301..a857d451b 100644 --- a/tests/unit/keyinput/test_basekeyparser.py +++ b/tests/unit/keyinput/test_basekeyparser.py @@ -21,7 +21,7 @@ from unittest import mock -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt import pytest from qutebrowser.keyinput import basekeyparser, keyutils diff --git a/tests/unit/keyinput/test_bindingtrie.py b/tests/unit/keyinput/test_bindingtrie.py index c769386c0..5c00fbbd3 100644 --- a/tests/unit/keyinput/test_bindingtrie.py +++ b/tests/unit/keyinput/test_bindingtrie.py @@ -25,7 +25,7 @@ import textwrap import pytest -from PyQt5.QtGui import QKeySequence +from PyQt6.QtGui import QKeySequence from qutebrowser.keyinput import basekeyparser from qutebrowser.keyinput import keyutils diff --git a/tests/unit/keyinput/test_keyutils.py b/tests/unit/keyinput/test_keyutils.py index 195518127..6bfa098fc 100644 --- a/tests/unit/keyinput/test_keyutils.py +++ b/tests/unit/keyinput/test_keyutils.py @@ -22,9 +22,9 @@ import operator import hypothesis from hypothesis import strategies import pytest -from PyQt5.QtCore import Qt, QEvent, pyqtSignal -from PyQt5.QtGui import QKeyEvent, QKeySequence -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import Qt, QEvent, pyqtSignal +from PyQt6.QtGui import QKeyEvent, QKeySequence +from PyQt6.QtWidgets import QWidget from unit.keyinput import key_data from qutebrowser.keyinput import keyutils diff --git a/tests/unit/keyinput/test_modeman.py b/tests/unit/keyinput/test_modeman.py index 8cc298f87..c192601f0 100644 --- a/tests/unit/keyinput/test_modeman.py +++ b/tests/unit/keyinput/test_modeman.py @@ -19,7 +19,7 @@ import pytest -from PyQt5.QtCore import Qt, QObject, pyqtSignal +from PyQt6.QtCore import Qt, QObject, pyqtSignal from qutebrowser.utils import usertypes from qutebrowser.keyinput import keyutils diff --git a/tests/unit/keyinput/test_modeparsers.py b/tests/unit/keyinput/test_modeparsers.py index ff3758362..fad2b2f3d 100644 --- a/tests/unit/keyinput/test_modeparsers.py +++ b/tests/unit/keyinput/test_modeparsers.py @@ -19,8 +19,8 @@ """Tests for mode parsers.""" -from PyQt5.QtCore import Qt -from PyQt5.QtGui import QKeySequence +from PyQt6.QtCore import Qt +from PyQt6.QtGui import QKeySequence import pytest diff --git a/tests/unit/mainwindow/statusbar/test_textbase.py b/tests/unit/mainwindow/statusbar/test_textbase.py index 631c6ce44..16126d344 100644 --- a/tests/unit/mainwindow/statusbar/test_textbase.py +++ b/tests/unit/mainwindow/statusbar/test_textbase.py @@ -19,7 +19,7 @@ """Test TextBase widget.""" -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt import pytest from qutebrowser.mainwindow.statusbar.textbase import TextBase diff --git a/tests/unit/mainwindow/statusbar/test_url.py b/tests/unit/mainwindow/statusbar/test_url.py index efe4d6f93..3a9a5444c 100644 --- a/tests/unit/mainwindow/statusbar/test_url.py +++ b/tests/unit/mainwindow/statusbar/test_url.py @@ -22,7 +22,7 @@ import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.utils import usertypes, urlutils from qutebrowser.mainwindow.statusbar import url diff --git a/tests/unit/mainwindow/test_messageview.py b/tests/unit/mainwindow/test_messageview.py index 9e7627635..f9b05335e 100644 --- a/tests/unit/mainwindow/test_messageview.py +++ b/tests/unit/mainwindow/test_messageview.py @@ -18,7 +18,7 @@ # along with qutebrowser. If not, see . import pytest -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt from qutebrowser.mainwindow import messageview from qutebrowser.utils import usertypes diff --git a/tests/unit/mainwindow/test_prompt.py b/tests/unit/mainwindow/test_prompt.py index 5b774bdaa..6922183d9 100644 --- a/tests/unit/mainwindow/test_prompt.py +++ b/tests/unit/mainwindow/test_prompt.py @@ -20,7 +20,7 @@ import os import pytest -from PyQt5.QtCore import Qt +from PyQt6.QtCore import Qt from qutebrowser.mainwindow import prompt as promptmod from qutebrowser.utils import usertypes diff --git a/tests/unit/mainwindow/test_tabwidget.py b/tests/unit/mainwindow/test_tabwidget.py index 564ca1b38..3691d5778 100644 --- a/tests/unit/mainwindow/test_tabwidget.py +++ b/tests/unit/mainwindow/test_tabwidget.py @@ -23,7 +23,7 @@ import functools import pytest -from PyQt5.QtGui import QIcon, QPixmap +from PyQt6.QtGui import QIcon, QPixmap from qutebrowser.mainwindow import tabwidget from qutebrowser.utils import usertypes diff --git a/tests/unit/misc/test_autoupdate.py b/tests/unit/misc/test_autoupdate.py index f7cf78248..38d838e93 100644 --- a/tests/unit/misc/test_autoupdate.py +++ b/tests/unit/misc/test_autoupdate.py @@ -21,7 +21,7 @@ """Tests for qutebrowser.misc.autoupdate.""" import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.misc import autoupdate, httpclient diff --git a/tests/unit/misc/test_editor.py b/tests/unit/misc/test_editor.py index 8e5597a0e..8187271c0 100644 --- a/tests/unit/misc/test_editor.py +++ b/tests/unit/misc/test_editor.py @@ -25,7 +25,7 @@ import os import logging import pytest -from PyQt5.QtCore import QProcess +from PyQt6.QtCore import QProcess from qutebrowser.misc import editor as editormod from qutebrowser.utils import usertypes diff --git a/tests/unit/misc/test_elf.py b/tests/unit/misc/test_elf.py index 86060bbde..498be108b 100644 --- a/tests/unit/misc/test_elf.py +++ b/tests/unit/misc/test_elf.py @@ -57,7 +57,7 @@ def test_result(qapp, caplog): If that happens, please report a bug about it! """ - pytest.importorskip('PyQt5.QtWebEngineCore') + pytest.importorskip('PyQt6.QtWebEngineCore') versions = elf.parse_webenginecore() assert versions is not None diff --git a/tests/unit/misc/test_guiprocess.py b/tests/unit/misc/test_guiprocess.py index be86bf215..6f7ce8810 100644 --- a/tests/unit/misc/test_guiprocess.py +++ b/tests/unit/misc/test_guiprocess.py @@ -23,7 +23,7 @@ import sys import logging import pytest -from PyQt5.QtCore import QProcess, QUrl +from PyQt6.QtCore import QProcess, QUrl from qutebrowser.misc import guiprocess from qutebrowser.utils import usertypes, utils diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index 51d7c6343..1bd6e4695 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -30,9 +30,9 @@ from unittest import mock from typing import Optional, List import pytest -from PyQt5.QtCore import pyqtSignal, QObject -from PyQt5.QtNetwork import QLocalServer, QLocalSocket, QAbstractSocket -from PyQt5.QtTest import QSignalSpy +from PyQt6.QtCore import pyqtSignal, QObject +from PyQt6.QtNetwork import QLocalServer, QLocalSocket, QAbstractSocket +from PyQt6.QtTest import QSignalSpy import qutebrowser from qutebrowser.misc import ipc diff --git a/tests/unit/misc/test_miscwidgets.py b/tests/unit/misc/test_miscwidgets.py index 6e1919ec3..7749b7367 100644 --- a/tests/unit/misc/test_miscwidgets.py +++ b/tests/unit/misc/test_miscwidgets.py @@ -19,8 +19,8 @@ import logging -from PyQt5.QtCore import Qt, QSize -from PyQt5.QtWidgets import QWidget +from PyQt6.QtCore import Qt, QSize +from PyQt6.QtWidgets import QWidget import pytest from qutebrowser.misc import miscwidgets diff --git a/tests/unit/misc/test_msgbox.py b/tests/unit/misc/test_msgbox.py index c5c23639a..78f87e4c9 100644 --- a/tests/unit/misc/test_msgbox.py +++ b/tests/unit/misc/test_msgbox.py @@ -20,8 +20,8 @@ import pytest -from PyQt5.QtCore import Qt -from PyQt5.QtWidgets import QMessageBox, QWidget +from PyQt6.QtCore import Qt +from PyQt6.QtWidgets import QMessageBox, QWidget from qutebrowser.misc import msgbox from qutebrowser.utils import utils diff --git a/tests/unit/misc/test_pastebin.py b/tests/unit/misc/test_pastebin.py index 7a47e723c..e3f1691b5 100644 --- a/tests/unit/misc/test_pastebin.py +++ b/tests/unit/misc/test_pastebin.py @@ -19,7 +19,7 @@ # along with qutebrowser. If not, see . import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.misc import httpclient, pastebin diff --git a/tests/unit/misc/test_sessions.py b/tests/unit/misc/test_sessions.py index f77982e5f..144e2d7b2 100644 --- a/tests/unit/misc/test_sessions.py +++ b/tests/unit/misc/test_sessions.py @@ -23,8 +23,8 @@ import logging import pytest import yaml -from PyQt5.QtCore import QUrl, QPoint, QByteArray, QObject -QWebView = pytest.importorskip('PyQt5.QtWebKitWidgets').QWebView +from PyQt6.QtCore import QUrl, QPoint, QByteArray, QObject +QWebView = pytest.importorskip('PyQt6.QtWebKitWidgets').QWebView from qutebrowser.misc import sessions from qutebrowser.misc.sessions import TabHistoryItem as Item diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py index 80ab7513c..4608fd9ca 100644 --- a/tests/unit/misc/test_sql.py +++ b/tests/unit/misc/test_sql.py @@ -23,7 +23,7 @@ import pytest import hypothesis from hypothesis import strategies -from PyQt5.QtSql import QSqlDatabase, QSqlError, QSqlQuery +from PyQt6.QtSql import QSqlDatabase, QSqlError, QSqlQuery from qutebrowser.misc import sql diff --git a/tests/unit/misc/test_throttle.py b/tests/unit/misc/test_throttle.py index 33e9949f2..d057935c4 100644 --- a/tests/unit/misc/test_throttle.py +++ b/tests/unit/misc/test_throttle.py @@ -23,7 +23,7 @@ from unittest import mock import sip import pytest -from PyQt5.QtCore import QObject +from PyQt6.QtCore import QObject from helpers import testutils from qutebrowser.misc import throttle diff --git a/tests/unit/misc/test_utilcmds.py b/tests/unit/misc/test_utilcmds.py index 76bc015d2..e2ec9a994 100644 --- a/tests/unit/misc/test_utilcmds.py +++ b/tests/unit/misc/test_utilcmds.py @@ -20,7 +20,7 @@ """Tests for qutebrowser.misc.utilcmds.""" import pytest -from PyQt5.QtCore import QUrl +from PyQt6.QtCore import QUrl from qutebrowser.misc import utilcmds from qutebrowser.api import cmdutils diff --git a/tests/unit/test_app.py b/tests/unit/test_app.py index e359f2136..a9ffba859 100644 --- a/tests/unit/test_app.py +++ b/tests/unit/test_app.py @@ -19,7 +19,7 @@ """Tests for the qutebrowser.app module.""" -from PyQt5.QtCore import QBuffer +from PyQt6.QtCore import QBuffer from qutebrowser.misc import objects from qutebrowser import app diff --git a/tests/unit/utils/test_debug.py b/tests/unit/utils/test_debug.py index 62d0f4a7b..6f109f71f 100644 --- a/tests/unit/utils/test_debug.py +++ b/tests/unit/utils/test_debug.py @@ -25,8 +25,8 @@ import time import textwrap import pytest -from PyQt5.QtCore import pyqtSignal, Qt, QEvent, QObject, QTimer -from PyQt5.QtWidgets import QStyle, QFrame, QSpinBox +from PyQt6.QtCore import pyqtSignal, Qt, QEvent, QObject, QTimer +from PyQt6.QtWidgets import QStyle, QFrame, QSpinBox from qutebrowser.utils import debug from qutebrowser.misc import objects @@ -186,7 +186,7 @@ class TestQFlagsKey: No idea what's happening here exactly... """ - qwebpage = pytest.importorskip("PyQt5.QtWebKitWidgets").QWebPage + qwebpage = pytest.importorskip("PyQt6.QtWebKitWidgets").QWebPage flags = qwebpage.FindWrapsAroundDocument flags |= qwebpage.FindBackward @@ -297,6 +297,6 @@ class TestGetAllObjects: def test_get_all_objects_qapp(self, qapp, monkeypatch): monkeypatch.setattr(objects, 'qapp', qapp) objs = debug.get_all_objects() - event_dispatcher = '