mirror
/
qutebrowser
mirror of https://github.com/qutebrowser/qutebrowser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qt6: let importlib import PyQt6.sip 

Currently, ":version" fails to show the sip version for Qt6. This is
because the sip module can't imported in the same way as Qt5. In Qt5,
the sip module can be imported after "from PyQt5.QtCore import *". In Qt
6, this is no longer the case,

    >>> from PyQt6.QtCore import *
    >>> import sip
    Traceback (most recent call last):
      File "<stdin>", line 1, in <module>
    ModuleNotFoundError: No module named 'sip'

So let importlib import PyQt6.sip explicitly.
This commit is contained in:
Coiby Xu 2023-07-29 08:18:06 +08:00
parent 6d84462d68
commit 34dcedf512
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qutebrowser/utils/version.py
View File

@ -381,7 +381,6 @@ class ModuleInfo:
def _create_module_info() -> Dict[str, ModuleInfo]:
packages = [
('sip', ['SIP_VERSION_STR']),
('colorama', ['VERSION', '__version__']),
('jinja2', ['__version__']),
('pygments', ['__version__']),
@ -392,12 +391,16 @@ def _create_module_info() -> Dict[str, ModuleInfo]:
if machinery.IS_QT5:
packages += [
('sip', ['SIP_VERSION_STR']),
('PyQt5.QtWebEngineWidgets', []),
('PyQt5.QtWebEngine', ['PYQT_WEBENGINE_VERSION_STR']),
('PyQt5.QtWebKitWidgets', []),
]
elif machinery.IS_QT6:
packages.append(('PyQt6.QtWebEngineCore', ['PYQT_WEBENGINE_VERSION_STR']))
packages += [
('PyQt6.QtWebEngineCore', ['PYQT_WEBENGINE_VERSION_STR']),
('PyQt6.sip', ['SIP_VERSION_STR']),
]
else:
raise utils.Unreachable()

8
tests/unit/utils/test_version.py
View File

@ -644,8 +644,8 @@ class TestModuleVersions:
assert version._module_versions() == expected
@pytest.mark.parametrize('module, idx, expected', [
('colorama', 1, 'colorama: no'),
('adblock', 5, 'adblock: no'),
('colorama', 0, 'colorama: no'),
('adblock', 4, 'adblock: no'),
])
def test_missing_module(self, module, idx, expected, import_fake):
"""Test with a module missing.
@ -693,7 +693,7 @@ class TestModuleVersions:
assert not mod_info.is_usable()
expected = f"adblock: {fake_version} (< {mod_info.min_version}, outdated)"
assert version._module_versions()[5] == expected
assert version._module_versions()[4] == expected
@pytest.mark.parametrize('attribute, expected_modules', [
('VERSION', ['colorama']),
@ -720,7 +720,7 @@ class TestModuleVersions:
expected = []
for name in import_fake.modules:
mod_info = version.MODULE_INFO[name]
if name in expected_modules:
if name in expected_modules or ("sip" in expected_modules and name == "PyQt6.sip"):
assert mod_info.get_version() == "1.2.3"
expected.append('{}: 1.2.3'.format(name))
else: