Mercurial > hg
changeset 44819:a6e12d477595 stable
demandimport: fix compatibility with meta path finders w/o find_spec() method
Meta path finders got a find_spec() method in Python version 3.4. The
sys.meta_path documentation says that the deprecated find_module() method is
used as a fallback.
Setuptool’s VendorImporter still doesn’t have the find_spec() method,
which resulted in a crash e.g. within a virtual environment. For reference, I
opened an issue for that: https://github.com/pypa/setuptools/issues/2104.
An alternative implementation would have been to implement a wrapper for
find_module() itself and raise an AttributeError when accessing find_spec() if
the wrapped finder doesn’t have it.
| author | Manuel Jacob <me@manueljacob.de> |
|---|---|
| date | Tue, 12 May 2020 01:03:12 +0200 |
| parents | 9d7d53771e5f |
| children | f71c8eea7161 |
| files | hgdemandimport/demandimportpy3.py |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgdemandimport/demandimportpy3.py Thu May 07 23:40:05 2020 +0200 +++ b/hgdemandimport/demandimportpy3.py Tue May 12 01:03:12 2020 +0200 @@ -97,9 +97,18 @@ def __setattr__(self, name, value): return setattr(object.__getattribute__(self, "_finder"), name, value) - def find_spec(self, *args, **kwargs): + def find_spec(self, fullname, path, target=None): finder = object.__getattribute__(self, "_finder") - spec = finder.find_spec(*args, **kwargs) + try: + find_spec = finder.find_spec + except AttributeError: + loader = finder.find_module(fullname, path) + if loader is None: + spec = None + else: + spec = importlib.util.spec_from_loader(fullname, loader) + else: + spec = find_spec(fullname, path, target) # Lazy loader requires exec_module(). if (