summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoofar <toofar@spalge.com>2022-09-11 11:06:47 +1200
committertoofar <toofar@spalge.com>2022-09-11 17:22:50 +1200
commit9e1dfacef73279d6a950d4b0c474367c275d3f42 (patch)
tree1481f3cd2ca0e3cb892bb5efe232dd0712d28b2c
parent42d3cca794703ed600757976ea63cfdf66cf1f07 (diff)
downloadqutebrowser-9e1dfacef73279d6a950d4b0c474367c275d3f42.tar.gz
qutebrowser-9e1dfacef73279d6a950d4b0c474367c275d3f42.zip
mypy: defer to machinery for conditional: QtSql bound values
Also turn the qt5 value into a list instead of a dict_values, for the sake of mypy
-rw-r--r--qutebrowser/misc/sql.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index 78692fa6c..28a97fd77 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -29,7 +29,7 @@ from typing import Any, Dict, Iterator, List, Mapping, MutableSequence, Optional
from qutebrowser.qt.core import QObject, pyqtSignal
from qutebrowser.qt.sql import QSqlDatabase, QSqlError, QSqlQuery
-from qutebrowser.qt import sip
+from qutebrowser.qt import sip, machinery
from qutebrowser.utils import debug, log
@@ -352,10 +352,10 @@ class Query:
def _validate_bound_values(self):
"""Make sure all placeholders are bound."""
qt_bound_values = self.query.boundValues()
- try:
+ if machinery.IS_QT5:
# Qt 5: Returns a dict
- values = qt_bound_values.values()
- except AttributeError:
+ values = list(qt_bound_values.values())
+ else:
# Qt 6: Returns a list
values = qt_bound_values