From: Michael W. Hudson <mwh@python.net>
Date: Mon, 11 Aug 2003 12:21:40 +0000 (+0000)
Subject: Repeat my refcount & cut&paste fixes on the branch.
X-Git-Tag: v2.3.1~160
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eb81f24a6f1131795c289f8f7be602f3529e972;p=thirdparty%2FPython%2Fcpython.git

Repeat my refcount & cut&paste fixes on the branch.
---

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index f82de0adbe24..018400cb9208 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -252,7 +252,7 @@ Py_Initialize(void)
 	setlocale(LC_CTYPE, saved_locale);
 
 	if (codeset) {
-		sys_stream = PySys_GetObject("stdout");
+		sys_stream = PySys_GetObject("stdin");
 		sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
 		if (!sys_isatty)
 			PyErr_Clear();
@@ -260,7 +260,6 @@ Py_Initialize(void)
 			if (!PyFile_SetEncoding(sys_stream, codeset))
 				Py_FatalError("Cannot set codeset of stdin");
 		}
-		Py_XDECREF(sys_stream);
 		Py_XDECREF(sys_isatty);
 
 		sys_stream = PySys_GetObject("stdout");
@@ -271,7 +270,6 @@ Py_Initialize(void)
 			if (!PyFile_SetEncoding(sys_stream, codeset))
 				Py_FatalError("Cannot set codeset of stdout");
 		}
-		Py_XDECREF(sys_stream);
 		Py_XDECREF(sys_isatty);
 
 		if (!Py_FileSystemDefaultEncoding)