]> granicus.if.org Git - python/commitdiff
Merged revisions 77956-77957 via svnmerge from
authorBrett Cannon <bcannon@gmail.com>
Wed, 3 Feb 2010 22:16:11 +0000 (22:16 +0000)
committerBrett Cannon <bcannon@gmail.com>
Wed, 3 Feb 2010 22:16:11 +0000 (22:16 +0000)
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.
........

Lib/test/support.py

index 8115020da0796b6e27d773aeebf805b94ec5a746..130891458c17c8b812f8f9935b8a21a50cbb95ce 100644 (file)
@@ -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):