From: Nadeem Vawda <nadeem.vawda@gmail.com>
Date: Sat, 2 Feb 2013 19:52:54 +0000 (+0100)
Subject: Back out fix for issue #13886; it introduced a new bug in interactive readline use.
X-Git-Tag: v2.7.4rc1~158
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1efd9824d892b514d879dffe09c16b009363f132;p=thirdparty%2FPython%2Fcpython.git

Back out fix for issue #13886; it introduced a new bug in interactive readline use.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 624c5a9a46b8..b11f6a2fe720 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -11,9 +11,6 @@ Core and Builtins
 
 - Issue #16979: Fix error handling bugs in the unicode-escape-decode decoder.
 
-- Issue #13886: Fix input() to not strip out input bytes that cannot be decoded
-  using the locale encoding.
-
 - Issue #10156: In the interpreter's initialization phase, unicode globals
   are now initialized dynamically as needed.
 
diff --git a/Modules/readline.c b/Modules/readline.c
index 3cb6236298db..b5e258db67e4 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -1041,7 +1041,7 @@ call_readline(FILE *sys_stdin, FILE *sys_stdout, char *prompt)
     char *saved_locale = strdup(setlocale(LC_CTYPE, NULL));
     if (!saved_locale)
         Py_FatalError("not enough memory to save locale");
-    setlocale(LC_CTYPE, "C");
+    setlocale(LC_CTYPE, "");
 #endif
 
     if (sys_stdin != rl_instream || sys_stdout != rl_outstream) {