lint: Fix remaining pylint issues

11 files changed, 17 insertions, 15 deletions

diff --git a/qutebrowser/browser/webengine/darkmode.py b/qutebrowser/browser/webengine/darkmode.py
index 420014b24..276f84a62 100644
--- a/qutebrowser/browser/webengine/darkmode.py
+++ b/qutebrowser/browser/webengine/darkmode.py
@@ -248,7 +248,7 @@ class _Definition:
     def copy_add_setting(self, setting: _Setting) -> '_Definition':
         """Get a new _Definition object with an additional setting."""
         new = copy.copy(self)
-        new._settings = self._settings + (setting,)
+        new._settings = self._settings + (setting,)  # pylint: disable=protected-access
         return new
 
 
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index 9da75a34e..5e6103ccc 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -82,6 +82,7 @@ class WebEnginePrinting(browsertab.AbstractPrinting):
     _widget: webview.WebEngineView
 
     def connect_signals(self):
+        """Called from WebEngineTab.connect_signals."""
         page = self._widget.page()
         page.pdfPrintingFinished.connect(self.pdf_printing_finished)
         try:
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py
index 9ca5d2edc..2bc3cad02 100644
--- a/qutebrowser/browser/webkit/network/networkmanager.py
+++ b/qutebrowser/browser/webkit/network/networkmanager.py
@@ -103,8 +103,8 @@ def _is_secure_cipher(cipher):
 
 def init():
     """Disable insecure SSL ciphers on old Qt versions."""
-    sslconfig = QSslConfiguration.defaultConfiguration()
-    default_ciphers = sslconfig.ciphers()
+    ssl_config = QSslConfiguration.defaultConfiguration()
+    default_ciphers = ssl_config.ciphers()
     log.init.vdebug(  # type: ignore[attr-defined]
         "Default Qt ciphers: {}".format(
             ', '.join(c.name() for c in default_ciphers)))
@@ -120,7 +120,7 @@ def init():
     if bad_ciphers:
         log.init.debug("Disabling bad ciphers: {}".format(
             ', '.join(c.name() for c in bad_ciphers)))
