merge with 3.2

This commit is contained in:
Sandro Tosi 2012-01-07 18:34:24 +01:00
commit ac8f78a1a9

View file

@ -29,7 +29,7 @@ Initializing and finalizing the interpreter
Initialize the Python interpreter. In an application embedding Python, this Initialize the Python interpreter. In an application embedding Python, this
should be called before using any other Python/C API functions; with the should be called before using any other Python/C API functions; with the
exception of :c:func:`Py_SetProgramName` and :c:func:`Py_SetPath`. This initializes exception of :c:func:`Py_SetProgramName`, :c:func:`Py_SetPythonHome` and :c:func:`Py_SetPath`. This initializes
the table of loaded modules (``sys.modules``), and creates the fundamental the table of loaded modules (``sys.modules``), and creates the fundamental
modules :mod:`builtins`, :mod:`__main__` and :mod:`sys`. It also initializes modules :mod:`builtins`, :mod:`__main__` and :mod:`sys`. It also initializes
the module search path (``sys.path``). It does not set ``sys.argv``; use the module search path (``sys.path``). It does not set ``sys.argv``; use