Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Repair markup.

This commit is contained in:
Georg Brandl 2008-01-05 21:02:25 +00:00
parent 165010834a
commit 60c19d2692
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Doc/c-api/utilities.rst
View File

@ -181,6 +181,7 @@ Importing Modules
.. index:: .. index::
single: package variable; __all__ single: package variable; __all__
single: __all__ (package variable) single: __all__ (package variable)
single: modules (in module sys)
This is a simplified interface to :cfunc:`PyImport_ImportModuleEx` below, This is a simplified interface to :cfunc:`PyImport_ImportModuleEx` below,
leaving the *globals* and *locals* arguments set to *NULL* and *level* set leaving the *globals* and *locals* arguments set to *NULL* and *level* set
@ -202,19 +203,14 @@ Importing Modules
.. versionchanged:: 2.6 .. versionchanged:: 2.6
always use absolute imports always use absolute imports
.. index:: single: modules (in module sys)
.. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name) .. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name)
.. index:: This version of :cfunc:`PyImport_ImportModule` does not block. It's intended
single: `cfunc:PyImport_ImportModule`
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. 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 The import may block if another thread holds the import lock. The function
`cfunc:PyImport_ImportModuleNoBlock` doesn't block. It first tries to fetch :cfunc:`PyImport_ImportModuleNoBlock` doesn't block. It first tries to fetch
the module from sys.modules and falls back to `cfunc:PyImport_ImportModule` 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 unless the the lock is hold. In the latter case the function raises an
ImportError. ImportError.
@ -239,7 +235,7 @@ Importing Modules
failing imports remove incomplete module objects. failing imports remove incomplete module objects.
.. versionchanged:: 2.6 .. 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. -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 the return value when a submodule of a package was requested is normally the
top-level package, unless a non-empty *fromlist* was given. top-level package, unless a non-empty *fromlist* was given.
..versionadded:: 2.5 .. versionadded:: 2.5
.. cfunction:: PyObject* PyImport_Import(PyObject *name) .. cfunction:: PyObject* PyImport_Import(PyObject *name)