diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-20 22:08:36 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2009-10-20 22:08:36 (GMT) |
| commit | cefb316e9ebc380a36ecea903755c38b08781cc4 (patch) | |
| tree | 91615e0611b9eb145615dab772362e71ae1fd204 /Modules | |
| parent | 2d4fce2dfbf6d54167a38ed1eff2e49188ac2958 (diff) | |
| download | cpython-cefb316e9ebc380a36ecea903755c38b08781cc4.zip cpython-cefb316e9ebc380a36ecea903755c38b08781cc4.tar.gz cpython-cefb316e9ebc380a36ecea903755c38b08781cc4.tar.bz2 | |
Merged revisions 75571,75576-75577 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r75571 | antoine.pitrou | 2009-10-20 23:52:47 +0200 (mar., 20 oct. 2009) | 11 lines
Merged revisions 75570 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75570 | antoine.pitrou | 2009-10-20 23:29:37 +0200 (mar., 20 oct. 2009) | 6 lines
Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which
fixes the problem of some exceptions being thrown at shutdown when the
interpreter is killed. Patch by Adam Olsen.
........
................
r75576 | antoine.pitrou | 2009-10-21 00:02:29 +0200 (mer., 21 oct. 2009) | 10 lines
Merged revisions 75574 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75574 | antoine.pitrou | 2009-10-20 23:59:25 +0200 (mar., 20 oct. 2009) | 4 lines
Test wouldn't work in debug mode.
We probably need a function in test_support to handle this.
........
................
r75577 | antoine.pitrou | 2009-10-21 00:05:38 +0200 (mer., 21 oct. 2009) | 3 lines
Another futile error in the previous commit :-(
................
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/main.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/Modules/main.c b/Modules/main.c index 22794da..b413561 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -253,33 +253,6 @@ static int RunMainFromImporter(wchar_t *filename) } -/* Wait until threading._shutdown completes, provided - the threading module was imported in the first place. - The shutdown routine will wait until all non-daemon - "threading" threads have completed. */ -#include "abstract.h" -static void -WaitForThreadShutdown(void) -{ -#ifdef WITH_THREAD - PyObject *result; - PyThreadState *tstate = PyThreadState_GET(); - PyObject *threading = PyMapping_GetItemString(tstate->interp->modules, - "threading"); - if (threading == NULL) { - /* threading not imported */ - PyErr_Clear(); - return; - } - result = PyObject_CallMethod(threading, "_shutdown", ""); - if (result == NULL) - PyErr_WriteUnraisable(threading); - else - Py_DECREF(result); - Py_DECREF(threading); -#endif -} - /* Main program */ int @@ -647,8 +620,6 @@ Py_Main(int argc, wchar_t **argv) sts = PyRun_AnyFileFlags(stdin, "<stdin>", &cf) != 0; } - WaitForThreadShutdown(); - Py_Finalize(); #ifdef __INSURE__ |