summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-06-27 21:48:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-06-27 21:48:35 (GMT)
commit2ebf8ce488b64fb4a205e6b94de309d56cf387d2 (patch)
treeb81882b10bf126161c328e0ac2f68f1228351106 /Doc
parent3e5cd1d04e8a39130752a1e888707a68a2943274 (diff)
downloadcpython-2ebf8ce488b64fb4a205e6b94de309d56cf387d2.zip
cpython-2ebf8ce488b64fb4a205e6b94de309d56cf387d2.tar.gz
cpython-2ebf8ce488b64fb4a205e6b94de309d56cf387d2.tar.bz2
Merged revisions 81881-81882 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r81881 | andrew.kuchling | 2010-06-10 19:16:08 -0500 (Thu, 10 Jun 2010) | 1 line #5753: update demo.c to use PySys_SetArgvEx(), and add a comment ........ r81882 | andrew.kuchling | 2010-06-10 19:23:01 -0500 (Thu, 10 Jun 2010) | 1 line #5753: Suggest PySys_SetArgvEx() instead of PySys_SetArgv() ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/intro.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/c-api/intro.rst b/Doc/c-api/intro.rst
index 4b67912..249610b 100644
--- a/Doc/c-api/intro.rst
+++ b/Doc/c-api/intro.rst
@@ -519,12 +519,12 @@ the table of loaded modules, and creates the fundamental modules
:mod:`builtins`, :mod:`__main__`, :mod:`sys`, and :mod:`exceptions`. It also
initializes the module search path (``sys.path``).
-.. index:: single: PySys_SetArgv()
+.. index:: single: PySys_SetArgvEx()
:cfunc:`Py_Initialize` does not set the "script argument list" (``sys.argv``).
-If this variable is needed by Python code that will be executed later, it must
-be set explicitly with a call to ``PySys_SetArgv(argc, argv)`` subsequent to
-the call to :cfunc:`Py_Initialize`.
+If this variable is needed by Python code that will be executed later, it must
+be set explicitly with a call to ``PySys_SetArgvEx(argc, argv, updatepath)``
+after the call to :cfunc:`Py_Initialize`.
On most systems (in particular, on Unix and Windows, although the details are
slightly different), :cfunc:`Py_Initialize` calculates the module search path