[Python-checkins] cpython (merge 3.6 -> default): Issue #26920: Merge 3.6

[xavier.degaye]

https://hg.python.org/cpython/rev/f358d849c14e
changeset:   105143:f358d849c14e
parent:      105140:2faac299acaa
parent:      105142:73bd6bbbb5e2
user:        Xavier de Gaye <xdegaye at users.sourceforge.net>
date:        Wed Nov 16 07:26:10 2016 +0100
summary:
  Issue #26920: Merge 3.6

files:
  Misc/NEWS            |  3 +++
  Python/pylifecycle.c |  2 +-
  2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 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
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -315,7 +315,7 @@
     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. */

-- 
Repository URL: https://hg.python.org/cpython