VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 14:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1937 from PeterJCLaw/update-importlib-usage

Browse Source 
Modernise importlib usage
This commit is contained in:
Dave Halter
2023-05-27 22:54:45 +00:00
committed by GitHub
parent d67facc922 c137eb6918
commit d421b920fa
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/inference/compiled/subprocess/__main__.py
View File

@@ -21,11 +21,11 @@ class _ExactImporter(MetaPathFinder):
def __init__(self, path_dct): def __init__(self, path_dct):
self._path_dct = path_dct self._path_dct = path_dct
def find_module(self, fullname, path=None): def find_spec(self, fullname, path=None, target=None):
if path is None and fullname in self._path_dct: if path is None and fullname in self._path_dct:
p = self._path_dct[fullname] p = self._path_dct[fullname]
loader = PathFinder.find_module(fullname, path=[p]) spec = PathFinder.find_spec(fullname, path=[p], target=target)
return loader return spec
return None return None

16
jedi/inference/compiled/subprocess/functions.py
View File

@@ -2,7 +2,6 @@ import sys
import os import os
import inspect import inspect
import importlib import importlib
import warnings
from pathlib import Path from pathlib import Path
from zipfile import ZipFile from zipfile import ZipFile
from zipimport import zipimporter, ZipImportError from zipimport import zipimporter, ZipImportError
@@ -167,17 +166,16 @@ def _find_module(string, path=None, full_name=None, is_global_search=True):
def _find_module_py33(string, path=None, loader=None, full_name=None, is_global_search=True): def _find_module_py33(string, path=None, loader=None, full_name=None, is_global_search=True):
loader = loader or importlib.machinery.PathFinder.find_module(string, path) if not loader:
spec = importlib.machinery.PathFinder.find_spec(string, path)
if spec is not None:
loader = spec.loader
if loader is None and path is None: # Fallback to find builtins if loader is None and path is None: # Fallback to find builtins
try: try:
with warnings.catch_warnings(record=True): spec = importlib.util.find_spec(string)
# Mute "DeprecationWarning: Use importlib.util.find_spec() if spec is not None:
# instead." While we should replace that in the future, it's loader = spec.loader
# probably good to wait until we deprecate Python 3.3, since
# it was added in Python 3.4 and find_loader hasn't been
# removed in 3.6.
loader = importlib.find_loader(string)
except ValueError as e: except ValueError as e:
# See #491. Importlib might raise a ValueError, to avoid this, we # See #491. Importlib might raise a ValueError, to avoid this, we
# just raise an ImportError to fix the issue. # just raise an ImportError to fix the issue.