-        sslconfig.setCiphers(good_ciphers)
+        ssl_config.setCiphers(good_ciphers)
 
 
 _SavedErrorsType = MutableMapping[
diff --git a/qutebrowser/config/configfiles.py b/qutebrowser/config/configfiles.py
index d800f3330..acf2b8bb1 100644
--- a/qutebrowser/config/configfiles.py
+++ b/qutebrowser/config/configfiles.py
@@ -121,7 +121,8 @@ class StateConfig(configparser.ConfigParser):
         Note that it's too early to use objects.backend here...
         """
         try:
-            import qutebrowser.qt.webenginewidgets  # pylint: disable=unused-import
+            # pylint: disable=unused-import,redefined-outer-name
+            import qutebrowser.qt.webenginewidgets
         except ImportError:
             return False
         return True
diff --git a/qutebrowser/config/qtargs.py b/qutebrowser/config/qtargs.py
index d1a7de71f..6584daecd 100644
--- a/qutebrowser/config/qtargs.py
+++ b/qutebrowser/config/qtargs.py
@@ -283,7 +283,7 @@ def _qtwebengine_args(
     if disabled_features:
         yield _DISABLE_FEATURES + ','.join(disabled_features)
 
-    yield from _qtwebengine_settings_args(versions)
+    yield from _qtwebengine_settings_args()
 
 
 _WEBENGINE_SETTINGS: Dict[str, Dict[Any, Optional[str]]] = {
@@ -331,7 +331,7 @@ _WEBENGINE_SETTINGS: Dict[str, Dict[Any, Optional[str]]] = {
 }
 
 
-def _qtwebengine_settings_args(versions: version.WebEngineVersions) -> Iterator[str]:
+def _qtwebengine_settings_args() -> Iterator[str]:
     for setting, args in sorted(_WEBENGINE_SETTINGS.items()):
         arg = args[config.instance.get(setting)]
         if arg is not None:
diff --git a/qutebrowser/keyinput/basekeyparser.py b/qutebrowser/keyinput/basekeyparser.py
index 467192975..78f9b8653 100644
--- a/qutebrowser/keyinput/basekeyparser.py
+++ b/qutebrowser/keyinput/basekeyparser.py
@@ -286,9 +286,9 @@ class BaseKeyParser(QObject):
         """
         try:
             info = keyutils.KeyInfo.from_event(e)
-        except keyutils.InvalidKeyError as e:
+        except keyutils.InvalidKeyError as ex:
             # See https://github.com/qutebrowser/qutebrowser/issues/7047
-            log.keyboard.debug(f"Got invalid key: {e}")
+            log.keyboard.debug(f"Got invalid key: {ex}")
             self.clear_keystring()
             return QKeySequence.SequenceMatch.NoMatch
 
diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py
index e6d6ce08d..cbfabc026 100644
--- a/qutebrowser/keyinput/keyutils.py
+++ b/qutebrowser/keyinput/keyutils.py
@@ -53,8 +53,6 @@ class InvalidKeyError(Exception):
     Should be fixed in PyQt 6.3.1 (or 6.4.0?).
     """
 
-    pass
-
 
 # Map Qt::Key values to their Qt::KeyboardModifier value.
 _MODIFIER_MAP = {
@@ -396,8 +394,8 @@ class KeyInfo:
         """
         try:
             key = Qt.Key(e.key())
-        except ValueError as e:
-            raise InvalidKeyError(str(e))
+        except ValueError as ex:
+            raise InvalidKeyError(str(ex))
         key = _remap_unicode(key, e.text())
         modifiers = e.modifiers()
         return cls(key, modifiers)
diff --git a/qutebrowser/utils/qtutils.py b/qutebrowser/utils/qtutils.py
index a4d6779e1..0bd9c94e8 100644
--- a/qutebrowser/utils/qtutils.py
+++ b/qutebrowser/utils/qtutils.py
@@ -580,6 +580,7 @@ class LibraryPath(enum.Enum):
 
 
 def library_path(which: LibraryPath) -> pathlib.Path:
+    """Wrapper around QLibraryInfo.path / .location."""
     if hasattr(QLibraryInfo, "path"):
         # Qt 6
         val = getattr(QLibraryInfo.LibraryPath, which.value)
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index b447b7a84..c1e61583a 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -515,6 +515,7 @@ class AbstractCertificateErrorWrapper:
         raise NotImplementedError
 
     def certificate_was_accepted(self) -> None:
+        """Check whether the certificate was accepted by the user."""
         if not self.is_overridable():
             return False
         if self._certificate_accepted is None:
diff --git a/scripts/mkvenv.py b/scripts/mkvenv.py
index e078da49c..05658505d 100755
--- a/scripts/mkvenv.py
+++ b/scripts/mkvenv.py
@@ -494,7 +494,7 @@ def run(args) -> None:
             args.pyqt_type not in ['binary', 'source', 'link']):
         raise Error('The --pyqt-version option is only available when installing PyQt '
                     'from binary, source, or linking it')
-    elif args.pyqt_type == 'link' and args.pyqt_version not in ['auto', '5', '6']:
+    if args.pyqt_type == 'link' and args.pyqt_version not in ['auto', '5', '6']:
         raise Error('Invalid --pyqt-version {args.pyqt_version}, only 5 or 6 '
                     'permitted with --pyqt-type=link')
 
diff --git a/tests/unit/browser/webengine/test_webenginesettings.py b/tests/unit/browser/webengine/test_webenginesettings.py
index ba9458db1..838ddd1b2 100644
--- a/tests/unit/browser/webengine/test_webenginesettings.py
+++ b/tests/unit/browser/webengine/test_webenginesettings.py
@@ -169,4 +169,4 @@ def test_parsed_user_agent(qapp):
 
 def test_profile_setter_settings(private_profile, configdata_init):
     for setting in private_profile.setter._name_to_method:
-        assert setting in configdata.DATA.keys()
+        assert setting in set(configdata.DATA)