Commit 791ac8ac authored by Michael W. Hudson's avatar Michael W. Hudson

Fix refcounting and cut & paste error (?) in last checkin.

This should go onto release23-maint, too.
parent a96d0a03
...@@ -252,7 +252,7 @@ Py_Initialize(void) ...@@ -252,7 +252,7 @@ Py_Initialize(void)
setlocale(LC_CTYPE, saved_locale); setlocale(LC_CTYPE, saved_locale);
if (codeset) { if (codeset) {
sys_stream = PySys_GetObject("stdout"); sys_stream = PySys_GetObject("stdin");
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
if (!sys_isatty) if (!sys_isatty)
PyErr_Clear(); PyErr_Clear();
...@@ -260,7 +260,6 @@ Py_Initialize(void) ...@@ -260,7 +260,6 @@ Py_Initialize(void)
if (!PyFile_SetEncoding(sys_stream, codeset)) if (!PyFile_SetEncoding(sys_stream, codeset))
Py_FatalError("Cannot set codeset of stdin"); Py_FatalError("Cannot set codeset of stdin");
} }
Py_XDECREF(sys_stream);
Py_XDECREF(sys_isatty); Py_XDECREF(sys_isatty);
sys_stream = PySys_GetObject("stdout"); sys_stream = PySys_GetObject("stdout");
...@@ -271,7 +270,6 @@ Py_Initialize(void) ...@@ -271,7 +270,6 @@ Py_Initialize(void)
if (!PyFile_SetEncoding(sys_stream, codeset)) if (!PyFile_SetEncoding(sys_stream, codeset))
Py_FatalError("Cannot set codeset of stdout"); Py_FatalError("Cannot set codeset of stdout");
} }
Py_XDECREF(sys_stream);
Py_XDECREF(sys_isatty); Py_XDECREF(sys_isatty);
if (!Py_FileSystemDefaultEncoding) if (!Py_FileSystemDefaultEncoding)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment