From 2f3d0161f3b4c2aabbf3f970f8ec25fbac7f7b4d Mon Sep 17 00:00:00 2001 From: toofar Date: Mon, 26 Feb 2024 19:22:27 +1300 Subject: Update lint etc for dependencies The lint ones are: linters (pylint): qutebrowser/completion/completionwidget.py#L440 Consider using 'height = min(height, contents_height)' instead of unnecessary if block linters (pylint): qutebrowser/browser/webengine/webview.py#L241 Useless suppression of 'no-member' The no-member one might be due to this change: https://github.com/pylint-dev/pylint/issues/9246 For the importlib-resources one, I'm not sure why it's changed to be underscore instead of a dash now. But at least it's consistent across all the requirements files now! I feel like I've seem this in a previous dependancy update too (for a different package?) but I can't find that now. --- misc/requirements/requirements-qutebrowser.txt-raw | 4 ++-- qutebrowser/browser/webengine/webview.py | 4 +--- qutebrowser/completion/completionwidget.py | 3 +-- scripts/dev/changelog_urls.json | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/misc/requirements/requirements-qutebrowser.txt-raw b/misc/requirements/requirements-qutebrowser.txt-raw index bd33e26e4..ca4081d1d 100644 --- a/misc/requirements/requirements-qutebrowser.txt-raw +++ b/misc/requirements/requirements-qutebrowser.txt-raw @@ -13,11 +13,11 @@ PyYAML #@ add: pyobjc-framework-Cocoa ; sys_platform=="darwin" ## stdlib backports -importlib-resources +importlib_resources ## Optional dependencies Pygments # For :view-source --pygments or on QtWebKit colorama # Colored log output on Windows adblock # Improved adblocking -#@ markers: importlib-resources python_version=="3.8.*" +#@ markers: importlib_resources python_version=="3.8.*" diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index a6f2ae113..96c0c97e5 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -238,9 +238,7 @@ class WebEnginePage(QWebEnginePage): self._set_bg_color() config.instance.changed.connect(self._set_bg_color) if machinery.IS_QT6: - self.certificateError.connect( # pylint: disable=no-member - self._handle_certificate_error - ) + self.certificateError.connect(self._handle_certificate_error) # Qt 5: Overridden method instead of signal @config.change_filter('colors.webpage.bg') diff --git a/qutebrowser/completion/completionwidget.py b/qutebrowser/completion/completionwidget.py index f042be0a1..0f5dc0de9 100644 --- a/qutebrowser/completion/completionwidget.py +++ b/qutebrowser/completion/completionwidget.py @@ -437,8 +437,7 @@ class CompletionView(QTreeView): contents_height = ( self.viewportSizeHint().height() + bar.sizeHint().height()) - if contents_height <= height: - height = contents_height + height = min(height, contents_height) # The width isn't really relevant as we're expanding anyways. return QSize(-1, height) diff --git a/scripts/dev/changelog_urls.json b/scripts/dev/changelog_urls.json index a2f0b7612..e3644f417 100644 --- a/scripts/dev/changelog_urls.json +++ b/scripts/dev/changelog_urls.json @@ -133,7 +133,7 @@ "mypy-extensions": "https://github.com/python/mypy_extensions/commits/master", "pyroma": "https://github.com/regebro/pyroma/blob/master/CHANGES.txt", "adblock": "https://github.com/ArniDagur/python-adblock/blob/master/CHANGELOG.md", - "importlib-resources": "https://importlib-resources.readthedocs.io/en/latest/history.html", + "importlib_resources": "https://importlib-resources.readthedocs.io/en/latest/history.html", "importlib-metadata": "https://github.com/python/importlib_metadata/blob/main/NEWS.rst", "zipp": "https://github.com/jaraco/zipp/blob/main/NEWS.rst", "pip": "https://pip.pypa.io/en/stable/news/", -- cgit v1.2.3-54-g00ecf