From: Ezio Melotti Date: Tue, 20 Apr 2010 10:43:38 +0000 (+0000) Subject: Merged revisions 80082 via svnmerge from X-Git-Tag: v2.6.6rc1~429 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39ef68359a968ac2708debfa57072323ac73f62b;p=python Merged revisions 80082 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80082 | georg.brandl | 2010-04-15 00:36:49 +0300 (Thu, 15 Apr 2010) | 1 line #8370: fix module name in backported doc addition. ........ --- diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst index b7646629d1..0171e2409d 100644 --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1439,8 +1439,8 @@ available. They are listed here in alphabetical order. programming. This function is invoked by the :keyword:`import` statement. It can be - replaced (by importing the :mod:`builtins` module and assigning to - ``builtins.__import__``) in order to change semantics of the + replaced (by importing the :mod:`__builtin__` module and assigning to + ``__builtin__.__import__``) in order to change semantics of the :keyword:`import` statement, but nowadays it is usually simpler to use import hooks (see :pep:`302`). Direct use of :func:`__import__` is rare, except in cases where you want to import a module whose name is only known at runtime.