comparison Python/pythonrun.c @ 30122:210676ec9d5f legacy-trunk

Fix refcounting and cut & paste error (?) in last checkin. This should go onto release23-maint, too.
author Michael W. Hudson <mwh@python.net>
date Mon, 11 Aug 2003 12:20:24 +0000
parents a88e6dfbfd6d
children e3ebd740d1ef 3b59fa5d25b1
comparison
equal deleted inserted replaced
30120:19c0f817cb47 30122:210676ec9d5f
250 } else 250 } else
251 codeset = NULL; 251 codeset = NULL;
252 setlocale(LC_CTYPE, saved_locale); 252 setlocale(LC_CTYPE, saved_locale);
253 253
254 if (codeset) { 254 if (codeset) {
255 sys_stream = PySys_GetObject("stdout"); 255 sys_stream = PySys_GetObject("stdin");
256 sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); 256 sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
257 if (!sys_isatty) 257 if (!sys_isatty)
258 PyErr_Clear(); 258 PyErr_Clear();
259 if(sys_isatty && PyObject_IsTrue(sys_isatty)) { 259 if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
260 if (!PyFile_SetEncoding(sys_stream, codeset)) 260 if (!PyFile_SetEncoding(sys_stream, codeset))
261 Py_FatalError("Cannot set codeset of stdin"); 261 Py_FatalError("Cannot set codeset of stdin");
262 } 262 }
263 Py_XDECREF(sys_stream);
264 Py_XDECREF(sys_isatty); 263 Py_XDECREF(sys_isatty);
265 264
266 sys_stream = PySys_GetObject("stdout"); 265 sys_stream = PySys_GetObject("stdout");
267 sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); 266 sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
268 if (!sys_isatty) 267 if (!sys_isatty)
269 PyErr_Clear(); 268 PyErr_Clear();
270 if(sys_isatty && PyObject_IsTrue(sys_isatty)) { 269 if(sys_isatty && PyObject_IsTrue(sys_isatty)) {
271 if (!PyFile_SetEncoding(sys_stream, codeset)) 270 if (!PyFile_SetEncoding(sys_stream, codeset))
272 Py_FatalError("Cannot set codeset of stdout"); 271 Py_FatalError("Cannot set codeset of stdout");
273 } 272 }
274 Py_XDECREF(sys_stream);
275 Py_XDECREF(sys_isatty); 273 Py_XDECREF(sys_isatty);
276 274
277 if (!Py_FileSystemDefaultEncoding) 275 if (!Py_FileSystemDefaultEncoding)
278 Py_FileSystemDefaultEncoding = codeset; 276 Py_FileSystemDefaultEncoding = codeset;
279 else 277 else