diff options
| author | Florian Bruhin <me@the-compiler.org> | 2024-04-30 17:33:12 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2024-04-30 23:31:25 +0200 |
| commit | 40f6193cc735e069386a50c2e8efcbcdd1da5961 (patch) | |
| tree | 2b9183c222766778d8e8002f2ba640ea52bf2332 | |
| parent | 5152296f7f9d3a656e5b1fac5b5af648863c6224 (diff) | |
| download | qutebrowser-40f6193cc735e069386a50c2e8efcbcdd1da5961.tar.gz qutebrowser-40f6193cc735e069386a50c2e8efcbcdd1da5961.zip | |
Split QtWebEngine version across multiple lines
More readable now that we have more information in it.
Also always show the source, now that we have the space for it, and "UA" isn't
the obvious default anymore anyways.
| -rw-r--r-- | qutebrowser/utils/version.py | 11 | ||||
| -rw-r--r-- | tests/unit/utils/test_version.py | 25 |
2 files changed, 24 insertions, 12 deletions
diff --git a/qutebrowser/utils/version.py b/qutebrowser/utils/version.py index 32d5357db..30585eb0c 100644 --- a/qutebrowser/utils/version.py +++ b/qutebrowser/utils/version.py @@ -636,14 +636,13 @@ class WebEngineVersions: self.chromium_major = int(self.chromium.split('.')[0]) def __str__(self) -> str: - s = f'QtWebEngine {self.webengine}' + lines = [f'QtWebEngine {self.webengine}'] if self.chromium is not None: - s += f', based on Chromium {self.chromium}' + lines.append(f' based on Chromium {self.chromium}') if self.chromium_security is not None: - s += f', with security patches up to {self.chromium_security} (plus any distribution patches)' - if self.source != 'UA': - s += f' (from {self.source})' - return s + lines.append(f' with security patches up to {self.chromium_security} (plus any distribution patches)') + lines.append(f' (source: {self.source})') + return "\n".join(lines) @classmethod def from_ua(cls, ua: 'websettings.UserAgent') -> 'WebEngineVersions': diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py index f24bf2a7a..09e885b45 100644 --- a/tests/unit/utils/test_version.py +++ b/tests/unit/utils/test_version.py @@ -899,21 +899,32 @@ class TestWebEngineVersions: webengine=utils.VersionNumber(5, 15, 2), chromium=None, source='UA'), - "QtWebEngine 5.15.2", + ( + "QtWebEngine 5.15.2\n" + " (source: UA)" + ), ), ( version.WebEngineVersions( webengine=utils.VersionNumber(5, 15, 2), chromium='87.0.4280.144', source='UA'), - "QtWebEngine 5.15.2, based on Chromium 87.0.4280.144", + ( + "QtWebEngine 5.15.2\n" + " based on Chromium 87.0.4280.144\n" + " (source: UA)" + ), ), ( version.WebEngineVersions( webengine=utils.VersionNumber(5, 15, 2), chromium='87.0.4280.144', source='faked'), - "QtWebEngine 5.15.2, based on Chromium 87.0.4280.144 (from faked)", + ( + "QtWebEngine 5.15.2\n" + " based on Chromium 87.0.4280.144\n" + " (source: faked)" + ), ), ( version.WebEngineVersions( @@ -922,8 +933,10 @@ class TestWebEngineVersions: chromium_security='9000.1', source='faked'), ( - "QtWebEngine 5.15.2, based on Chromium 87.0.4280.144, with security " - "patches up to 9000.1 (plus any distribution patches) (from faked)" + "QtWebEngine 5.15.2\n" + " based on Chromium 87.0.4280.144\n" + " with security patches up to 9000.1 (plus any distribution patches)\n" + " (source: faked)" ), ), ]) @@ -1319,7 +1332,7 @@ def test_version_info(params, stubs, monkeypatch, config_stub): else: monkeypatch.delattr(version, 'qtutils.qWebKitVersion', raising=False) patches['objects.backend'] = usertypes.Backend.QtWebEngine - substitutions['backend'] = 'QtWebEngine 1.2.3 (from faked)' + substitutions['backend'] = 'QtWebEngine 1.2.3\n (source: faked)' if params.known_distribution: patches['distribution'] = lambda: version.DistributionInfo( |