From 1fe18134319e59763bfad93f8e43f8568cf87f3e Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Sat, 10 Jun 2017 07:53:52 -0400 Subject: [PATCH] Fix pylint errors. --- qutebrowser/app.py | 2 +- qutebrowser/completion/models/listcategory.py | 2 +- qutebrowser/completion/models/sqlcategory.py | 1 - qutebrowser/misc/sql.py | 4 ++-- tests/end2end/features/test_history_bdd.py | 2 -- tests/unit/browser/webkit/test_history.py | 3 +-- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/qutebrowser/app.py b/qutebrowser/app.py index 8f7984f2d..a8fd7ad54 100644 --- a/qutebrowser/app.py +++ b/qutebrowser/app.py @@ -57,7 +57,7 @@ from qutebrowser.misc import (readline, ipc, savemanager, sessions, crashsignal, earlyinit, objects, sql) from qutebrowser.misc import utilcmds # pylint: disable=unused-import from qutebrowser.utils import (log, version, message, utils, qtutils, urlutils, - objreg, usertypes, standarddir, error, debug) + objreg, usertypes, standarddir, error) # We import utilcmds to run the cmdutils.register decorators. diff --git a/qutebrowser/completion/models/listcategory.py b/qutebrowser/completion/models/listcategory.py index b22d795be..acdc5cafc 100644 --- a/qutebrowser/completion/models/listcategory.py +++ b/qutebrowser/completion/models/listcategory.py @@ -28,7 +28,7 @@ import re from PyQt5.QtCore import QSortFilterProxyModel from PyQt5.QtGui import QStandardItem, QStandardItemModel -from qutebrowser.utils import qtutils, debug, log +from qutebrowser.utils import qtutils class ListCategory(QSortFilterProxyModel): diff --git a/qutebrowser/completion/models/sqlcategory.py b/qutebrowser/completion/models/sqlcategory.py index 7e0ecf2c5..9e88b52da 100644 --- a/qutebrowser/completion/models/sqlcategory.py +++ b/qutebrowser/completion/models/sqlcategory.py @@ -64,7 +64,6 @@ class SqlCategory(QSqlQueryModel): querystr += ' order by {} {}'.format(sort_by, sort_order) self._query = sql.Query(querystr, forward_only=False) - self._param_count = len(filter_fields) # map filter_fields to indices col_query = sql.Query('SELECT * FROM {} LIMIT 1'.format(name)) diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py index 5c3e94c1e..27b4d4268 100644 --- a/qutebrowser/misc/sql.py +++ b/qutebrowser/misc/sql.py @@ -194,7 +194,7 @@ class SqlTable(QObject): values: A list of values to insert. replace: If set, replace existing values. """ - paramstr = ','.join(':{}'.format(key) for key in values.keys()) + paramstr = ','.join(':{}'.format(key) for key in values) q = Query("INSERT INTO {} values({})".format(self._name, paramstr)) q.run(**values) self.changed.emit() @@ -206,7 +206,7 @@ class SqlTable(QObject): values: A list of values to insert. replace: If set, replace existing values. """ - paramstr = ','.join(':{}'.format(key) for key in values.keys()) + paramstr = ','.join(':{}'.format(key) for key in values) q = Query("REPLACE INTO {} values({})".format(self._name, paramstr)) q.run(**values) self.changed.emit() diff --git a/tests/end2end/features/test_history_bdd.py b/tests/end2end/features/test_history_bdd.py index ce9faeca9..c1000d6ce 100644 --- a/tests/end2end/features/test_history_bdd.py +++ b/tests/end2end/features/test_history_bdd.py @@ -18,9 +18,7 @@ # along with qutebrowser. If not, see . import logging -import os.path import re -import tempfile import pytest_bdd as bdd diff --git a/tests/unit/browser/webkit/test_history.py b/tests/unit/browser/webkit/test_history.py index d87f30b38..04081e7c7 100644 --- a/tests/unit/browser/webkit/test_history.py +++ b/tests/unit/browser/webkit/test_history.py @@ -158,8 +158,7 @@ def hist_interface(hist): from qutebrowser.browser.webkit import webkithistory QWebHistoryInterface = QtWebKit.QWebHistoryInterface # pylint: enable=invalid-name - entry = history.Entry(atime=0, url=QUrl('http://www.example.com/'), - title='example') + hist.add_url(url=QUrl('http://www.example.com/'), title='example') interface = webkithistory.WebHistoryInterface(hist) QWebHistoryInterface.setDefaultInterface(interface) yield