diff options
author | Florian Bruhin <me@the-compiler.org> | 2022-05-17 13:05:40 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2022-06-22 17:41:12 +0200 |
commit | a0b5da42462dfa8b8ab830919c35d46d10647134 (patch) | |
tree | ce90d3893062e70cced868ee914d3e09d4c4a712 | |
parent | b776497bda1c6059fc2d4db4a1881a65199bece1 (diff) | |
download | qutebrowser-a0b5da42462dfa8b8ab830919c35d46d10647134.tar.gz qutebrowser-a0b5da42462dfa8b8ab830919c35d46d10647134.zip |
lint: Fix flake8 whitespace issues
-rw-r--r-- | qutebrowser/browser/webengine/certificateerror.py | 4 | ||||
-rw-r--r-- | qutebrowser/browser/webengine/webenginetab.py | 3 | ||||
-rw-r--r-- | qutebrowser/mainwindow/tabbedbrowser.py | 2 | ||||
-rw-r--r-- | qutebrowser/misc/backendproblem.py | 1 | ||||
-rw-r--r-- | qutebrowser/utils/version.py | 2 | ||||
-rw-r--r-- | tests/end2end/features/test_qutescheme_bdd.py | 1 | ||||
-rw-r--r-- | tests/helpers/testutils.py | 1 | ||||
-rw-r--r-- | tests/unit/browser/test_browsertab.py | 1 | ||||
-rw-r--r-- | tests/unit/config/test_qtargs.py | 2 | ||||
-rw-r--r-- | tests/unit/misc/test_ipc.py | 1 | ||||
-rw-r--r-- | tests/unit/utils/test_qtutils.py | 2 |
11 files changed, 9 insertions, 11 deletions
diff --git a/qutebrowser/browser/webengine/certificateerror.py b/qutebrowser/browser/webengine/certificateerror.py index 51cf4efb5..4b7374054 100644 --- a/qutebrowser/browser/webengine/certificateerror.py +++ b/qutebrowser/browser/webengine/certificateerror.py @@ -31,7 +31,7 @@ from qutebrowser.utils import usertypes, utils, debug class CertificateErrorWrapper(usertypes.AbstractCertificateErrorWrapper): """A wrapper over a QWebEngineCertificateError. - + Base code shared between Qt 5 and 6 implementations. """ @@ -89,7 +89,7 @@ class CertificateErrorWrapperQt5(CertificateErrorWrapper): class CertificateErrorWrapperQt6(CertificateErrorWrapper): - + def _validate(self) -> None: assert machinery.IS_QT6 diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index d82bd12f1..4846d65db 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -658,9 +658,8 @@ class WebEngineHistoryPrivate(browsertab.AbstractHistoryPrivate): def _load_items_proper(self, items): """Load session items properly. - Currently unused, but should be revived. + Currently unused, but should be revived. """ - if items: self._tab.before_load_started.emit(items[-1].url) diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index 41d4e01d2..487f3ea42 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -228,7 +228,7 @@ class TabbedBrowser(QWidget): self.widget.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding) if ( - objects.backend == usertypes.Backend.QtWebEngine and + objects.backend == usertypes.Backend.QtWebEngine and version.qtwebengine_versions().webengine < utils.VersionNumber(5, 15, 5) ): # WORKAROUND for https://bugreports.qt.io/browse/QTBUG-65223 diff --git a/qutebrowser/misc/backendproblem.py b/qutebrowser/misc/backendproblem.py index ed0b9c588..ceb1bc08e 100644 --- a/qutebrowser/misc/backendproblem.py +++ b/qutebrowser/misc/backendproblem.py @@ -99,6 +99,7 @@ def _error_text( f"this manually). {warning}</p>") return text + class _Dialog(QDialog): """A dialog which gets shown if there are issues with the backend.""" diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 3851de7b3..49bb93a94 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -541,7 +541,7 @@ class WebEngineVersions: _CHROMIUM_VERSIONS: ClassVar[Dict[utils.VersionNumber, str]] = { # ====== UNSUPPORTED ===== - + # Qt 5.12: Chromium 69 # (LTS) 69.0.3497.128 (~2018-09-11) # 5.12.10: Security fixes up to 86.0.4240.75 (2020-10-06) diff --git a/tests/end2end/features/test_qutescheme_bdd.py b/tests/end2end/features/test_qutescheme_bdd.py index 492e85c79..3b6145988 100644 --- a/tests/end2end/features/test_qutescheme_bdd.py +++ b/tests/end2end/features/test_qutescheme_bdd.py @@ -20,7 +20,6 @@ import pytest_bdd as bdd - bdd.scenarios('qutescheme.feature') diff --git a/tests/helpers/testutils.py b/tests/helpers/testutils.py index dfcb37bb7..574c57cb0 100644 --- a/tests/helpers/testutils.py +++ b/tests/helpers/testutils.py @@ -38,6 +38,7 @@ from qutebrowser.utils import log, utils, version ON_CI = 'CI' in os.environ + class Color(QColor): """A QColor with a nicer repr().""" diff --git a/tests/unit/browser/test_browsertab.py b/tests/unit/browser/test_browsertab.py index 7eec9210a..60ae0942e 100644 --- a/tests/unit/browser/test_browsertab.py +++ b/tests/unit/browser/test_browsertab.py @@ -39,7 +39,6 @@ class TestAction: web_tab.action.run_string("Back") assert web_tab.url() == url_1 - @pytest.mark.parametrize("member", ["blah", "PermissionUnknown"]) def test_run_string_invalid(self, qtbot, web_tab, member): with pytest.raises( diff --git a/tests/unit/config/test_qtargs.py b/tests/unit/config/test_qtargs.py index e1d7baa66..5679a409c 100644 --- a/tests/unit/config/test_qtargs.py +++ b/tests/unit/config/test_qtargs.py @@ -553,7 +553,7 @@ class TestEnvVars: @pytest.mark.parametrize('new_qt', [True, False]) def test_highdpi(self, monkeypatch, config_stub, new_qt): - """Test HighDPI environment variables. """ + """Test HighDPI environment variables.""" monkeypatch.setattr(qtargs.objects, 'backend', usertypes.Backend.QtWebEngine) monkeypatch.setattr(qtargs.qtutils, 'version_check', diff --git a/tests/unit/misc/test_ipc.py b/tests/unit/misc/test_ipc.py index 33f60f9ee..838be3c30 100644 --- a/tests/unit/misc/test_ipc.py +++ b/tests/unit/misc/test_ipc.py @@ -750,7 +750,6 @@ class TestSendOrListen: value_to_key = qlocalsocket_mock.staticMetaObject.enumerator().valueToKey value_to_key.return_value = "ConnectionRefusedError" - with caplog.at_level(logging.ERROR): with pytest.raises(ipc.Error): ipc.send_or_listen(args) diff --git a/tests/unit/utils/test_qtutils.py b/tests/unit/utils/test_qtutils.py index 6081b6dbd..143603bad 100644 --- a/tests/unit/utils/test_qtutils.py +++ b/tests/unit/utils/test_qtutils.py @@ -1066,4 +1066,4 @@ class TestLibraryPath: def test_extract_enum_val(): value = qtutils.extract_enum_val(Qt.KeyboardModifier.ShiftModifier) - assert value == 0x02000000 + assert value == 0x02000000 |