diff options
| author | Florian Bruhin <me@the-compiler.org> | 2024-04-30 21:49:25 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2024-04-30 23:31:58 +0200 |
| commit | 9320c8f2e5610750ac8f35823f3338fe47824d41 (patch) | |
| tree | b9a161a095b157cdc9ba9e578ee403a5e40379dc | |
| parent | dfcfc686ce761500d0949f5bfb6ca1ad42834a41 (diff) | |
| download | qutebrowser-9320c8f2e5610750ac8f35823f3338fe47824d41.tar.gz qutebrowser-9320c8f2e5610750ac8f35823f3338fe47824d41.zip | |
Fix tests/lint
| -rw-r--r-- | qutebrowser/browser/webengine/darkmode.py | 4 | ||||
| -rw-r--r-- | qutebrowser/browser/webengine/webenginesettings.py | 26 | ||||
| -rw-r--r-- | tests/unit/browser/webengine/test_darkmode.py | 5 |
3 files changed, 19 insertions, 16 deletions
diff --git a/qutebrowser/browser/webengine/darkmode.py b/qutebrowser/browser/webengine/darkmode.py index aa2ffb338..52bf0f24d 100644 --- a/qutebrowser/browser/webengine/darkmode.py +++ b/qutebrowser/browser/webengine/darkmode.py @@ -284,8 +284,8 @@ class _Definition: def copy_remove_setting(self, name: str) -> '_Definition': """Get a new _Definition object with a setting removed.""" new = copy.copy(self) - settings = tuple(s for s in self._settings if s.option != name) - new._settings = settings # pylint: disable=protected-access + filtered_settings = tuple(s for s in self._settings if s.option != name) + new._settings = filtered_settings # pylint: disable=protected-access return new def copy_replace_setting(self, option: str, chromium_key: str) -> '_Definition': diff --git a/qutebrowser/browser/webengine/webenginesettings.py b/qutebrowser/browser/webengine/webenginesettings.py index 436b80d29..fd0d8c8de 100644 --- a/qutebrowser/browser/webengine/webenginesettings.py +++ b/qutebrowser/browser/webengine/webenginesettings.py @@ -148,18 +148,20 @@ class WebEngineSettings(websettings.AbstractSettings): Attr(QWebEngineSettings.WebAttribute.AutoLoadIconsForPage, converter=lambda val: val != 'never'), } - try: - _ATTRIBUTES['content.canvas_reading'] = Attr( - QWebEngineSettings.WebAttribute.ReadingFromCanvasEnabled) - except AttributeError: - # Added in QtWebEngine 6.6 - pass - try: - _ATTRIBUTES['colors.webpage.darkmode.enabled'] = Attr( - QWebEngineSettings.WebAttribute.ForceDarkMode) - except AttributeError: - # Added in QtWebEngine 6.7 - pass + + if machinery.IS_QT6: + try: + _ATTRIBUTES['content.canvas_reading'] = Attr( + QWebEngineSettings.WebAttribute.ReadingFromCanvasEnabled) + except AttributeError: + # Added in QtWebEngine 6.6 + pass + try: + _ATTRIBUTES['colors.webpage.darkmode.enabled'] = Attr( + QWebEngineSettings.WebAttribute.ForceDarkMode) + except AttributeError: + # Added in QtWebEngine 6.7 + pass _FONT_SIZES = { 'fonts.web.size.minimum': diff --git a/tests/unit/browser/webengine/test_darkmode.py b/tests/unit/browser/webengine/test_darkmode.py index bda05feb8..d9f9e3b24 100644 --- a/tests/unit/browser/webengine/test_darkmode.py +++ b/tests/unit/browser/webengine/test_darkmode.py @@ -257,8 +257,9 @@ def test_options(configdata_init): if not name.startswith('colors.webpage.darkmode.'): continue - assert not opt.supports_pattern, name - assert opt.restart, name + if name != 'colors.webpage.darkmode.enabled': + assert not opt.supports_pattern, name + assert opt.restart, name if opt.backends: # On older Qt versions, this is an empty list. |