diff options
author | Georg Brandl <georg@python.org> | 2009-08-13 12:13:42 (GMT) |
---|---|---|
committer | Georg Brandl <georg@python.org> | 2009-08-13 12:13:42 (GMT) |
commit | a85ee5cfb612e5933c9ef2eb0b24a103acc14ef7 (patch) | |
tree | edd715ba36b5f0fb7aabd3c587d7e0e5dcf28854 /Doc/c-api | |
parent | ac73c5feae2ab253be495cf446fe536435bc7293 (diff) | |
download | cpython-a85ee5cfb612e5933c9ef2eb0b24a103acc14ef7.zip cpython-a85ee5cfb612e5933c9ef2eb0b24a103acc14ef7.tar.gz cpython-a85ee5cfb612e5933c9ef2eb0b24a103acc14ef7.tar.bz2 |
Recorded merge of revisions 74057 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
(Only selected revisions.)
................
r74057 | alexandre.vassalotti | 2009-07-17 12:42:05 +0200 (Fr, 17 Jul 2009) | 54 lines
Merged revisions 73930-73932,73937-73939,73945,73951,73954,73962-73963,73970 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73930 | amaury.forgeotdarc | 2009-07-10 12:47:42 -0400 (Fri, 10 Jul 2009) | 2 lines
#6447: typo in subprocess docstring
........
r73937 | georg.brandl | 2009-07-11 06:12:36 -0400 (Sat, 11 Jul 2009) | 1 line
Fix style.
........
r73938 | georg.brandl | 2009-07-11 06:14:54 -0400 (Sat, 11 Jul 2009) | 1 line
#6446: fix import_spam() function to use correct error and reference handling.
........
r73939 | georg.brandl | 2009-07-11 06:18:10 -0400 (Sat, 11 Jul 2009) | 1 line
#6448: clarify docs for find_module().
........
r73945 | georg.brandl | 2009-07-11 06:51:31 -0400 (Sat, 11 Jul 2009) | 1 line
#6456: clarify the meaning of constants used as arguments to nl_langinfo().
........
r73951 | georg.brandl | 2009-07-11 10:23:38 -0400 (Sat, 11 Jul 2009) | 2 lines
array.array is actually a class.
................
Diffstat (limited to 'Doc/c-api')
-rw-r--r-- | Doc/c-api/import.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst index 2e3f71f..ff79112 100644 --- a/Doc/c-api/import.rst +++ b/Doc/c-api/import.rst @@ -25,6 +25,8 @@ Importing Modules imported module, or *NULL* with an exception set on failure. A failing import of a module doesn't leave the module in :data:`sys.modules`. + This function always uses absolute imports. + .. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name) @@ -75,6 +77,8 @@ Importing Modules current globals. This means that the import is done using whatever import hooks are installed in the current environment. + This function always uses absolute imports. + .. cfunction:: PyObject* PyImport_ReloadModule(PyObject *m) |