diff options
author | Florian Bruhin <me@the-compiler.org> | 2023-06-13 15:21:28 +0200 |
---|---|---|
committer | Florian Bruhin <me@the-compiler.org> | 2023-06-13 15:21:28 +0200 |
commit | 1cf9d68abaff0cb940fdebc8237afbd18b1f6f90 (patch) | |
tree | eb5ee6904b3d67f9ed1d99f6f9b94b7f387fd4ee | |
parent | 9588e0aec0f3f758d00a4738409abb4b9df28242 (diff) | |
download | qutebrowser-1cf9d68abaff0cb940fdebc8237afbd18b1f6f90.tar.gz qutebrowser-1cf9d68abaff0cb940fdebc8237afbd18b1f6f90.zip |
qt: Fix lint
-rw-r--r-- | qutebrowser/qt/machinery.py | 22 | ||||
-rwxr-xr-x | scripts/dev/run_vulture.py | 3 | ||||
-rw-r--r-- | tests/unit/test_qt_machinery.py | 2 | ||||
-rw-r--r-- | tests/unit/utils/test_version.py | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/qutebrowser/qt/machinery.py b/qutebrowser/qt/machinery.py index 6e7085040..d7f3953b9 100644 --- a/qutebrowser/qt/machinery.py +++ b/qutebrowser/qt/machinery.py @@ -52,22 +52,22 @@ class SelectionReason(enum.Enum): """Reasons for selecting a Qt wrapper.""" #: The wrapper was selected via --qt-wrapper. - CLI = "--qt-wrapper" + cli = "--qt-wrapper" #: The wrapper was selected via the QUTE_QT_WRAPPER environment variable. - ENV = "QUTE_QT_WRAPPER" + env = "QUTE_QT_WRAPPER" #: The wrapper was selected via autoselection. - AUTO = "autoselect" + auto = "autoselect" #: The default wrapper was selected. - DEFAULT = "default" + default = "default" #: The wrapper was faked/patched out (e.g. in tests). - FAKE = "fake" + fake = "fake" #: The reason was not set. - UNKNOWN = "unknown" + unknown = "unknown" @dataclasses.dataclass @@ -77,7 +77,7 @@ class SelectionInfo: pyqt5: Optional[str] = None pyqt6: Optional[str] = None wrapper: Optional[str] = None - reason: SelectionReason = SelectionReason.UNKNOWN + reason: SelectionReason = SelectionReason.unknown def set_module(self, name: str, outcome: str) -> None: """Set the outcome for a module import.""" @@ -100,7 +100,7 @@ def _autoselect_wrapper() -> SelectionInfo: This goes through all wrappers defined in WRAPPER. The first one which can be imported is returned. """ - info = SelectionInfo(reason=SelectionReason.AUTO) + info = SelectionInfo(reason=SelectionReason.auto) for wrapper in WRAPPERS: try: @@ -127,7 +127,7 @@ def _select_wrapper(args: Optional[argparse.Namespace]) -> SelectionInfo: """ if args is not None and args.qt_wrapper is not None: assert args.qt_wrapper in WRAPPERS, args.qt_wrapper # ensured by argparse - return SelectionInfo(wrapper=args.qt_wrapper, reason=SelectionReason.CLI) + return SelectionInfo(wrapper=args.qt_wrapper, reason=SelectionReason.cli) env_var = "QUTE_QT_WRAPPER" env_wrapper = os.environ.get(env_var) @@ -135,13 +135,13 @@ def _select_wrapper(args: Optional[argparse.Namespace]) -> SelectionInfo: if env_wrapper not in WRAPPERS: raise Error(f"Unknown wrapper {env_wrapper} set via {env_var}, " f"allowed: {', '.join(WRAPPERS)}") - return SelectionInfo(wrapper=env_wrapper, reason=SelectionReason.ENV) + return SelectionInfo(wrapper=env_wrapper, reason=SelectionReason.env) # FIXME:qt6 Go back to the auto-detection once ready # FIXME:qt6 Make sure to still consider _DEFAULT_WRAPPER for packagers # (rename to _WRAPPER_OVERRIDE since our sed command is broken anyways then?) # return _autoselect_wrapper() - return SelectionInfo(wrapper=_DEFAULT_WRAPPER, reason=SelectionReason.DEFAULT) + return SelectionInfo(wrapper=_DEFAULT_WRAPPER, reason=SelectionReason.default) # Values are set in init(). If you see a NameError here, it means something tried to diff --git a/scripts/dev/run_vulture.py b/scripts/dev/run_vulture.py index 6829c6b39..b4b46fdb3 100755 --- a/scripts/dev/run_vulture.py +++ b/scripts/dev/run_vulture.py @@ -143,6 +143,9 @@ def whitelist_generator(): # noqa: C901 yield 'ParserDictType' yield 'qutebrowser.config.configutils.Values._VmapKeyType' + # used in tests + yield 'qutebrowser.qt.machinery.SelectionReason.fake' + # ELF yield 'qutebrowser.misc.elf.Endianness.big' for name in ['phoff', 'ehsize', 'phentsize', 'phnum']: diff --git a/tests/unit/test_qt_machinery.py b/tests/unit/test_qt_machinery.py index 4184a4388..d7d381824 100644 --- a/tests/unit/test_qt_machinery.py +++ b/tests/unit/test_qt_machinery.py @@ -164,7 +164,7 @@ def test_init_properly( info = machinery.SelectionInfo( wrapper=selected_wrapper, - reason=machinery.SelectionReason.FAKE, + reason=machinery.SelectionReason.fake, ) monkeypatch.setattr(machinery, "_select_wrapper", lambda args: info) diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index a1b5e734e..1e9faf916 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -1272,7 +1272,7 @@ def test_version_info(params, stubs, monkeypatch, config_stub): 'config.instance.yaml_loaded': params.autoconfig_loaded, 'machinery.INFO': machinery.SelectionInfo( wrapper="QT WRAPPER", - reason=machinery.SelectionReason.FAKE + reason=machinery.SelectionReason.fake ), } |