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

diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c
index 3bbc7e4c39ad529bc2e9f01d75726318e6bc5537..dfafed5cda387ad5c40bb56cc8ade3ddba5b90e6 100644 (file)
--- 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);