diff options
| author | Georg Brandl <georg@python.org> | 2008-01-05 21:02:25 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-01-05 21:02:25 (GMT) |
| commit | 60c19d26928efeff7eeb0123290b3a4705fce53a (patch) | |
| tree | c5f36982d8c297330096671bc41791534684b5da /Doc | |
| parent | 165010834ae595294ecc5a98a70fd4f74848c193 (diff) | |
| download | cpython-60c19d26928efeff7eeb0123290b3a4705fce53a.zip cpython-60c19d26928efeff7eeb0123290b3a4705fce53a.tar.gz cpython-60c19d26928efeff7eeb0123290b3a4705fce53a.tar.bz2 | |
Repair markup.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/c-api/utilities.rst | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/Doc/c-api/utilities.rst b/Doc/c-api/utilities.rst index d9e85b0..65adf31 100644 --- a/Doc/c-api/utilities.rst +++ b/Doc/c-api/utilities.rst @@ -181,6 +181,7 @@ Importing Modules .. index:: single: package variable; __all__ single: __all__ (package variable) + single: modules (in module sys) This is a simplified interface to :cfunc:`PyImport_ImportModuleEx` below, leaving the *globals* and *locals* arguments set to *NULL* and *level* set @@ -202,19 +203,14 @@ Importing Modules .. versionchanged:: 2.6 always use absolute imports - .. index:: single: modules (in module sys) - .. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name) - .. index:: - single: `cfunc:PyImport_ImportModule` - - This version of `cfunc:PyImport_ImportModule` does not block. It's intended + This version of :cfunc:`PyImport_ImportModule` does not block. It's intended to be used in C function which import other modules to execute a function. The import may block if another thread holds the import lock. The function - `cfunc:PyImport_ImportModuleNoBlock` doesn't block. It first tries to fetch - the module from sys.modules and falls back to `cfunc:PyImport_ImportModule` + :cfunc:`PyImport_ImportModuleNoBlock` doesn't block. It first tries to fetch + the module from sys.modules and falls back to :cfunc:`PyImport_ImportModule` unless the the lock is hold. In the latter case the function raises an ImportError. @@ -239,7 +235,7 @@ Importing Modules failing imports remove incomplete module objects. .. versionchanged:: 2.6 - The function is an alias for `cfunc:PyImport_ImportModuleLevel` with + The function is an alias for :cfunc:`PyImport_ImportModuleLevel` with -1 as level, meaning relative import. @@ -254,7 +250,7 @@ Importing Modules the return value when a submodule of a package was requested is normally the top-level package, unless a non-empty *fromlist* was given. - ..versionadded:: 2.5 + .. versionadded:: 2.5 .. cfunction:: PyObject* PyImport_Import(PyObject *name) |