diff options
| -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 9b14838f22..036f4f2b39 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: @@ -15,10 +15,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 #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 --git a/Modules/readline.c b/Modules/readline.c index 0c387182b7..0d99dc966a 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -1063,7 +1063,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) { |