Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Check for TclError when reading variables. Fixes #807314. 

Backported to 2.3.
This commit is contained in:
Martin v. Löwis 2003-10-03 17:12:26 +00:00
parent 664a27133c
commit d46e684edd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Modules/_tkinter.c
View File

@ -1647,11 +1647,15 @@ GetVar(PyObject *self, PyObject *args, int flags)
ENTER_TCL
tres = Tcl_GetVar2Ex(Tkapp_Interp(self), name1, name2, flags);
ENTER_OVERLAP
if (((TkappObject*)self)->wantobjects) {
res = FromObj(self, tres);
}
else {
res = PyString_FromString(Tcl_GetString(tres));
if (tres == NULL) {
PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self)));
} else {
if (((TkappObject*)self)->wantobjects) {
res = FromObj(self, tres);
}
else {
res = PyString_FromString(Tcl_GetString(tres));
}
}
LEAVE_OVERLAP_TCL
return res;