From 5dce6fa49415e083d19ef7fa63a725a54cc19ed3 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Tue, 21 Mar 2017 20:42:32 -0400
Subject: [PATCH] Fix pylint/flake8 errors

---
 qutebrowser/completion/models/completionmodel.py | 2 --
 qutebrowser/completion/models/listcategory.py    | 3 ++-
 tests/unit/completion/test_completionmodel.py    | 2 --
 tests/unit/completion/test_completionwidget.py   | 6 +++---
 tests/unit/completion/test_models.py             | 1 -
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/qutebrowser/completion/models/completionmodel.py b/qutebrowser/completion/models/completionmodel.py
index 84dd74b8f..0ee81fdf5 100644
--- a/qutebrowser/completion/models/completionmodel.py
+++ b/qutebrowser/completion/models/completionmodel.py
@@ -19,8 +19,6 @@
 
 """A model that proxies access to one or more completion categories."""
 
-import re
-
 from PyQt5.QtCore import Qt, QModelIndex, QAbstractItemModel
 
 from qutebrowser.utils import log, qtutils
diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py
index 6251a7cac..d24fd74d0 100644
--- a/qutebrowser/completion/models/listcategory.py
+++ b/qutebrowser/completion/models/listcategory.py
@@ -25,7 +25,7 @@ Module attributes:
 
 import re
 
-from PyQt5.QtCore import Qt, QSortFilterProxyModel, QModelIndex
+from PyQt5.QtCore import QSortFilterProxyModel
 from PyQt5.QtGui import QStandardItem, QStandardItemModel
 
 from qutebrowser.utils import qtutils, debug, log
@@ -41,6 +41,7 @@ class ListCategory(QSortFilterProxyModel):
         self.srcmodel = QStandardItemModel(parent=self)
         self.pattern = ''
         self.pattern_re = None
+        self.columns_to_filter = None
         for item in items:
             self.srcmodel.appendRow([QStandardItem(x) for x in item])
         self.setSourceModel(self.srcmodel)
diff --git a/tests/unit/completion/test_completionmodel.py b/tests/unit/completion/test_completionmodel.py
index 7a61c0b84..05af902a3 100644
--- a/tests/unit/completion/test_completionmodel.py
+++ b/tests/unit/completion/test_completionmodel.py
@@ -19,8 +19,6 @@
 
 """Tests for CompletionModel."""
 
-import sys
-import pytest
 import hypothesis
 from unittest import mock
 from hypothesis import strategies
diff --git a/tests/unit/completion/test_completionwidget.py b/tests/unit/completion/test_completionwidget.py
index 43722af42..7985bfa5b 100644
--- a/tests/unit/completion/test_completionwidget.py
+++ b/tests/unit/completion/test_completionwidget.py
@@ -22,7 +22,7 @@
 from unittest import mock
 
 import pytest
-from PyQt5.QtGui import QStandardItem, QColor
+from PyQt5.QtGui import QColor
 
 from qutebrowser.completion import completionwidget
 from qutebrowser.completion.models import completionmodel, listcategory
@@ -74,10 +74,10 @@ def test_set_model(completionview):
     """Ensure set_model actually sets the model and expands all categories."""
     model = completionmodel.CompletionModel()
     for i in range(3):
-        cat = listcategory.ListCategory('', [('foo',)])
+        model.add_category(listcategory.ListCategory('', [('foo',)]))
     completionview.set_model(model)
     assert completionview.model() is model
-    for i in range(model.rowCount()):
+    for i in range(3):
         assert completionview.isExpanded(model.index(i, 0))
 
 
diff --git a/tests/unit/completion/test_models.py b/tests/unit/completion/test_models.py
index 48b3646bf..fa228847e 100644
--- a/tests/unit/completion/test_models.py
+++ b/tests/unit/completion/test_models.py
@@ -30,7 +30,6 @@ from qutebrowser.browser import history
 from qutebrowser.completion.models import miscmodels, urlmodel, configmodel
 from qutebrowser.config import sections, value
 from qutebrowser.misc import sql
-from qutebrowser.utils import objreg
 
 
 def _check_completions(model, expected):