changeset:   105142:73bd6bbbb5e2
branch:      3.6
parent:      105139:9c32309e4dec
user:        Xavier de Gaye <xdegaye@users.sourceforge.net>
date:        Wed Nov 16 07:24:20 2016 +0100
files:       Misc/NEWS Python/pylifecycle.c
description:
Issue #26920: Fix not getting the locale's charset upon initializing the interpreter,
on platforms that do not have langinfo


diff -r 9c32309e4dec -r 73bd6bbbb5e2 Misc/NEWS
--- a/Misc/NEWS	Tue Nov 15 21:18:40 2016 -0500
+++ b/Misc/NEWS	Wed Nov 16 07:24:20 2016 +0100
@@ -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 -r 9c32309e4dec -r 73bd6bbbb5e2 Python/pylifecycle.c
--- a/Python/pylifecycle.c	Tue Nov 15 21:18:40 2016 -0500
+++ b/Python/pylifecycle.c	Wed Nov 16 07:24:20 2016 +0100
@@ -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. */