diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2009-07-17 10:42:05 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2009-07-17 10:42:05 (GMT) |
| commit | 711ed4aedfb6b94da650c165636a676dcc22869d (patch) | |
| tree | 9c82ff4f7c33b6bb8ddb4a61343c7e8c24968cb2 /Doc/c-api | |
| parent | ea3714e6890654167ab4f420ee4cf09cf545ad06 (diff) | |
| download | cpython-711ed4aedfb6b94da650c165636a676dcc22869d.zip cpython-711ed4aedfb6b94da650c165636a676dcc22869d.tar.gz cpython-711ed4aedfb6b94da650c165636a676dcc22869d.tar.bz2 | |
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
........
r73931 | ezio.melotti | 2009-07-10 16:25:56 -0400 (Fri, 10 Jul 2009) | 1 line
more cleanups and if zlib -> skipUnless(zlib)
........
r73932 | kristjan.jonsson | 2009-07-11 04:44:43 -0400 (Sat, 11 Jul 2009) | 3 lines
http://bugs.python.org/issue6460
Need to be careful with thread switching when testing the xmlrpc server. The server thread may not have updated stats when the client thread tests them.
........
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.
........
r73954 | tarek.ziade | 2009-07-11 13:21:00 -0400 (Sat, 11 Jul 2009) | 1 line
reverted changes for #6459 (doesn't apply on 2.x)
........
r73962 | benjamin.peterson | 2009-07-11 18:15:13 -0400 (Sat, 11 Jul 2009) | 1 line
put downloaded test support files in Lib/test/data instead of the cwd
........
r73963 | benjamin.peterson | 2009-07-11 18:25:24 -0400 (Sat, 11 Jul 2009) | 1 line
ignore things in Lib/test/data/
........
r73970 | hirokazu.yamamoto | 2009-07-11 22:04:47 -0400 (Sat, 11 Jul 2009) | 1 line
Fixed distutils test.
........
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 ac4cde5..2bf4079 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) |