From 9e1dfacef73279d6a950d4b0c474367c275d3f42 Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 11 Sep 2022 11:06:47 +1200 Subject: 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 --- qutebrowser/misc/sql.py | 8 ++++---- 1 file 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 -- cgit v1.2.3-54-g00ecf