changeset:   81946:8b8c6abda7e8
parent:      81944:efb8d80af320
parent:      81945:5c7e884b205a
user:        Nadeem Vawda <nadeem.vawda@gmail.com>
date:        Sat Feb 02 20:29:39 2013 +0100
files:       Lib/test/test_builtin.py Misc/NEWS Modules/readline.c
description:
Back out fix for issue #13886; it introduced a new bug in interactive readline use.


diff -r efb8d80af320 -r 8b8c6abda7e8 Lib/test/test_builtin.py
--- a/Lib/test/test_builtin.py	Sat Feb 02 11:24:43 2013 -0800
+++ b/Lib/test/test_builtin.py	Sat Feb 02 20:29:39 2013 +0100
@@ -20,13 +20,6 @@
     import pty, signal
 except ImportError:
     pty = signal = None
-# Importing this module has the side-effect of changing the behavior of input().
-# Ensure that we always use the readline version (if available), so we don't get
-# different results depending on what other tests have already imported.
-try:
-    import readline
-except ImportError:
-    pass
 
 
 class Squares:
diff -r efb8d80af320 -r 8b8c6abda7e8 Misc/NEWS
--- a/Misc/NEWS	Sat Feb 02 11:24:43 2013 -0800
+++ b/Misc/NEWS	Sat Feb 02 20:29:39 2013 +0100
@@ -15,10 +15,6 @@
 
 - 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. Also fix sporadic failures in test_builtin due to
-  dependence on whether the readline module has previously been imported.
-
 - Issue #16772: The base argument to the int constructor no longer accepts
   floats, or other non-integer objects with an __int__ method.  Objects
   with an __index__ method are now accepted.
diff -r efb8d80af320 -r 8b8c6abda7e8 Modules/readline.c
--- a/Modules/readline.c	Sat Feb 02 11:24:43 2013 -0800
+++ b/Modules/readline.c	Sat Feb 02 20:29:39 2013 +0100
@@ -1063,7 +1063,7 @@
     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) {