Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Only read the stdlib versions dict once per run #11542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JukkaL merged 1 commit into from
Nov 13, 2021
Merged

Only read the stdlib versions dict once per run #11542

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions mypy/modulefinder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from enum import Enum, unique

from typing import Dict, Iterator, List, NamedTuple, Optional, Set, Tuple, Union
from typing_extensions import Final
from typing_extensions import Final, TypeAlias as _TypeAlias

from mypy.fscache import FileSystemCache
from mypy.options import Options
Expand All @@ -33,6 +33,9 @@
OnePackageDir = Tuple[str, bool]
PackageDirs = List[OnePackageDir]

# Minimum and maximum Python versions for modules in stdlib as (major, minor)
StdlibVersions: _TypeAlias = Dict[str, Tuple[Tuple[int, int], Optional[Tuple[int, int]]]]

PYTHON_EXTENSIONS: Final = [".pyi", ".py"]

PYTHON2_STUB_DIR: Final = "@python2"
Expand Down Expand Up @@ -126,7 +129,8 @@ class FindModuleCache:
def __init__(self,
search_paths: SearchPaths,
fscache: Optional[FileSystemCache],
options: Optional[Options]) -> None:
options: Optional[Options],
stdlib_py_versions: Optional[StdlibVersions] = None) -> None:
self.search_paths = search_paths
self.fscache = fscache or FileSystemCache()
# Cache for get_toplevel_possibilities:
Expand All @@ -139,7 +143,9 @@ def __init__(self,
custom_typeshed_dir = None
if options:
custom_typeshed_dir = options.custom_typeshed_dir
self.stdlib_py_versions = load_stdlib_py_versions(custom_typeshed_dir)
self.stdlib_py_versions = (
stdlib_py_versions or load_stdlib_py_versions(custom_typeshed_dir)
)
self.python_major_ver = 3 if options is None else options.python_version[0]

def clear(self) -> None:
Expand Down Expand Up @@ -261,7 +267,12 @@ def _can_find_module_in_parent_dir(self, id: str) -> bool:
of the current working directory.
"""
working_dir = os.getcwd()
parent_search = FindModuleCache(SearchPaths((), (), (), ()), self.fscache, self.options)
parent_search = FindModuleCache(
SearchPaths((), (), (), ()),
self.fscache,
self.options,
stdlib_py_versions=self.stdlib_py_versions
)
while any(file.endswith(("__init__.py", "__init__.pyi"))
for file in os.listdir(working_dir)):
working_dir = os.path.dirname(working_dir)
Expand Down Expand Up @@ -791,8 +802,7 @@ def compute_search_paths(sources: List[BuildSource],
typeshed_path=tuple(lib_path))


def load_stdlib_py_versions(custom_typeshed_dir: Optional[str]
) -> Dict[str, Tuple[Tuple[int, int], Optional[Tuple[int, int]]]]:
def load_stdlib_py_versions(custom_typeshed_dir: Optional[str]) -> StdlibVersions:
"""Return dict with minimum and maximum Python versions of stdlib modules.

The contents look like
Expand Down