changeset: 81945:5c7e884b205a branch: 3.3 parent: 81939:8b33f3a4a200 parent: 81943:e6952acd5a55 user: Nadeem Vawda date: Sat Feb 02 20:25:19 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 8b33f3a4a200 -r 5c7e884b205a Lib/test/test_builtin.py --- a/Lib/test/test_builtin.py Sat Feb 02 19:51:37 2013 +0200 +++ b/Lib/test/test_builtin.py Sat Feb 02 20:25:19 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 8b33f3a4a200 -r 5c7e884b205a Misc/NEWS --- a/Misc/NEWS Sat Feb 02 19:51:37 2013 +0200 +++ b/Misc/NEWS Sat Feb 02 20:25:19 2013 +0100 @@ -17,10 +17,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 #10156: In the interpreter's initialization phase, unicode globals are now initialized dynamically as needed. diff -r 8b33f3a4a200 -r 5c7e884b205a Modules/readline.c --- a/Modules/readline.c Sat Feb 02 19:51:37 2013 +0200 +++ b/Modules/readline.c Sat Feb 02 20:25:19 2013 +0100 @@ -1067,7 +1067,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) {