From 5be5b6bb41684cd7620f7168cfe212d0bf6328db Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 11 Sep 2022 12:02:14 +1200 Subject: mypy: defer to machinery for conditional: QDownloadItem --- qutebrowser/browser/webengine/webenginedownloads.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py index 363feeb57..ffacfe8dd 100644 --- a/qutebrowser/browser/webengine/webenginedownloads.py +++ b/qutebrowser/browser/webengine/webenginedownloads.py @@ -23,6 +23,7 @@ import re import os.path import functools +from qutebrowser.qt import machinery from qutebrowser.qt.core import pyqtSlot, Qt, QUrl, QObject from qutebrowser.qt.webenginecore import QWebEngineDownloadRequest @@ -44,10 +45,9 @@ class DownloadItem(downloads.AbstractDownloadItem): parent: QObject = None) -> None: super().__init__(manager=manager, parent=manager) self._qt_item = qt_item - try: - # Qt 5 + if machinery.IS_QT5: qt_item.downloadProgress.connect(self.stats.on_download_progress) - except AttributeError: + else: # Qt 6 qt_item.receivedBytesChanged.connect( lambda: self.stats.on_download_progress( @@ -106,10 +106,9 @@ class DownloadItem(downloads.AbstractDownloadItem): "{}".format(state_name)) def _do_die(self): - try: - # Qt 5 + if machinery.IS_QT5: self._qt_item.downloadProgress.disconnect() - except AttributeError: + else: # Qt 6 self._qt_item.receivedBytesChanged.disconnect() self._qt_item.totalBytesChanged.disconnect() -- cgit v1.2.3-54-g00ecf