FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-36763: Implement PyWideStringList_Insert() of PEP 587 (GH-15423) · python/cpython@3842f29 · GitHub

/ cpython Public

Commit 3842f29

Browse files
vstinner
authored
bpo-36763: Implement PyWideStringList_Insert() of PEP 587 (GH-15423)
1 parent 8e76c45 commit 3842f29

5 files changed

Lines changed: 51 additions & 13 deletions

File tree

‎Doc/c-api/init_config.rst‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,12 @@ PyWideStringList
7272
7373
.. c:function:: PyStatus PyWideStringList_Insert(PyWideStringList *list, Py_ssize_t index, const wchar_t *item)
7474
75-
Insert *item* into *list* at *index*. If *index* is greater than *list*
76-
length, just append *item* to *list*.
75+
Insert *item* into *list* at *index*.
76+
77+
If *index* is greater than or equal to *list* length, append *item* to
78+
*list*.
79+
80+
*index* must be greater than or equal to 0.
7781
7882
Python must be preinitialized to call this function.
7983

‎Include/cpython/initconfig.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ typedef struct {
3737

3838
PyAPI_FUNC(PyStatus) PyWideStringList_Append(PyWideStringList *list,
3939
const wchar_t *item);
40+
PyAPI_FUNC(PyStatus) PyWideStringList_Insert(PyWideStringList *list,
41+
Py_ssize_t index,
42+
const wchar_t *item);
4043

4144

4245
/* --- PyPreConfig ----------------------------------------------- */

‎Lib/test/test_embed.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,7 @@ def _get_expected_config(self, env):
500500
self.fail(f"fail to decode stdout: {stdout!r}")
501501

502502
def get_expected_config(self, expected_preconfig, expected, env, api,
503-
add_path=None):
503+
modify_path_cb=None):
504504
cls = self.__class__
505505
if cls.EXPECTED_CONFIG is None:
506506
cls.EXPECTED_CONFIG = self._get_expected_config(env)
@@ -556,8 +556,9 @@ def get_expected_config(self, expected_preconfig, expected, env, api,
556556
prepend_path = expected['pythonpath_env']
557557
if prepend_path is not None:
558558
expected['module_search_paths'] = [prepend_path, *expected['module_search_paths']]
559-
if add_path is not None:
560-
expected['module_search_paths'] = [*expected['module_search_paths'], add_path]
559+
if modify_path_cb is not None:
560+
expected['module_search_paths'] = expected['module_search_paths'].copy()
561+
modify_path_cb(expected['module_search_paths'])
561562

562563
for key in self.COPY_PRE_CONFIG:
563564
if key not in expected_preconfig:
@@ -602,7 +603,7 @@ def check_global_config(self, configs):
602603
self.assertEqual(configs['global_config'], expected)
603604

604605
def check_all_configs(self, testname, expected_config=None,
605-
expected_preconfig=None, add_path=None, stderr=None,
606+
expected_preconfig=None, modify_path_cb=None, stderr=None,
606607
*, api):
607608
env = remove_python_envvars()
608609

@@ -628,7 +629,7 @@ def check_all_configs(self, testname, expected_config=None,
628629

629630
self.get_expected_config(expected_preconfig,
630631
expected_config, env,
631-
api, add_path)
632+
api, modify_path_cb)
632633

633634
out, err = self.run_embedded_interpreter(testname, env=env)
634635
if stderr is None and not expected_config['verbose']:
@@ -894,9 +895,12 @@ def test_init_read_set(self):
894895
'program_name': './init_read_set',
895896
'executable': 'my_executable',
896897
}
898+
def modify_path(path):
899+
path.insert(1, "test_path_insert1")
900+
path.append("test_path_append")
897901
self.check_all_configs("test_init_read_set", config,
898902
api=API_PYTHON,
899-
add_path="init_read_set_path")
903+
modify_path_cb=modify_path)
900904

901905
def test_init_run_main(self):
902906
code = ('import _testinternalcapi, json; '

‎Programs/_testembed.c‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1350,8 +1350,14 @@ static int test_init_read_set(void)
13501350
goto fail;
13511351
}
13521352

1353+
status = PyWideStringList_Insert(&config.module_search_paths,
1354+
1, L"test_path_insert1");
1355+
if (PyStatus_Exception(status)) {
1356+
goto fail;
1357+
}
1358+
13531359
status = PyWideStringList_Append(&config.module_search_paths,
1354-
L"init_read_set_path");
1360+
L"test_path_append");
13551361
if (PyStatus_Exception(status)) {
13561362
goto fail;
13571363
}

‎Python/initconfig.c‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -297,32 +297,53 @@ _PyWideStringList_Copy(PyWideStringList *list, const PyWideStringList *list2)
297297

298298

299299
PyStatus
300-
PyWideStringList_Append(PyWideStringList *list, const wchar_t *item)
300+
PyWideStringList_Insert(PyWideStringList *list,
301+
Py_ssize_t index, const wchar_t *item)
301302
{
302-
if (list->length == PY_SSIZE_T_MAX) {
303+
Py_ssize_t len = list->length;
304+
if (len == PY_SSIZE_T_MAX) {
303305
/* length+1 would overflow */
304306
return _PyStatus_NO_MEMORY();
305307
}
308+
if (index < 0) {
309+
return _PyStatus_ERR("PyWideStringList_Insert index must be >= 0");
310+
}
311+
if (index > len) {
312+
index = len;
313+
}
306314

307315
wchar_t *item2 = _PyMem_RawWcsdup(item);
308316
if (item2 == NULL) {
309317
return _PyStatus_NO_MEMORY();
310318
}
311319

312-
size_t size = (list->length + 1) * sizeof(list->items[0]);
320+
size_t size = (len + 1) * sizeof(list->items[0]);
313321
wchar_t **items2 = (wchar_t **)PyMem_RawRealloc(list->items, size);
314322
if (items2 == NULL) {
315323
PyMem_RawFree(item2);
316324
return _PyStatus_NO_MEMORY();
317325
}
318326

319-
items2[list->length] = item2;
327+
if (index < len) {
328+
memmove(&items2[index + 1],
329+
&items2[index],
330+
(len - index) * sizeof(items2[0]));
331+
}
332+
333+
items2[index] = item2;
320334
list->items = items2;
321335
list->length++;
322336
return _PyStatus_OK();
323337
}
324338

325339

340+
PyStatus
341+
PyWideStringList_Append(PyWideStringList *list, const wchar_t *item)
342+
{
343+
return PyWideStringList_Insert(list, list->length, item);
344+
}
345+
346+
326347
PyStatus
327348
_PyWideStringList_Extend(PyWideStringList *list, const PyWideStringList *list2)
328349
{

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL