motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-29 05:13:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

mkvenv: replace distlib.database with importlib.metadata/pkg_resources

Browse source 
importlib.metadata is just as good as distlib.database and a bit more
battle-proven for "egg" based distributions, and in fact that is exactly
why mkvenv.py is not using distlib.database to find entry points: it
simply does not work for eggs.

The only disadvantage of importlib.metadata is that it is not available
by default before Python 3.8, so we need a fallback to pkg_resources
(again, just like for the case of finding entry points).  Do so to
fix issues where incorrect egg metadata results in a JSONDecodeError.

While at it, reuse the new _get_version function to diagnose an incorrect
version of the package even if importlib.metadata is not available.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2023-05-19 10:06:19 +02:00
parent dde001ef71
commit c673f3d0fe
2 changed files with 65 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/setup.cfg
View file

@ -115,9 +115,6 @@ ignore_missing_imports = True
[mypy-distlib]
ignore_missing_imports = True
[mypy-distlib.database]
ignore_missing_imports = True
[mypy-distlib.scripts]
ignore_missing_imports = True
@ -127,9 +124,6 @@ ignore_missing_imports = True
[mypy-pip._vendor.distlib]
ignore_missing_imports = True
[mypy-pip._vendor.distlib.database]
ignore_missing_imports = True
[mypy-pip._vendor.distlib.scripts]
ignore_missing_imports = True