mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 14:07:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Set sys.stdout.encoding properly.

Browse source 
Always set LC_CTYPE on interpreter startup.
Add device_encoding function.
This commit is contained in:
Martin v. Löwis 2007-08-11 14:02:14 +00:00
parent 79c320898d
commit d1cd4d4176
4 changed files with 59 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/pythonrun.c
View file

@ -154,7 +154,6 @@ Py_InitializeEx(int install_sigs)
char *p;
#if defined(HAVE_LANGINFO_H) && defined(CODESET)
char *codeset;
char *saved_locale;
#endif
extern void _Py_ReadyTypes(void);
@ -162,6 +161,13 @@ Py_InitializeEx(int install_sigs)
return;
initialized = 1;
#ifdef HAVE_SETLOCALE
/* Set up the LC_CTYPE locale, so we can obtain
the locale's charset without having to switch
locales. */
setlocale(LC_CTYPE, "");
#endif
if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0')
Py_DebugFlag = add_flag(Py_DebugFlag, p);
if ((p = Py_GETENV("PYTHONVERBOSE")) && *p != '\0')
@ -254,8 +260,6 @@ Py_InitializeEx(int install_sigs)
initialized by other means. Also set the encoding of
stdin and stdout if these are terminals. */
saved_locale = strdup(setlocale(LC_CTYPE, NULL));
setlocale(LC_CTYPE, "");
codeset = nl_langinfo(CODESET);
if (codeset && *codeset) {
PyObject *enc = PyCodec_Encoder(codeset);
@ -268,8 +272,6 @@ Py_InitializeEx(int install_sigs)
}
} else
codeset = NULL;
setlocale(LC_CTYPE, saved_locale);
free(saved_locale);
if (codeset) {
if (!Py_FileSystemDefaultEncoding)