diff options
| author | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-16 06:26:10 (GMT) |
|---|---|---|
| committer | Xavier de Gaye <xdegaye@users.sourceforge.net> | 2016-11-16 06:26:10 (GMT) |
| commit | afa94a5a3ec7ef66f00fc5ab284d2665f04996be (patch) | |
| tree | 575cc4089e0cae222131e351db5406ce9b9863f5 | |
| parent | a97872a1fe49a511688a133a3974f0b68fa7edc0 (diff) | |
| parent | b445ad7b04438b0a8507117d216d756088ea1848 (diff) | |
| download | cpython-afa94a5a3ec7ef66f00fc5ab284d2665f04996be.zip cpython-afa94a5a3ec7ef66f00fc5ab284d2665f04996be.tar.gz cpython-afa94a5a3ec7ef66f00fc5ab284d2665f04996be.tar.bz2 | |
Issue #26920: Merge 3.6
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -10,6 +10,9 @@ What's New in Python 3.7.0 alpha 1 Core and Builtins ----------------- +- Issue #26920: Fix not getting the locale's charset upon initializing the + interpreter, on platforms that do not have langinfo. + - Issue #28648: Fixed crash in Py_DecodeLocale() in debug build on Mac OS X when decode astral characters. Patch by Xiang Zhang. diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 5b5cc2b..71f23dd 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -315,7 +315,7 @@ _Py_InitializeEx_Private(int install_sigs, int install_importlib) initialized = 1; _Py_Finalizing = NULL; -#if defined(HAVE_LANGINFO_H) && defined(HAVE_SETLOCALE) +#ifdef HAVE_SETLOCALE /* Set up the LC_CTYPE locale, so we can obtain the locale's charset without having to switch locales. */ |