summaryrefslogtreecommitdiffstats
path: root/Doc/c-api/import.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
committerGeorg Brandl <georg@python.org>2009-07-26 14:54:51 (GMT)
commit22b3431426349a424e3486c279db8b84cf671da0 (patch)
treedb3aa6b6addb5e07c53de6ff2a5e8250d472bb58 /Doc/c-api/import.rst
parent7a72b3ad7b02612254c7e256b8a67ce7ccf7994a (diff)
downloadcpython-22b3431426349a424e3486c279db8b84cf671da0.zip
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.gz
cpython-22b3431426349a424e3486c279db8b84cf671da0.tar.bz2
Merged revisions 74209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r74209 | georg.brandl | 2009-07-26 16:37:28 +0200 (So, 26 Jul 2009) | 1 line builtin -> built-in. ........
Diffstat (limited to 'Doc/c-api/import.rst')
-rw-r--r--Doc/c-api/import.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
index 2bf4079..ff79112 100644
--- a/Doc/c-api/import.rst
+++ b/Doc/c-api/import.rst
@@ -141,7 +141,7 @@ Importing Modules
*path*, possibly by fetching it from the :data:`sys.path_importer_cache`
dict. If it wasn't yet cached, traverse :data:`sys.path_hooks` until a hook
is found that can handle the path item. Return ``None`` if no hook could;
- this tells our caller it should fall back to the builtin import mechanism.
+ this tells our caller it should fall back to the built-in import mechanism.
Cache the result in :data:`sys.path_importer_cache`. Return a new reference
to the importer object.