From: Brett Cannon <bcannon@gmail.com>
Date: Wed, 3 Feb 2010 22:16:11 +0000 (+0000)
Subject: Merged revisions 77956-77957 via svnmerge from
X-Git-Tag: v3.2a1~1749
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ddb5e70e025074320ab9db26f5109e626c3291be;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 77956-77957 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77956 | brett.cannon | 2010-02-03 14:11:54 -0800 (Wed, 03 Feb 2010) | 1 line

  Update a docstring to suggest using importlib.import_module instead of calling __import__ directly.
........
  r77957 | brett.cannon | 2010-02-03 14:13:44 -0800 (Wed, 03 Feb 2010) | 1 line

  Fix a typo in a docstring introduced in r77956.
........
---

diff --git a/Lib/test/support.py b/Lib/test/support.py
index 8115020da079..130891458c17 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -477,7 +477,7 @@ class CleanImport(object):
     Use like this:
 
         with CleanImport("foo"):
-            __import__("foo") # new reference
+            importlib.import_module("foo") # new reference
     """
 
     def __init__(self, *module_names):