diff options
| author |   Victor Stinner <victor.stinner@gmail.com> | 2017-12-16 04:54:22 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-12-16 04:54:22 +0100 |
| commit | 9454060e84a669dde63824d9e2fcaf295e34f687 (patch) | |
| tree | 4c40a6e1bd11aa75819acb7efce4981fc6ba7611 /Modules/getpath.c | |
| parent | bpo-27456: Ensure TCP_NODELAY is set on linux (#4231) (diff) | |
| download | cpython-9454060e84a669dde63824d9e2fcaf295e34f687.tar.gz cpython-9454060e84a669dde63824d9e2fcaf295e34f687.tar.bz2 cpython-9454060e84a669dde63824d9e2fcaf295e34f687.zip | |
bpo-29240, bpo-32030: Py_Main() re-reads config if encoding changes (#4899)
bpo-29240, bpo-32030: If the encoding change (C locale coerced or
UTF-8 Mode changed), Py_Main() now reads again the configuration with
the new encoding.
Changes:
* Add _Py_UnixMain() called by main().
* Rename pymain_free_pymain() to pymain_clear_pymain(), it can now be
called multipled times.
* Rename pymain_parse_cmdline_envvars() to pymain_read_conf().
* Py_Main() now clears orig_argc and orig_argv at exit.
* Remove argv_copy2, Py_Main() doesn't modify argv anymore. There is
no need anymore to get two copies of the wchar_t** argv.
* _PyCoreConfig: add coerce_c_locale and coerce_c_locale_warn.
* Py_UTF8Mode is now initialized to -1.
* Locale coercion (PEP 538) now respects -I and -E options.
Diffstat (limited to 'Modules/getpath.c')
| -rw-r--r-- | Modules/getpath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index 6208a17f02e..b4b33437b6f 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -112,7 +112,7 @@ extern "C" { #define DECODE_LOCALE_ERR(NAME, LEN) \ ((LEN) == (size_t)-2) \ - ? _Py_INIT_USER_ERR("cannot decode " #NAME) \ + ? _Py_INIT_USER_ERR("cannot decode " NAME) \ : _Py_INIT_NO_MEMORY() typedef struct { |