From: Brett Cannon <brett@python.org>
Date: Fri, 9 May 2014 14:37:31 +0000 (-0400)
Subject: Issue #21157: Touch up imp docs to be more explicit about importlib
X-Git-Tag: v3.5.0a1~1713^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f26702b86ee0dd12b0031e14eb648c734a20b58a;p=python

Issue #21157: Touch up imp docs to be more explicit about importlib
alternatives.
---

diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index ed4820e640..c2dbdc5cf9 100644
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -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)