Issue #26920: Fix not getting the locale's charset upon initializing the interpreter,

on platforms that do not have langinfo

diff --git a/Misc/NEWS b/Misc/NEWS
index a3db6e4a759c77b0e1cd7846d7f0405ffb81f38c..0b9031945f6ec02bcad34f8b49c71a6810cb74f1 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.6.0 beta 4
 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 5b5cc2b55e8ef8dd652a55728965d5d7f0849929..71f23dd1505768e44f4ee7b3f5aff34574c9e89b 100644 (file)
--- 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. */