mirror of
https://github.com/python/cpython.git
synced 2025-07-15 23:35:23 +00:00
Issue #15767: Introduce ModuleNotFoundError, a subclass of
ImportError. The exception is raised by import when a module could not be found. Technically this is defined as no viable loader could be found for the specified module. This includes ``from ... import`` statements so that the module usage is consistent for all situations where import couldn't find what was requested. This should allow for the common idiom of:: try: import something except ImportError: pass to be updated to using ModuleNotFoundError and not accidentally mask ImportError messages that should propagate (e.g. issues with a loader). This work was driven by the fact that the ``from ... import`` statement needed to be able to tell the difference between an ImportError that simply couldn't find a module (and thus silence the exception so that ceval can raise it) and an ImportError that represented an actual problem.
This commit is contained in:
parent
638ce0779b
commit
b1611e2772
17 changed files with 424 additions and 408 deletions
|
@ -1553,11 +1553,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 ModuleNotFoundError(_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)
|
||||
|
@ -1643,15 +1639,12 @@ def _handle_fromlist(module, fromlist, import_):
|
|||
from_name = '{}.{}'.format(module.__name__, x)
|
||||
try:
|
||||
_call_with_frames_removed(import_, from_name)
|
||||
except ImportError as exc:
|
||||
except ModuleNotFoundError as exc:
|
||||
# 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 exc.name == from_name:
|
||||
continue
|
||||
if exc.name == from_name:
|
||||
continue
|
||||
raise
|
||||
return module
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue