From: Guido van Rossum Date: Wed, 9 Oct 2002 21:27:33 +0000 (+0000) Subject: GNU readline() mistakenly sets the LC_CTYPE locale. X-Git-Tag: v2.3c1~3844 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60c8a3aba82b83e8da25e614bee2329f7c74509f;p=thirdparty%2FPython%2Fcpython.git GNU readline() mistakenly sets the LC_CTYPE locale. This is evil. Only the user or the app's main() should do this! We must save and restore the locale around the rl_initialize() call. --- diff --git a/Modules/readline.c b/Modules/readline.c index a2efd47f626b..59ae8eb37d94 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -12,6 +12,15 @@ #include #include +#if defined(HAVE_LOCALE_H) && defined(HAVE_SETLOCALE) +/* GNU readline() mistakenly sets the LC_CTYPE locale. + * This is evil. Only the user or the app's main() should do this! + * We must save and restore the locale around the rl_initialize() call. + */ +#define SAVE_LOCALE +#include +#endif + /* GNU readline definitions */ #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */ #include @@ -538,6 +547,10 @@ flex_complete(char *text, int start, int end) static void setup_readline(void) { +#ifdef SAVE_LOCALE + char *saved_locale = setlocale(LC_CTYPE, NULL); +#endif + using_history(); rl_readline_name = "python"; @@ -571,6 +584,10 @@ setup_readline(void) * inside this function. Nothing we can do about it. */ rl_initialize(); + +#ifdef SAVE_LOCALE + setlocale(LC_CTYPE, saved_locale); /* Restore locale */ +#endif }