summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2022-09-16 14:43:49 +0200
committerFlorian Bruhin <me@the-compiler.org>2022-09-16 15:00:19 +0200
commit6ef015bfd8a485430cbc46c33914fb4f3c63aa1c (patch)
tree88793cfd065ab94d736c3a2fba8930918a904c27
parent6f9fda9b6ebe6577b0bc9003d0c3e10b997263c2 (diff)
downloadqutebrowser-6ef015bfd8a485430cbc46c33914fb4f3c63aa1c.tar.gz
qutebrowser-6ef015bfd8a485430cbc46c33914fb4f3c63aa1c.zip
mypy: Move around some comments
-rw-r--r--qutebrowser/browser/webengine/notification.py3
-rw-r--r--qutebrowser/browser/webengine/webenginedownloads.py7
-rw-r--r--qutebrowser/browser/webengine/webengineinspector.py5
-rw-r--r--qutebrowser/browser/webengine/webenginetab.py7
-rw-r--r--qutebrowser/browser/webengine/webview.py1
-rw-r--r--qutebrowser/keyinput/keyutils.py2
6 files changed, 11 insertions, 14 deletions
diff --git a/qutebrowser/browser/webengine/notification.py b/qutebrowser/browser/webengine/notification.py
index d7f797274..57f8586e3 100644
--- a/qutebrowser/browser/webengine/notification.py
+++ b/qutebrowser/browser/webengine/notification.py
@@ -689,8 +689,7 @@ def _as_uint32(x: int) -> QVariant:
if machinery.IS_QT5:
target_type = QVariant.Type.UInt
- else:
- # Qt 6
+ else: # Qt 6
target_type = QMetaType(QMetaType.Type.UInt.value)
successful = variant.convert(target_type)
diff --git a/qutebrowser/browser/webengine/webenginedownloads.py b/qutebrowser/browser/webengine/webenginedownloads.py
index ffacfe8dd..2ac3dbdc3 100644
--- a/qutebrowser/browser/webengine/webenginedownloads.py
+++ b/qutebrowser/browser/webengine/webenginedownloads.py
@@ -47,8 +47,7 @@ class DownloadItem(downloads.AbstractDownloadItem):
self._qt_item = qt_item
if machinery.IS_QT5:
qt_item.downloadProgress.connect(self.stats.on_download_progress)
- else:
- # Qt 6
+ else: # Qt 6
qt_item.receivedBytesChanged.connect(
lambda: self.stats.on_download_progress(
qt_item.receivedBytes(),
@@ -108,10 +107,10 @@ class DownloadItem(downloads.AbstractDownloadItem):
def _do_die(self):
if machinery.IS_QT5:
self._qt_item.downloadProgress.disconnect()
- else:
- # Qt 6
+ else: # Qt 6
self._qt_item.receivedBytesChanged.disconnect()
self._qt_item.totalBytesChanged.disconnect()
+
if self._qt_item.state() != QWebEngineDownloadRequest.DownloadState.DownloadInterrupted:
self._qt_item.cancel()
diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py
index dc131bd01..67158af1c 100644
--- a/qutebrowser/browser/webengine/webengineinspector.py
+++ b/qutebrowser/browser/webengine/webengineinspector.py
@@ -55,8 +55,7 @@ class WebEngineInspectorView(QWebEngineView):
view = inspected_page.view()
assert isinstance(view, QWebEngineView), view
return view.createWindow(wintype)
- else:
- # Qt 6
+ else: # Qt 6
newpage = inspected_page.createWindow(wintype)
return webview.WebEngineView.forPage(newpage)
@@ -115,8 +114,8 @@ class WebEngineInspector(inspector.AbstractWebInspector):
inspector_page = self._widget.page()
assert inspector_page.profile() == page.profile()
-
inspector_page.setInspectedPage(page)
+
assert self._settings is not None
self._settings.update_for_url(inspector_page.requestedUrl())
diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
index ef4126047..82e211cc5 100644
--- a/qutebrowser/browser/webengine/webenginetab.py
+++ b/qutebrowser/browser/webengine/webenginetab.py
@@ -87,6 +87,7 @@ class WebEnginePrinting(browsertab.AbstractPrinting):
page.pdfPrintingFinished.connect(self.pdf_printing_finished)
if machinery.IS_QT6:
self._widget.printFinished.connect(self.printing_finished)
+ # Qt 5 uses callbacks instead
def check_pdf_support(self):
pass
@@ -101,8 +102,7 @@ class WebEnginePrinting(browsertab.AbstractPrinting):
def to_printer(self, printer):
if machinery.IS_QT5:
self._widget.page().print(printer, self.printing_finished.emit)
- else:
- # Qt 6
+ else: # Qt 6
self._widget.print(printer)
@@ -1066,8 +1066,7 @@ class _WebEngineScripts(QObject):
if machinery.IS_QT6:
for script in scripts.find(f'_qute_{name}'):
scripts.remove(script)
- else:
- # Qt 5
+ else: # Qt 5
script = scripts.findScript(f'_qute_{name}')
if not script.isNull():
scripts.remove(script)
diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py
index b2468ae6a..66968a954 100644
--- a/qutebrowser/browser/webengine/webview.py
+++ b/qutebrowser/browser/webengine/webview.py
@@ -199,6 +199,7 @@ class WebEnginePage(QWebEnginePage):
self.certificateError.connect( # pylint: disable=no-member
self._handle_certificate_error
)
+ # Qt 5: Overridden method instead of signal
@config.change_filter('colors.webpage.bg')
def _set_bg_color(self):
diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py
index 7170e77dc..f6969d627 100644
--- a/qutebrowser/keyinput/keyutils.py
+++ b/qutebrowser/keyinput/keyutils.py
@@ -43,7 +43,7 @@ if machinery.IS_QT6:
# installed?
from qutebrowser.qt.core import QKeyCombination # pylint: disable=no-name-in-module
else:
- QKeyCombination = None
+ QKeyCombination = None # QKeyCombination was added in Qt 6
from qutebrowser.utils import utils, qtutils, debug