changeset:   99432:0259c2c555fb
parent:      99430:ad855c779bf3
parent:      99431:567baf74ebad
user:        Brett Cannon <brett@python.org>
date:        Fri Dec 04 14:52:07 2015 -0800
files:       Misc/NEWS
description:
Merge for issue #25500


diff -r ad855c779bf3 -r 0259c2c555fb Doc/reference/import.rst
--- a/Doc/reference/import.rst	Thu Dec 03 17:32:05 2015 -0800
+++ b/Doc/reference/import.rst	Fri Dec 04 14:52:07 2015 -0800
@@ -29,11 +29,10 @@
 a name binding operation.
 
 When calling :func:`__import__` as part of an import statement, the
-import system first checks the module global namespace for a function by
-that name. If it is not found, then the standard builtin :func:`__import__`
-is called. Other mechanisms for invoking the import system (such as
-:func:`importlib.import_module`) do not perform this check and will always
-use the standard import system.
+standard builtin :func:`__import__` is called. Other mechanisms for
+invoking the import system (such as :func:`importlib.import_module`) may
+choose to subvert :func:`__import__` and use its own solution to
+implement import semantics.
 
 When a module is first imported, Python searches for the module and if found,
 it creates a module object [#fnmo]_, initializing it.  If the named module