[Python-checkins] cpython (merge 3.4 -> default): Merge for issue #21157

[brett.cannon]

http://hg.python.org/cpython/rev/418780d59502
changeset:   90599:418780d59502
parent:      90597:9ef99fafaadd
parent:      90598:9809a791436d
user:        Brett Cannon <brett at python.org>
date:        Fri May 09 10:37:55 2014 -0400
summary:
  Merge for issue #21157

files:
  Doc/library/imp.rst |  12 ++++++++----
  1 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -79,7 +79,9 @@
    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 @@
 
    .. 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)

-- 
Repository URL: http://hg.python.org/cpython