diff options
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/exceptions.rst | 2 | ||||
| -rw-r--r-- | Doc/library/exceptions.rst | 13 | ||||
| -rw-r--r-- | Doc/whatsnew/3.4.rst | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst index 1bdcdd3..c0c30a0 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -686,8 +686,6 @@ the variables: +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ImportError` | :exc:`ImportError` | | +-----------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_ModuleNotFoundError` | :exc:`ModuleNotFoundError` | | -+-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_IndexError` | :exc:`IndexError` | | +-----------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_InterruptedError` | :exc:`InterruptedError` | | diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst index 933667c..ece035d 100644 --- a/Doc/library/exceptions.rst +++ b/Doc/library/exceptions.rst @@ -169,8 +169,8 @@ The following exceptions are the exceptions that are usually raised. .. exception:: ImportError - Raised when the :keyword:`import` statement has troubles trying to load a - module. + Raised when an :keyword:`import` statement fails to find the module definition + or when a ``from ... import`` fails to find a name that is to be imported. The :attr:`name` and :attr:`path` attributes can be set using keyword-only arguments to the constructor. When set they represent the name of the module @@ -180,15 +180,6 @@ The following exceptions are the exceptions that are usually raised. .. versionchanged:: 3.3 Added the :attr:`name` and :attr:`path` attributes. -.. exception:: ModuleNotFoundError - - A subclass of :exc:`ImportError` which is raised by :keyword:`import` when a - module could not be located. This includes ``from ... import`` statements as - the specific attribute being requested cannot be known a priori to be a module - or some other type of object. - - .. versionadded:: 3.4 - .. exception:: IndexError diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst index 2c47476..9073bde 100644 --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -137,9 +137,6 @@ Some smaller changes made to the core Python language are: * Unicode database updated to UCD version 6.2. -* Import now raises the new exception :exc:`ModuleNotFoundError` (subclass of - :exc:`ImportError`) when it cannot find something. - * :func:`min` and :func:`max` now accept a *default* argument that can be used to specify the value they return if the iterable they are evaluating has no elements. Contributed by Julian Berman in :issue:`18111`. |