diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-08-09 09:47:11 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-08-09 09:47:11 +0000 |
| commit | 28943860f6efe9959af7ce669db48cb679b68779 (patch) | |
| tree | 265f28e40682cf879013000413c55770fc95a06f /Python/sysmodule.c | |
| parent | 14a9da8665d372547dd4641a1f7660e512818b41 (diff) | |
| download | cpython-28943860f6efe9959af7ce669db48cb679b68779.tar.gz | |
Move initialization of sys.std{in,out}.encoding to Py_Initialize.
Verify that the encoding actually exists. Fixes #775985.
Will backport to 2.3.
Diffstat (limited to 'Python/sysmodule.c')
| -rw-r--r-- | Python/sysmodule.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 8c77a88cbb..c98e9f1856 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -905,9 +905,6 @@ _PySys_Init(void) #ifdef MS_WINDOWS char buf[10]; #endif -#if defined(HAVE_LANGINFO_H) && defined(CODESET) - char *oldloc, *codeset; -#endif m = Py_InitModule3("sys", sys_methods, sys_doc); sysdict = PyModule_GetDict(m); @@ -930,21 +927,6 @@ _PySys_Init(void) } #endif -#if defined(HAVE_LANGINFO_H) && defined(CODESET) - oldloc = setlocale(LC_CTYPE, 0); - setlocale(LC_CTYPE, ""); - codeset = nl_langinfo(CODESET); - setlocale(LC_CTYPE, oldloc); - if(codeset && isatty(fileno(stdin))){ - if (!PyFile_SetEncoding(sysin, codeset)) - return NULL; - } - if(codeset && isatty(fileno(stdout))) { - if (!PyFile_SetEncoding(sysout, codeset)) - return NULL; - } -#endif - PyDict_SetItemString(sysdict, "stdin", sysin); PyDict_SetItemString(sysdict, "stdout", sysout); PyDict_SetItemString(sysdict, "stderr", syserr); |