mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Another bulky set of minor changes.

Browse source 
Note addition of gethostbyaddr() and improved repr() for sockets,
renaming of md5.md5() to md5.new(), and fixing of leaks in threads.
This commit is contained in:
Guido van Rossum 1995-01-02 19:30:30 +00:00
parent 437a0e60ba
commit 3bbc62e9c2
18 changed files with 222 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/_tkinter.c
View file

@ -41,6 +41,7 @@ static int quitMainLoop = 0;
static int errorInCmd = 0;
static PyObject *excInCmd;
static PyObject *valInCmd;
static PyObject *trbInCmd;
static PyObject *
Tkinter_Error (v)
@ -55,7 +56,7 @@ PythonCmd_Error (interp)
Tcl_Interp *interp;
{
errorInCmd = 1;
PyErr_GetAndClear (&excInCmd, &valInCmd);
PyErr_Fetch (&excInCmd, &valInCmd, &trbInCmd);
return TCL_ERROR;
}
@ -759,7 +760,7 @@ FileHandler (clientData, mask)
if (res == NULL)
{
errorInCmd = 1;
PyErr_GetAndClear (&excInCmd, &valInCmd);
PyErr_Fetch (&excInCmd, &valInCmd, &trbInCmd);
}
Py_XDECREF (res);
}
@ -964,9 +965,10 @@ TimerHandler (clientData)
if (res == NULL)
{
errorInCmd = 1;
PyErr_GetAndClear (&excInCmd, &valInCmd);
PyErr_Fetch (&excInCmd, &valInCmd, &trbInCmd);
}
Py_DECREF (res);
else
Py_DECREF (res);
}
static PyObject *
@ -1020,7 +1022,8 @@ Tkapp_MainLoop (self, args)
if (errorInCmd)
{
errorInCmd = 0;
PyErr_SetObject (excInCmd, valInCmd);
PyErr_Restore (excInCmd, valInCmd, trbInCmd);
excInCmd = valInCmd = trbInCmd = NULL;
return NULL;
}
Py_INCREF (Py_None);
@ -1173,7 +1176,8 @@ EventHook ()
if (errorInCmd) /* XXX Reset tty */
{
errorInCmd = 0;
PyErr_SetObject (excInCmd, valInCmd);
PyErr_Restore (excInCmd, valInCmd, trbInCmd);
excInCmd = valInCmd = trbInCmd = NULL;
PyErr_Print ();
}
if (tk_NumMainWindows > 0)