Fix up pylint/flake8 for completion revamp.

qutebrowser/browser/history.py

@@ -20,9 +20,8 @@
 """Simple history which gets written to disk."""
 
 import time
-import collections
 
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl, QObject
+from PyQt5.QtCore import pyqtSignal, pyqtSlot, QUrl
 
 from qutebrowser.commands import cmdutils
 from qutebrowser.utils import (utils, objreg, standarddir, log, qtutils,

qutebrowser/browser/urlmarks.py

@@ -29,9 +29,8 @@ import os
 import html
 import os.path
 import functools
-import collections
 
-from PyQt5.QtCore import QUrl, QObject
+from PyQt5.QtCore import QUrl
 
 from qutebrowser.utils import (message, usertypes, qtutils, urlutils,
                                standarddir, objreg, log)

qutebrowser/completion/models/base.py

@@ -26,8 +26,6 @@ Module attributes:
 from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QStandardItemModel, QStandardItem
 
-from qutebrowser.utils import usertypes
-
 
 class CompletionModel(QStandardItemModel):
 

qutebrowser/completion/models/miscmodels.py

@@ -19,8 +19,6 @@
 
 """Functions that return miscellaneous completion models."""
 
-from PyQt5.QtCore import Qt
-
 from qutebrowser.config import config, configdata
 from qutebrowser.utils import objreg, log, qtutils
 from qutebrowser.commands import cmdutils

qutebrowser/completion/models/sortfilter.py

@@ -25,10 +25,9 @@ Contains:
 
 import re
 
-from PyQt5.QtCore import QSortFilterProxyModel, QModelIndex, Qt
+from PyQt5.QtCore import QSortFilterProxyModel, QModelIndex
 
 from qutebrowser.utils import log, qtutils, debug
-from qutebrowser.completion.models import base as completion
 
 
 class CompletionFilterModel(QSortFilterProxyModel):
@@ -48,8 +47,6 @@ class CompletionFilterModel(QSortFilterProxyModel):
         self.srcmodel = source
         self.pattern = ''
         self.pattern_re = None
-        self.lessThan = self.intelligentLessThan
-        #self._sort_order = self.srcmodel.sort_order or Qt.AscendingOrder
 
     def set_pattern(self, val):
         """Setter for pattern.
@@ -137,7 +134,7 @@ class CompletionFilterModel(QSortFilterProxyModel):
                 return True
         return False
 
-    def intelligentLessThan(self, lindex, rindex):
+    def lessThan(self, lindex, rindex):
         """Custom sorting implementation.
 
         Prefers all items which start with self.pattern. Other than that, uses

qutebrowser/completion/models/sqlmodel.py

@@ -22,9 +22,9 @@
 import re
 
 from PyQt5.QtCore import Qt, QModelIndex, QAbstractItemModel
-from PyQt5.QtSql import QSqlTableModel, QSqlDatabase, QSqlQuery
+from PyQt5.QtSql import QSqlTableModel, QSqlDatabase
 
-from qutebrowser.utils import usertypes, log
+from qutebrowser.utils import log
 
 
 class SqlCompletionModel(QAbstractItemModel):

qutebrowser/completion/models/urlmodel.py

@@ -21,6 +21,7 @@
 
 from qutebrowser.completion.models import sqlmodel
 
+
 def url():
     """A model which combines bookmarks, quickmarks and web history URLs.
 

qutebrowser/config/parsers/keyconf.py

@@ -27,7 +27,7 @@ from PyQt5.QtCore import pyqtSignal, QObject
 
 from qutebrowser.config import configdata, textwrapper
 from qutebrowser.commands import cmdutils, cmdexc
-from qutebrowser.utils import log, utils, qtutils, message
+from qutebrowser.utils import log, utils, qtutils, message, usertypes
 from qutebrowser.completion.models import miscmodels
 
 

tests/unit/browser/webkit/test_history.py

@@ -28,7 +28,6 @@ from PyQt5.QtCore import QUrl
 
 from qutebrowser.browser import history
 from qutebrowser.utils import objreg, urlutils, usertypes
-from qutebrowser.misc import sql
 
 
 @pytest.fixture(autouse=True)

tests/unit/completion/test_models.py

@@ -26,9 +26,8 @@ import pytest
 from PyQt5.QtCore import QUrl
 from PyQt5.QtWidgets import QTreeView
 
-from qutebrowser.completion.models import (miscmodels, urlmodel, configmodel,
-                                           sortfilter)
 from qutebrowser.browser import history
+from qutebrowser.completion.models import miscmodels, urlmodel, configmodel
 from qutebrowser.config import sections, value
 from qutebrowser.misc import sql
 
@@ -544,14 +543,13 @@ def test_url_completion_benchmark(benchmark, config_stub,
         for e in entries[0:1000])
 
     def bench():
-        model = urlmodel.UrlCompletionModel()
+        model = urlmodel.url()
-        filtermodel = sortfilter.CompletionFilterModel(model)
+        model.set_pattern('')
-        filtermodel.set_pattern('')
+        model.set_pattern('e')
-        filtermodel.set_pattern('e')
+        model.set_pattern('ex')
-        filtermodel.set_pattern('ex')
+        model.set_pattern('ex ')
-        filtermodel.set_pattern('ex ')
+        model.set_pattern('ex 1')
-        filtermodel.set_pattern('ex 1')
+        model.set_pattern('ex 12')
-        filtermodel.set_pattern('ex 12')
+        model.set_pattern('ex 123')
-        filtermodel.set_pattern('ex 123')
 
     benchmark(bench)

tests/unit/completion/test_sortfilter.py

@@ -21,8 +21,6 @@
 
 import pytest
 
-from PyQt5.QtCore import Qt
-
 from qutebrowser.completion.models import base, sortfilter
 
 

tests/unit/misc/test_sql.py

@@ -74,7 +74,7 @@ def test_delete(qtbot):
     assert list(table) == [('one', 1, False), ('nine', 9, False)]
     with qtbot.waitSignal(table.changed):
         table.delete(False, field='lucky')
-    assert not list(table) == [('thirteen', 13, True)]
+    assert not list(table)
 
 
 def test_len():