Merge for issue #21157

This commit is contained in:
Brett Cannon 2014-05-09 10:37:55 -04:00
commit f25f25796b
1 changed files with 8 additions and 4 deletions

View File

@ -79,7 +79,9 @@ This module provides an interface to the mechanisms used to implement the
When *P* itself has a dotted name, apply this recipe recursively.
.. deprecated:: 3.3
Use :func:`importlib.find_loader` instead.
Use :func:`importlib.util.find_spec` instead unless Python 3.3
compatibility is required, in which case use
:func:`importlib.find_loader`.
.. function:: load_module(name, file, pathname, description)
@ -104,9 +106,11 @@ This module provides an interface to the mechanisms used to implement the
.. deprecated:: 3.3
If previously used in conjunction with :func:`imp.find_module` then
call ``load_module()`` on the returned loader. If you wish to load a
module from a specific file, then use one of the file-based loaders found
in :mod:`importlib.machinery`.
consider using :func:`importlib.import_module`, otherwise use the loader
returned by the replacement you chose for :func:`imp.find_module`. If you
called :func:`imp.load_module` and related functions directly then use the
classes in :mod:`importlib.machinery`, e.g.
``importlib.machinery.SourceFileLoader(name, path).load_module()``.
.. function:: new_module(name)