Mercurial > cpython-lru_cache-weakref
comparison Python/pythonrun.c @ 30123:1598fbe693f9 2.3
Repeat my refcount & cut&paste fixes on the branch.
| author | Michael W. Hudson <mwh@python.net> |
|---|---|
| date | Mon, 11 Aug 2003 12:21:40 +0000 |
| parents | fb2abca2d2d5 |
| children | e3ebd740d1ef 3b59fa5d25b1 |
comparison
equal
deleted
inserted
replaced
| 30121:998b06730c9f | 30123:1598fbe693f9 |
|---|---|
| 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 |
