From 6d5ee973f0600a3a9444f569dcf0dd346bfa2a11 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sat, 23 Mar 2019 12:05:43 +0100 Subject: bpo-36301: Add _PyRuntimeState.preconfig (GH-12506) _PyPreConfig_Write() now writes the applied pre-configuration into _PyRuntimeState.preconfig. --- Python/preconfig.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Python/preconfig.c') diff --git a/Python/preconfig.c b/Python/preconfig.c index d856c124f3..13e5e1e857 100644 --- a/Python/preconfig.c +++ b/Python/preconfig.c @@ -862,5 +862,14 @@ _PyPreConfig_Write(_PyPreConfig *config) /* Set LC_CTYPE to the user preferred locale */ _Py_SetLocaleFromEnv(LC_CTYPE); + /* Write the new pre-configuration into _PyRuntime */ + PyMemAllocatorEx old_alloc; + _PyMem_SetDefaultAllocator(PYMEM_DOMAIN_RAW, &old_alloc); + int res = _PyPreConfig_Copy(&_PyRuntime.preconfig, config); + PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc); + if (res < 0) { + return _Py_INIT_NO_MEMORY(); + } + return _Py_INIT_OK(); } -- cgit v1.2.1