diff options
| author | Nadeem Vawda <nadeem.vawda@gmail.com> | 2013-02-02 19:05:11 (GMT) |
|---|---|---|
| committer | Nadeem Vawda <nadeem.vawda@gmail.com> | 2013-02-02 19:05:11 (GMT) |
| commit | 637525718873f9c6571078e0201523438b17d341 (patch) | |
| tree | 41c8ff21caf73461f06184caf596eef2394915e1 | |
| parent | e5e64444979f0bb6c922f1c2742440f964ce6801 (diff) | |
| download | cpython-637525718873f9c6571078e0201523438b17d341.zip cpython-637525718873f9c6571078e0201523438b17d341.tar.gz cpython-637525718873f9c6571078e0201523438b17d341.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 a3c8dcc..dab56ce 100644 --- a/Lib/test/test_builtin.py +++ b/Lib/test/test_builtin.py @@ -18,13 +18,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: @@ -12,10 +12,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 fd60377..4d54dad 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1068,7 +1068,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) { |