mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for Bug #116453. 

Direct use of interp->result is deprecated; changing this to
Tcl_GetStringResult(interp) everywhere fixed the problem of losing the
error message with TclError exceptions, on Windows.
This commit is contained in:
Guido van Rossum 2000-10-12 17:14:46 +00:00
parent f4670e9639
commit ada6d87c0c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/_tkinter.c
View File

@ -209,7 +209,7 @@ typedef struct {
#define Tkapp_Check(v) ((v)->ob_type == &Tkapp_Type) #define Tkapp_Check(v) ((v)->ob_type == &Tkapp_Type)
#define Tkapp_Interp(v) (((TkappObject *) (v))->interp) #define Tkapp_Interp(v) (((TkappObject *) (v))->interp)
#define Tkapp_Result(v) (((TkappObject *) (v))->interp->result) #define Tkapp_Result(v) Tcl_GetStringResult(Tkapp_Interp(v))
#define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \ #define DEBUG_REFCNT(v) (printf("DEBUG: id=%p, refcnt=%i\n", \
(void *) v, ((PyObject *) v)->ob_refcnt)) (void *) v, ((PyObject *) v)->ob_refcnt))
@ -420,11 +420,11 @@ Tcl_AppInit(Tcl_Interp *interp)
main = Tk_MainWindow(interp); main = Tk_MainWindow(interp);
if (Tcl_Init(interp) == TCL_ERROR) { if (Tcl_Init(interp) == TCL_ERROR) {
PySys_WriteStderr("Tcl_Init error: %s\n", interp->result); PySys_WriteStderr("Tcl_Init error: %s\n", Tcl_GetStringResult(interp));
return TCL_ERROR; return TCL_ERROR;
} }
if (Tk_Init(interp) == TCL_ERROR) { if (Tk_Init(interp) == TCL_ERROR) {
PySys_WriteStderr("Tk_Init error: %s\n", interp->result); PySys_WriteStderr("Tk_Init error: %s\n", Tcl_GetStringResult(interp));
return TCL_ERROR; return TCL_ERROR;
} }
return TCL_OK; return TCL_OK;
@ -739,13 +739,13 @@ Tkapp_Call(PyObject *self, PyObject *args)
if (i == TCL_ERROR) { if (i == TCL_ERROR) {
if (Py_VerboseFlag >= 2) if (Py_VerboseFlag >= 2)
PySys_WriteStderr("... error: '%s'\n", PySys_WriteStderr("... error: '%s'\n",
interp->result); Tcl_GetStringResult(interp));
Tkinter_Error(self); Tkinter_Error(self);
} }
else { else {
if (Py_VerboseFlag >= 2) if (Py_VerboseFlag >= 2)
PySys_WriteStderr("-> '%s'\n", interp->result); PySys_WriteStderr("-> '%s'\n", Tcl_GetStringResult(interp));
res = PyString_FromString(interp->result); res = PyString_FromString(Tcl_GetStringResult(interp));
} }
LEAVE_OVERLAP_TCL LEAVE_OVERLAP_TCL