Fix lint

7 files changed, 24 insertions, 18 deletions

diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index 1f8a85387..ad8a43dbe 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -63,7 +63,7 @@ show it.
     Which backend to use.
 
 *--enable-webengine-inspector*::
-    Enable the web inspector / devtools for QtWebEngine. Note that this is a SECURITY RISK and you should not visit untrusted websites with the inspector turned on. See https://bugreports.qt.io/browse/QTBUG-50725 for moredetails. This is not needed anymore since Qt 5.11where the inspector is always enabled and secure.
+    Enable the web inspector / devtools for QtWebEngine. Note that this is a SECURITY RISK and you should not visit untrusted websites with the inspector turned on. See https://bugreports.qt.io/browse/QTBUG-50725 for more details. This is not needed anymore since Qt 5.11 where the inspector is always enabled and secure.
 
 === debug arguments
 *-l* '{critical,error,warning,info,debug,vdebug}', *--loglevel* '{critical,error,warning,info,debug,vdebug}'::
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 2f06a4006..1707c398d 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -29,9 +29,9 @@ from PyQt5.QtCore import pyqtSlot, Qt, QUrl, QEvent, QUrlQuery
 
 from qutebrowser.commands import userscripts, runners
 from qutebrowser.api import cmdutils
-from qutebrowser.config import config, configdata, configfiles
-from qutebrowser.browser import (urlmarks, browsertab, inspector, navigate,
-                                 webelem, downloads)
+from qutebrowser.config import config, configdata
+from qutebrowser.browser import (urlmarks, browsertab, navigate, webelem,
+                                 downloads)
 from qutebrowser.keyinput import modeman, keyutils
 from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
                                objreg, utils, standarddir, debug)
diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py
index 9b573c3f1..c1d680730 100644
--- a/qutebrowser/browser/inspector.py
+++ b/qutebrowser/browser/inspector.py
@@ -24,8 +24,8 @@ import binascii
 import typing
 import enum
 
-from PyQt5.QtWidgets import QWidget, QVBoxLayout
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QObject, QEvent
+from PyQt5.QtWidgets import QWidget
+from PyQt5.QtCore import pyqtSlot, QObject, QEvent
 from PyQt5.QtGui import QCloseEvent
 
 from qutebrowser.browser import eventfilter
@@ -33,7 +33,6 @@ from qutebrowser.config import configfiles
 from qutebrowser.utils import log, usertypes
 from qutebrowser.keyinput import modeman
 from qutebrowser.misc import miscwidgets, objects
