diff options
| author | Victor Stinner <vstinner@python.org> | 2020-06-08 16:44:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 16:44:50 (GMT) |
| commit | dedaac040fe5b0b88acdec072623bb39ec53687f (patch) | |
| tree | a83f2e7bcb9653e17fe8ae3ca23e04ab4a6ff5d9 /Include/cpython | |
| parent | 1220a4707966679d15a9b5f7596ddd06bb4d5f23 (diff) | |
| download | cpython-dedaac040fe5b0b88acdec072623bb39ec53687f.zip cpython-dedaac040fe5b0b88acdec072623bb39ec53687f.tar.gz cpython-dedaac040fe5b0b88acdec072623bb39ec53687f.tar.bz2 | |
bpo-40910: Export Py_GetArgcArgv() function (GH-20721) (GH-20723)
Export explicitly the Py_GetArgcArgv() function to the C API and
document the function. Previously, it was exported implicitly which
no longer works since Python is built with -fvisibility=hidden.
* Add PyConfig._orig_argv member.
* Py_InitializeFromConfig() no longer calls _PyConfig_Write() twice.
* PyConfig_Read() no longer initializes Py_GetArgcArgv(): it is now
_PyConfig_Write() responsibility.
* _PyConfig_Write() result type becomes PyStatus instead of void.
* Write an unit test on Py_GetArgcArgv().
(cherry picked from commit e81f6e687d0f04a45f2389d0b43fafd6d8491624)
Diffstat (limited to 'Include/cpython')
| -rw-r--r-- | Include/cpython/initconfig.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h index df93a55..69db2af 100644 --- a/Include/cpython/initconfig.h +++ b/Include/cpython/initconfig.h @@ -413,6 +413,14 @@ typedef struct { /* If non-zero, disallow threads, subprocesses, and fork. Default: 0. */ int _isolated_interpreter; + + /* Original command line arguments. If _orig_argv is empty and _argv is + not equal to [''], PyConfig_Read() copies the configuration 'argv' list + into '_orig_argv' list before modifying 'argv' list (if parse_argv + is non-zero). + + _PyConfig_Write() initializes Py_GetArgcArgv() to this list. */ + PyWideStringList _orig_argv; } PyConfig; PyAPI_FUNC(void) PyConfig_InitPythonConfig(PyConfig *config); @@ -438,6 +446,14 @@ PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list, Py_ssize_t length, wchar_t **items); + +/* --- Helper functions --------------------------------------- */ + +/* Get the original command line arguments, before Python modified them. + + See also PyConfig._orig_argv. */ +PyAPI_FUNC(void) Py_GetArgcArgv(int *argc, wchar_t ***argv); + #ifdef __cplusplus } #endif |
