From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Tue, 18 Nov 2008 04:33:04 +0000 (+0000)
Subject: Issue #4313: Fixed segfault on IDLE exit. Reverted r57540 and reopened Issue #1028.
X-Git-Tag: v3.0rc3~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=de60347b666a96ec3677c93576e8d97d56cf0c6e;p=thirdparty%2FPython%2Fcpython.git

Issue #4313: Fixed segfault on IDLE exit. Reverted r57540 and reopened Issue #1028.
---

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 3bbc7e4c39ad..dfafed5cda38 100644
--- a/Modules/_tkinter.c
+++ b/Modules/_tkinter.c
@@ -1906,7 +1906,7 @@ static int
 PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
 {
 	PythonCmd_ClientData *data = (PythonCmd_ClientData *)clientData;
-	PyObject *self, *func, *arg, *res, *s;
+	PyObject *self, *func, *arg, *res;
 	int i, rv;
 	Tcl_Obj *obj_res;
 
@@ -1923,13 +1923,7 @@ PythonCmd(ClientData clientData, Tcl_Interp *interp, int argc, char *argv[])
 		return PythonCmd_Error(interp);
 
 	for (i = 0; i < (argc - 1); i++) {
-		if (11 == (i + 1)) {  /* the %A arg is the unicode char */
-			char *a = argv[i + 1];
-			s = PyUnicode_FromUnicode((Py_UNICODE *) a, strlen(a));
-		}
-		else {
-			s = PyUnicode_FromString(argv[i + 1]);
-		}
+		PyObject *s = PyUnicode_FromString(argv[i + 1]);
 		if (!s || PyTuple_SetItem(arg, i, s)) {
 			Py_DECREF(arg);
 			return PythonCmd_Error(interp);