diff options
Diffstat (limited to 'qutebrowser/misc')
| -rw-r--r-- | qutebrowser/misc/earlyinit.py | 2 | ||||
| -rw-r--r-- | qutebrowser/misc/sql.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qutebrowser/misc/earlyinit.py b/qutebrowser/misc/earlyinit.py index 39db7b710..690578188 100644 --- a/qutebrowser/misc/earlyinit.py +++ b/qutebrowser/misc/earlyinit.py @@ -183,7 +183,7 @@ def check_qt_version(): try: from qutebrowser.qt.core import QVersionNumber, QLibraryInfo qt_ver = QLibraryInfo.version().normalized() - recent_qt_runtime = qt_ver >= QVersionNumber(5, 15) # type: ignore[operator] + recent_qt_runtime = qt_ver >= QVersionNumber(5, 15) except (ImportError, AttributeError): # QVersionNumber was added in Qt 5.6, QLibraryInfo.version() in 5.8 recent_qt_runtime = False diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py index d7b3dda0d..4c182e351 100644 --- a/qutebrowser/misc/sql.py +++ b/qutebrowser/misc/sql.py @@ -28,7 +28,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 @@ -323,10 +323,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: + else: # Qt 6: Returns a list values = qt_bound_values |