traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-36763: Add PyConfig_SetWideStringList() (GH-14444)

This commit is contained in:
Victor Stinner 2019-07-01 19:13:50 +02:00 committed by GitHub
parent e21b45a8e7
commit 36242fd871
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Doc/c-api/init_config.rst
View File

@ -25,6 +25,7 @@ Functions:
* :c:func:`PyConfig_SetBytesArgv`
* :c:func:`PyConfig_SetBytesString`
* :c:func:`PyConfig_SetString`
* :c:func:`PyConfig_SetWideStringList`
* :c:func:`PyPreConfig_InitIsolatedConfig`
* :c:func:`PyPreConfig_InitPythonConfig`
* :c:func:`PyStatus_Error`
@ -368,6 +369,12 @@ PyConfig
Preinitialize Python if needed.
.. c:function:: PyStatus PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list, Py_ssize_t length, wchar_t **items)
Set the list of wide strings *list* to *length* and *items*.
Preinitialize Python if needed.
.. c:function:: PyStatus PyConfig_Read(PyConfig *config)
Read all Python configuration.

3
Include/cpython/initconfig.h
View File

@ -422,6 +422,9 @@ PyAPI_FUNC(PyStatus) PyConfig_SetBytesArgv(
PyAPI_FUNC(PyStatus) PyConfig_SetArgv(PyConfig *config,
Py_ssize_t argc,
wchar_t * const *argv);
PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config,
PyWideStringList *list,
Py_ssize_t length, wchar_t **items);
#ifdef __cplusplus
}

1
Misc/NEWS.d/next/C API/2019-06-28-15-49-16.bpo-36763.zrmgki.rst Normal file
View File

@ -0,0 +1 @@
Add :func:`PyConfig_SetWideStringList` function.

19
Python/initconfig.c
View File

@ -732,7 +732,7 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2)
} while (0)
#define COPY_WSTRLIST(LIST) \
do { \
if (_PyWideStringList_Copy(&config->LIST, &config2->LIST) < 0 ) { \
if (_PyWideStringList_Copy(&config->LIST, &config2->LIST) < 0) { \
return _PyStatus_NO_MEMORY(); \
} \
} while (0)
@ -2324,6 +2324,23 @@ PyConfig_SetArgv(PyConfig *config, Py_ssize_t argc, wchar_t * const *argv)
}
PyStatus
PyConfig_SetWideStringList(PyConfig *config, PyWideStringList *list,
Py_ssize_t length, wchar_t **items)
{
PyStatus status = _Py_PreInitializeFromConfig(config, NULL);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
PyWideStringList list2 = {.length = length, .items = items};
if (_PyWideStringList_Copy(list, &list2) < 0) {
return _PyStatus_NO_MEMORY();
}
return _PyStatus_OK();
}
/* Read the configuration into PyConfig from:
* Command line arguments