-from qutebrowser.api import cmdutils
 
 
 def create(*, splitter: 'miscwidgets.InspectorSplitter',
@@ -220,5 +219,6 @@ class AbstractWebInspector(QWidget):
 
     @pyqtSlot()
     def shutdown(self) -> None:
+        """Clean up the inspector."""
         self.close()
         self.deleteLater()
diff --git a/qutebrowser/completion/models/miscmodels.py b/qutebrowser/completion/models/miscmodels.py
index 47551aafa..d2955f48c 100644
--- a/qutebrowser/completion/models/miscmodels.py
+++ b/qutebrowser/completion/models/miscmodels.py
@@ -22,7 +22,7 @@
 import typing
 
 from qutebrowser.config import config, configdata
-from qutebrowser.utils import objreg, log
+from qutebrowser.utils import objreg, log, utils
 from qutebrowser.completion.models import completionmodel, listcategory, util
 from qutebrowser.browser import inspector
 
@@ -50,7 +50,7 @@ def helptopic(*, info):
     return model
 
 
-def quickmark(*, info=None):  # pylint: disable=unused-argument
+def quickmark(*, info=None):
     """A CompletionModel filled with all quickmarks."""
     def delete(data: typing.Sequence[str]) -> None:
         """Delete a quickmark from the completion menu."""
@@ -59,6 +59,7 @@ def quickmark(*, info=None):  # pylint: disable=unused-argument
         log.completion.debug('Deleting quickmark {}'.format(name))
         quickmark_manager.delete(name)
 
+    utils.unused(info)
     model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
     marks = objreg.get('quickmark-manager').marks.items()
     model.add_category(listcategory.ListCategory('Quickmarks', marks,
@@ -67,7 +68,7 @@ def quickmark(*, info=None):  # pylint: disable=unused-argument
     return model
 
 
-def bookmark(*, info=None):  # pylint: disable=unused-argument
+def bookmark(*, info=None):
     """A CompletionModel filled with all bookmarks."""
     def delete(data: typing.Sequence[str]) -> None:
         """Delete a bookmark from the completion menu."""
@@ -76,6 +77,7 @@ def bookmark(*, info=None):  # pylint: disable=unused-argument
         bookmark_manager = objreg.get('bookmark-manager')
         bookmark_manager.delete(urlstr)
 
+    utils.unused(info)
     model = completionmodel.CompletionModel(column_widths=(30, 70, 0))
     marks = objreg.get('bookmark-manager').marks.items()
     model.add_category(listcategory.ListCategory('Bookmarks', marks,
@@ -84,9 +86,10 @@ def bookmark(*, info=None):  # pylint: disable=unused-argument
     return model
 
 
-def session(*, info=None):  # pylint: disable=unused-argument
+def session(*, info=None):
     """A CompletionModel filled with session names."""
     from qutebrowser.misc import sessions
+    utils.unused(info)
     model = completionmodel.CompletionModel()
     try:
         sess = ((name,) for name
@@ -152,11 +155,12 @@ def _buffer(*, win_id_filter=lambda _win_id: True, add_win_id=True):
     return model
 
 
-def buffer(*, info=None):  # pylint: disable=unused-argument
+def buffer(*, info=None):
     """A model to complete on open tabs across all windows.
 
     Used for switching the buffer command.
     """
+    utils.unused(info)
     return _buffer()
 
 
@@ -206,7 +210,9 @@ def window(*, info):
 
 def inspector_position(*, info):
     """A model for possible inspector positions."""
+    utils.unused(info)
     model = completionmodel.CompletionModel(column_widths=(100, 0, 0))
     positions = [(e.name,) for e in inspector.Position]
-    model.add_category(listcategory.ListCategory("Position (optional)", positions))
+    category = listcategory.ListCategory("Position (optional)", positions)
+    model.add_category(category)
     return model
diff --git a/qutebrowser/misc/miscwidgets.py b/qutebrowser/misc/miscwidgets.py
index 3a6d61fc7..95786e3c7 100644
--- a/qutebrowser/misc/miscwidgets.py
+++ b/qutebrowser/misc/miscwidgets.py
@@ -246,6 +246,7 @@ class WrapperLayout(QLayout):
         raise utils.Unreachable
 
     def sizeHint(self):
+        """Get the size of the underlying widget."""
         if self._widget is None:
             return QSize()
         return self._widget.sizeHint()
@@ -257,6 +258,7 @@ class WrapperLayout(QLayout):
         raise utils.Unreachable
 
     def setGeometry(self, rect):
+        """Pass through setGeometry calls to the underlying widget."""
         if self._widget is None:
             return
         self._widget.setGeometry(rect)
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index 124da3b28..bbe56c6c7 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -87,8 +87,8 @@ def get_argparser():
                         "QtWebEngine. Note that this is a SECURITY RISK and "
                         "you should not visit untrusted websites with the "
                         "inspector turned on. See "
-                        "https://bugreports.qt.io/browse/QTBUG-50725 for more"
-                        "details. This is not needed anymore since Qt 5.11"
+                        "https://bugreports.qt.io/browse/QTBUG-50725 for more "
+                        "details. This is not needed anymore since Qt 5.11 "
                         "where the inspector is always enabled and secure.")
 
     parser.add_argument('--json-args', help=argparse.SUPPRESS)
diff --git a/tests/unit/browser/test_inspector.py b/tests/unit/browser/test_inspector.py
index 587436f85..48458a0e2 100644
--- a/tests/unit/browser/test_inspector.py
+++ b/tests/unit/browser/test_inspector.py
@@ -19,12 +19,10 @@
 
 import pytest
 
-from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QWidget, QApplication
+from PyQt5.QtWidgets import QWidget
 
 from qutebrowser.browser import inspector
 from qutebrowser.misc import miscwidgets
-from qutebrowser.utils import usertypes
 
 
 class FakeInspector(inspector.AbstractWebInspector):