merge with 3.4

This commit is contained in:
Georg Brandl 2014-10-11 15:04:20 +02:00
commit 35aa10be6c
6 changed files with 20 additions and 7 deletions

View file

@ -239,7 +239,9 @@ Process-wide parameters
:c:func:`Py_Initialize`, then :c:func:`Py_GetPath` won't attempt to compute a
default search path but uses the one provided instead. This is useful if
Python is embedded by an application that has full knowledge of the location
of all modules. The path components should be separated by semicolons.
of all modules. The path components should be separated by the platform
dependent delimiter character, which is ``':'`` on Unix and Mac OS X, ``';'``
on Windows.
This also causes :data:`sys.executable` to be set only to the raw program
name (see :c:func:`Py_SetProgramName`) and for :data:`sys.prefix` and