diff options
| author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2013-02-02 19:25:19 (GMT) |
|---|---|---|
| committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2013-02-02 19:25:19 (GMT) |
| commit | c27bcbf86316fd45180a8b881c55ed3ac7f9fa50 (patch) | |
| tree | 068e6b5327cd3a1052fb882404a7bb64f9a46371 | |
| parent | 672671da47582101060819f94eb054fa344c6e5c (diff) | |
| parent | 637525718873f9c6571078e0201523438b17d341 (diff) | |
| download | cpython-c27bcbf86316fd45180a8b881c55ed3ac7f9fa50.zip cpython-c27bcbf86316fd45180a8b881c55ed3ac7f9fa50.tar.gz cpython-c27bcbf86316fd45180a8b881c55ed3ac7f9fa50.tar.bz2 | |
Back out fix for issue #13886; it introduced a new bug in interactive readline use.
| -rw-r--r-- | Lib/test/test_builtin.py | 7 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Modules/readline.c | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py index 704fe9c..bf005c5 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -20,13 +20,6 @@ try: 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: @@ -17,10 +17,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. 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 --git a/Modules/readline.c b/Modules/readline.c index 02fc4c2..a710652 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1067,7 +1067,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) { |