# HG changeset patch # User Ludovic Chabant # Date 2019-04-19 14:25:18 # Node ID 7ed472e7909694fda972064be9f870b7072dfb78 # Parent bed4c308fc56e29181602c5c004483d5a878ed26 py3: handle meta-path finders that only use pre-python3.4 API diff --git a/mercurial/__init__.py b/mercurial/__init__.py --- a/mercurial/__init__.py +++ b/mercurial/__init__.py @@ -54,7 +54,16 @@ if sys.version_info[0] >= 3: if finder == self: continue - spec = finder.find_spec(fullname, path, target=target) + # Originally the API was a `find_module` method, but it was + # renamed to `find_spec` in python 3.4, with a new `target` + # argument. + find_spec_method = getattr(finder, 'find_spec', None) + if find_spec_method: + spec = find_spec_method(fullname, path, target=target) + else: + spec = finder.find_module(fullname) + if spec is not None: + spec = importlib.util.spec_from_loader(fullname, spec) if spec: break