mirror of
https://github.com/python/cpython.git
synced 2025-07-16 07:45:20 +00:00
Issue #18364: Stop using the ImportError._not_found hack.
The private attribute was leaking out of importlib and led to at least one person noticing it. Switch to another hack which won't leak outside of importlib and is nearly as robust.
This commit is contained in:
parent
e0a39de647
commit
0075110ab2
2 changed files with 3554 additions and 3559 deletions
|
@ -1536,7 +1536,8 @@ def _sanity_check(name, package, level):
|
|||
raise ValueError("Empty module name")
|
||||
|
||||
|
||||
_ERR_MSG = 'No module named {!r}'
|
||||
_ERR_MSG_PREFIX = 'No module named '
|
||||
_ERR_MSG = _ERR_MSG_PREFIX + '{!r}'
|
||||
|
||||
def _find_and_load_unlocked(name, import_):
|
||||
path = None
|
||||
|
@ -1556,11 +1557,7 @@ def _find_and_load_unlocked(name, import_):
|
|||
raise ImportError(msg, name=name)
|
||||
loader = _find_module(name, path)
|
||||
if loader is None:
|
||||
exc = ImportError(_ERR_MSG.format(name), name=name)
|
||||
# TODO(brett): switch to a proper ModuleNotFound exception in Python
|
||||
# 3.4.
|
||||
exc._not_found = True
|
||||
raise exc
|
||||
raise ImportError(_ERR_MSG.format(name), name=name)
|
||||
elif name not in sys.modules:
|
||||
# The parent import may have already imported this module.
|
||||
loader.load_module(name)
|
||||
|
@ -1650,9 +1647,7 @@ def _handle_fromlist(module, fromlist, import_):
|
|||
# Backwards-compatibility dictates we ignore failed
|
||||
# imports triggered by fromlist for modules that don't
|
||||
# exist.
|
||||
# TODO(brett): In Python 3.4, have import raise
|
||||
# ModuleNotFound and catch that.
|
||||
if getattr(exc, '_not_found', False):
|
||||
if str(exc).startswith(_ERR_MSG_PREFIX):
|
||||
if exc.name == from_name:
|
||||
continue
|
||||
raise
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue