From 3e9fd4ed7eb34f250736bdfe3ff39aded4869e69 Mon Sep 17 00:00:00 2001 From: toofar Date: Sun, 11 Sep 2022 12:49:33 +1200 Subject: mypy: defer to machinery for conditional: printing --- qutebrowser/browser/webengine/webenginetab.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 37750e343..83f6b9b75 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -40,7 +40,7 @@ from qutebrowser.browser.webengine import (webview, webengineelem, tabhistory, from qutebrowser.utils import (usertypes, qtutils, log, javascript, utils, resources, message, jinja, debug, version) -from qutebrowser.qt import sip +from qutebrowser.qt import sip, machinery from qutebrowser.misc import objects, miscwidgets @@ -85,12 +85,8 @@ class WebEnginePrinting(browsertab.AbstractPrinting): """Called from WebEngineTab.connect_signals.""" page = self._widget.page() page.pdfPrintingFinished.connect(self.pdf_printing_finished) - try: - # Qt 6 + if machinery.IS_QT6: self._widget.printFinished.connect(self.printing_finished) - except AttributeError: - # Qt 5: Uses callbacks instead - pass def check_pdf_support(self): pass @@ -103,10 +99,9 @@ class WebEnginePrinting(browsertab.AbstractPrinting): self._widget.page().printToPdf(filename) def to_printer(self, printer): - try: - # Qt 5 + if machinery.IS_QT5: self._widget.page().print(printer, self.printing_finished.emit) - except AttributeError: + else: # Qt 6 self._widget.print(printer) -- cgit v1.2.3-54-g00ecf