diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-11-25 02:17:57 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-25 02:17:57 (GMT) |
| commit | 9316ee4da2dcc217351418fc4dbe9205995689e0 (patch) | |
| tree | 6c292be4738bdc93ff647113bba6a4cb664da352 /Modules/main.c | |
| parent | 706cb3162e15271ecfeba15909ed48a3a437009f (diff) | |
| download | cpython-9316ee4da2dcc217351418fc4dbe9205995689e0.zip cpython-9316ee4da2dcc217351418fc4dbe9205995689e0.tar.gz cpython-9316ee4da2dcc217351418fc4dbe9205995689e0.tar.bz2 | |
bpo-32030: Add _PyPathConfig_Init() (#4551)
* Add _PyPathConfig_Init() and _PyPathConfig_Fini()
* Remove _Py_GetPathWithConfig()
* _PyPathConfig_Init() returns _PyInitError to allow to handle errors
properly
* Add pathconfig_clear()
* Windows calculate_path_impl(): replace Py_FatalError() with
_PyInitError
* Py_FinalizeEx() now calls _PyPathConfig_Fini() to release memory
* Fix _Py_InitializeMainInterpreter() regression: don't initialize
path config if _disable_importlib is false
* PyPathConfig now uses dynamically allocated memory
Diffstat (limited to 'Modules/main.c')
| -rw-r--r-- | Modules/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/main.c b/Modules/main.c index dca165d..1b1d804 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -38,14 +38,14 @@ extern "C" { #define DECODE_LOCALE_ERR(NAME, LEN) \ (((LEN) == -2) \ - ? _Py_INIT_USER_ERR("failed to decode " #NAME) \ + ? _Py_INIT_USER_ERR("cannot decode " #NAME) \ : _Py_INIT_NO_MEMORY()) #define SET_DECODE_ERROR(NAME, LEN) \ do { \ if ((LEN) == (size_t)-2) { \ - pymain->err = _Py_INIT_USER_ERR("failed to decode " #NAME); \ + pymain->err = _Py_INIT_USER_ERR("cannot decode " #NAME); \ } \ else { \ pymain->err = _Py_INIT_NO_MEMORY(); \ |