Skip to content

Redirect to _importlib_modulespec in python 3 only #3235

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
merged 1 commit into from
Apr 24, 2017
Merged

Redirect to _importlib_modulespec in python 3 only #3235

Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion mypy/fixup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,9 @@ def lookup_qualified(modules: Dict[str, MypyFile], name: str,

def lookup_qualified_stnode(modules: Dict[str, MypyFile], name: str,
quick_and_dirty: bool) -> Optional[SymbolTableNode]:
name = rev_module_rename_map.get(name, name)
if '_importlib_modulespec' in modules:
# we are using python 3, so renaming is necessary
name = rev_module_rename_map.get(name, name)
head = name
rest = []
while True:
Expand Down
5 changes: 5 additions & 0 deletions mypy/semanal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,18 @@
'typing.typevar': 'typing.TypeVar',
}

# Used for python 3 only
# Rename objects placed in _importlib_modulespec due to circular imports
# Safe in python 2 because no one will ask for these keys
module_rename_map = {
'_importlib_modulespec.ModuleType': 'types.ModuleType',
'_importlib_modulespec.ModuleSpec': 'importlib.machinery.ModuleSpec',
'_importlib_modulespec.Loader': 'importlib.abc.Loader'
}

# Must not be used in python 2 (it will replace correct names with incorrect)
# The check for version is currently made at the point of use
# TODO: consider moving these maps from global scope to somewhere where python version is known
rev_module_rename_map = {v: k for (k, v) in module_rename_map.items()}

# Hard coded type promotions (shared between all Python versions).
Expand Down