From 55e3aca702f3d7eb12c8ee06c8c7d58440fc2be2 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Tue, 22 Apr 2014 17:53:27 +0200
Subject: [PATCH] linting cleanup

---
 .flake8                           | 3 ++-
 .pylintrc                         | 2 +-
 qutebrowser/browser/hints.py      | 3 +--
 qutebrowser/commands/keys.py      | 3 +--
 qutebrowser/config/style.py       | 6 ++----
 qutebrowser/models/completion.py  | 3 +--
 qutebrowser/network/qutescheme.py | 7 +++----
 qutebrowser/widgets/statusbar.py  | 7 +++----
 qutebrowser/widgets/tabwidget.py  | 3 +--
 9 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/.flake8 b/.flake8
index 3da4e9c6b..1d399f9bf 100644
--- a/.flake8
+++ b/.flake8
@@ -3,6 +3,7 @@
 # E265: Block comment should start with '#'
 # F401: Unused import (checked by pylint)
 # E501: Line too long (checked by pylint)
-ignore=E241,E265,F401,E501
+# E821: undefined name (checked by pylint)
+ignore=E241,E265,F401,E501,E821
 max_complexity = 10
 exclude = appdirs.py
diff --git a/.pylintrc b/.pylintrc
index 9449dbbe7..3e4e2f053 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -35,7 +35,7 @@ ignore-long-lines=<?https?://
 min-similarity-lines=6
 
 [VARIABLES]
-dummy-variables-rgx=_$
+dummy-variables-rgx=_.*
 
 [CLASSES]
 defining-attr-methods=__init__,__new__,setUp
diff --git a/qutebrowser/browser/hints.py b/qutebrowser/browser/hints.py
index 084dacc93..5279d3a38 100644
--- a/qutebrowser/browser/hints.py
+++ b/qutebrowser/browser/hints.py
@@ -450,9 +450,8 @@ class HintManager(QObject):
         if self._target != 'rapid':
             self.stop()
 
-    # pylint: disable=unused-argument
     @pyqtSlot('QSize')
-    def on_contents_size_changed(self, size):
+    def on_contents_size_changed(self, _size):
         """Reposition hints if contents size changed."""
         for elems in self._elems.values():
             rect = elems.elem.geometry()
diff --git a/qutebrowser/commands/keys.py b/qutebrowser/commands/keys.py
index fcac4253d..83727e6bd 100644
--- a/qutebrowser/commands/keys.py
+++ b/qutebrowser/commands/keys.py
@@ -96,9 +96,8 @@ class CommandKeyParser(KeyParser):
         """Handle a completed keychain."""
         self._run_or_fill(cmdstr, count, ignore_exc=False)
 
-    # pylint: disable=unused-argument
     @pyqtSlot(str, str)
-    def on_config_changed(self, section, option):
+    def on_config_changed(self, section, _option):
         """Re-read the config if a keybinding was changed."""
         if section == 'keybind':
             self.read_config()
diff --git a/qutebrowser/config/style.py b/qutebrowser/config/style.py
index d9b667738..ee22216b2 100644
--- a/qutebrowser/config/style.py
+++ b/qutebrowser/config/style.py
@@ -62,15 +62,13 @@ def set_register_stylesheet(obj):
     config.instance.changed.connect(partial(_update_stylesheet, obj))
 
 
-def _update_stylesheet(obj, section, option):
+def _update_stylesheet(obj, _section, _option):
     """Update the stylesheet for obj."""
-    # pylint: disable=unused-argument
     obj.setStyleSheet(get_stylesheet(obj.STYLESHEET))
 
 
-def invalidate_caches(section, option):
+def invalidate_caches(section, _option):
     """Invalidate cached dicts."""
-    # pylint: disable=unused-argument
     global _colordict, _fontdict
     if section == 'colors':
         _colordict = None
diff --git a/qutebrowser/models/completion.py b/qutebrowser/models/completion.py
index 02af29b2b..4f95351ac 100644
--- a/qutebrowser/models/completion.py
+++ b/qutebrowser/models/completion.py
@@ -148,7 +148,7 @@ class CompletionModel(QAbstractItemModel):
         node.children.pop(position)
         self.endRemoveRows()
 
-    def columnCount(self, parent=QModelIndex()):
+    def columnCount(self, _parent=QModelIndex()):
         """Return the column count in the model.
 
         Override QAbstractItemModel::columnCount.
@@ -160,7 +160,6 @@ class CompletionModel(QAbstractItemModel):
         Return:
             Column count as an integer.
         """
-        # pylint: disable=unused-argument
         return self._root.column_count()
 
     def rowCount(self, parent=QModelIndex()):
diff --git a/qutebrowser/network/qutescheme.py b/qutebrowser/network/qutescheme.py
index c555b5576..15448772f 100644
--- a/qutebrowser/network/qutescheme.py
+++ b/qutebrowser/network/qutescheme.py
@@ -76,18 +76,17 @@ class QuteSchemeHandler(SchemeHandler):
         """
         return url.replace('http://', '').replace('qute:', 'qute_')
 
-    def createRequest(self, op, request, outgoing_data):
+    def createRequest(self, _op, request, _outgoing_data):
         """Create a new request.
 
         Args:
-             op: Operation op
              request: const QNetworkRequest & req
-             outgoing_data: QIODevice * outgoingData
+             _op: Operation op
+             _outgoing_data: QIODevice * outgoingData
 
         Return:
             A QNetworkReply.
         """
-        # pylint: disable=unused-argument
         logging.debug('request: {}'.format(request))
         url = urlstring(request.url())
         try:
diff --git a/qutebrowser/widgets/statusbar.py b/qutebrowser/widgets/statusbar.py
index b4ccbb688..dbb9bb45d 100644
--- a/qutebrowser/widgets/statusbar.py
+++ b/qutebrowser/widgets/statusbar.py
@@ -658,9 +658,8 @@ class _Url(TextBase):
         self.setText(urlstring(s))
         self.urltype = 'normal'
 
-    # pylint: disable=unused-argument
     @pyqtSlot(str, str, str)
-    def set_hover_url(self, link, title, text):
+    def set_hover_url(self, link, _title, _text):
         """Setter to be used as a Qt slot.
 
         Saves old shown URL in self._old_url and restores it later if a link is
@@ -668,8 +667,8 @@ class _Url(TextBase):
 
         Args:
             link: The link which was hovered (string)
-            title: The title of the hovered link (string)
-            text: The text of the hovered link (string)
+            _title: The title of the hovered link (string)
+            _text: The text of the hovered link (string)
         """
         if link:
             if self._old_url is None:
diff --git a/qutebrowser/widgets/tabwidget.py b/qutebrowser/widgets/tabwidget.py
index afb9187b4..f19c0c6c7 100644
--- a/qutebrowser/widgets/tabwidget.py
+++ b/qutebrowser/widgets/tabwidget.py
@@ -97,9 +97,8 @@ class TabWidget(QTabWidget):
         except KeyError:
             pass
 
-    # pylint: disable=unused-argument
     @pyqtSlot(str, str)
-    def on_config_changed(self, section, option):
+    def on_config_changed(self, section, _option):
         """Update attributes when config changed."""
         if section == 'tabbar':
             self._init_config()