Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Dec 19, 2024
1 parent b070632 commit 8797b3b
Showing 1 changed file with 40 additions and 13 deletions.
53 changes: 40 additions & 13 deletions astroid/interpreter/_import/spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ def find_module(
None, otherwise.
"""

def contribute_to_path(self, spec: ModuleSpec, processed: list[str]) -> Sequence[str] | None:
def contribute_to_path(
self, spec: ModuleSpec, processed: list[str]
) -> Sequence[str] | None:
"""Get a list of extra paths where this finder can search."""


Expand Down Expand Up @@ -145,7 +147,9 @@ def find_module(
# If the module is a stdlib module, check whether this is a frozen module. Note that
# `find_spec` actually imports the module, so we want to make sure we only run this code
# for stuff that can be expected to be frozen. For now this is only stdlib.
if modname in sys.stdlib_module_names or (processed and processed[0] in sys.stdlib_module_names):
if modname in sys.stdlib_module_names or (
processed and processed[0] in sys.stdlib_module_names
):
spec = importlib.util.find_spec(".".join((*processed, modname)))
if (
spec
Expand Down Expand Up @@ -206,7 +210,9 @@ def find_module(
return ModuleSpec(name=modname, location=file_path, type=type_)
return None

def contribute_to_path(self, spec: ModuleSpec, processed: list[str]) -> Sequence[str] | None:
def contribute_to_path(
self, spec: ModuleSpec, processed: list[str]
) -> Sequence[str] | None:
if spec.location is None:
# Builtin.
return None
Expand All @@ -215,10 +221,13 @@ def contribute_to_path(self, spec: ModuleSpec, processed: list[str]) -> Sequence
# extend_path is called, search sys.path for module/packages
# of this name see pkgutil.extend_path documentation
path = [
os.path.join(p, *processed) for p in sys.path if os.path.isdir(os.path.join(p, *processed))
os.path.join(p, *processed)
for p in sys.path
if os.path.isdir(os.path.join(p, *processed))
]
elif spec.name == "distutils" and not any(
spec.location.lower().startswith(ext_lib_dir.lower()) for ext_lib_dir in EXT_LIB_DIRS
spec.location.lower().startswith(ext_lib_dir.lower())
for ext_lib_dir in EXT_LIB_DIRS
):
# virtualenv below 20.0 patches distutils in an unexpected way
# so we just find the location of distutils that will be
Expand All @@ -228,7 +237,9 @@ def contribute_to_path(self, spec: ModuleSpec, processed: list[str]) -> Sequence
# and can be triggered manually from GitHub Actions
distutils_spec = importlib.util.find_spec("distutils")
if distutils_spec and distutils_spec.origin:
origin_path = Path(distutils_spec.origin) # e.g. .../distutils/__init__.py
origin_path = Path(
distutils_spec.origin
) # e.g. .../distutils/__init__.py
path = [str(origin_path.parent)] # e.g. .../distutils
else:
path = [spec.location]
Expand Down Expand Up @@ -259,7 +270,9 @@ def find_module(
)
return None

def contribute_to_path(self, spec: ModuleSpec, processed: list[str]) -> Sequence[str] | None:
def contribute_to_path(
self, spec: ModuleSpec, processed: list[str]
) -> Sequence[str] | None:
return spec.submodule_search_locations


Expand Down Expand Up @@ -322,7 +335,9 @@ def find_module(
)
return spec

def contribute_to_path(self, spec: ModuleSpec, processed: list[str]) -> Sequence[str] | None:
def contribute_to_path(
self, spec: ModuleSpec, processed: list[str]
) -> Sequence[str] | None:
if spec.type == ModuleType.PY_NAMESPACE:
return spec.submodule_search_locations
return None
Expand All @@ -343,7 +358,9 @@ def _is_setuptools_namespace(location: pathlib.Path) -> bool:
except OSError:
return False
extend_path = b"pkgutil" in data and b"extend_path" in data
declare_namespace = b"pkg_resources" in data and b"declare_namespace(__name__)" in data
declare_namespace = (
b"pkg_resources" in data and b"declare_namespace(__name__)" in data
)
return extend_path or declare_namespace


Expand All @@ -365,10 +382,16 @@ def _search_zip(
if PY310_PLUS:
if not importer.find_spec(os.path.sep.join(modpath)):
raise ImportError(
"No module named %s in %s/%s" % (".".join(modpath[1:]), filepath, modpath)
"No module named {} in {}/{}".format(
".".join(modpath[1:]), filepath, modpath
)
)
elif not importer.find_module(os.path.sep.join(modpath)):
raise ImportError("No module named %s in %s/%s" % (".".join(modpath[1:]), filepath, modpath))
raise ImportError(
"No module named {} in {}/{}".format(
".".join(modpath[1:]), filepath, modpath
)
)
return (
ModuleType.PY_ZIPMODULE,
os.path.abspath(filepath) + os.path.sep + os.path.sep.join(modpath),
Expand All @@ -386,7 +409,9 @@ def _find_spec_with_path(
) -> tuple[Finder | _MetaPathFinder, ModuleSpec]:
for finder in _SPEC_FINDERS:
finder_instance = finder(search_path)
spec = finder_instance.find_module(modname, module_parts, processed, submodule_path)
spec = finder_instance.find_module(
modname, module_parts, processed, submodule_path
)
if spec is None:
continue
return finder_instance, spec
Expand Down Expand Up @@ -464,7 +489,9 @@ def _find_spec(module_path: tuple, path: tuple) -> ModuleSpec:

while modpath:
modname = modpath.pop(0)
finder, spec = _find_spec_with_path(_path, modname, module_parts, processed, submodule_path or path)
finder, spec = _find_spec_with_path(
_path, modname, module_parts, processed, submodule_path or path
)
processed.append(modname)
if modpath:
if isinstance(finder, Finder):
Expand Down

0 comments on commit 8797b3b

Please sign in to comment.