[Python-checkins] cpython (merge 3.3 -> default): merge for issue #19963

[brett.cannon]

http://hg.python.org/cpython/rev/33938321d46f
changeset:   87941:33938321d46f
parent:      87939:a757bdfce6b3
parent:      87940:a44be62026fc
user:        Brett Cannon <brett at python.org>
date:        Fri Dec 13 13:58:47 2013 -0500
summary:
  merge for issue #19963

files:
  Doc/library/importlib.rst |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -82,10 +82,13 @@
     derived from :func:`importlib.__import__`, including requiring the package
     from which an import is occurring to have been previously imported
     (i.e., *package* must already be imported). The most important difference
-    is that :func:`import_module` returns the most nested package or module
-    that was imported (e.g. ``pkg.mod``), while :func:`__import__` returns the
+    is that :func:`import_module` returns the specified package or module
+    (e.g. ``pkg.mod``), while :func:`__import__` returns the
     top-level package or module (e.g. ``pkg``).
 
+    .. versionchanged:: 3.3
+       Parent packages are automatically imported.
+
 .. function:: find_loader(name, path=None)
 
    Find the loader for a module, optionally within the specified *path*. If the

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