From 4d381b17e4b4a86b52cd5562b005eb29066d2cbd Mon Sep 17 00:00:00 2001 From: Anthony Baxter Date: Tue, 29 Mar 2005 12:32:50 +0000 Subject: Move exception finalisation later in the shutdown process - this fixes the crash seen in bug #1165761 --- Misc/NEWS | 11 +++++++++++ Python/pythonrun.c | 15 ++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 41e91ae..7ecddce 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -4,6 +4,17 @@ Python News (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.4.1 final? +================================= + +*Release date: 30-MAR-2005* + +Core and builtins +----------------- + +- Move exception finalisation later in the shutdown process - this + fixes the crash seen in bug #1165761 + What's New in Python 2.4.1c2? ============================= diff --git a/Python/pythonrun.c b/Python/pythonrun.c index e9f4765..50bb20d 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -392,13 +392,6 @@ Py_Finalize(void) _Py_PrintReferences(stderr); #endif /* Py_TRACE_REFS */ - /* Now we decref the exception classes. After this point nothing - can raise an exception. That's okay, because each Fini() method - below has been checked to make sure no exceptions are ever - raised. - */ - _PyExc_Fini(); - /* Cleanup auto-thread-state */ #ifdef WITH_THREAD _PyGILState_Fini(); @@ -407,6 +400,14 @@ Py_Finalize(void) /* Clear interpreter state */ PyInterpreterState_Clear(interp); + /* Now we decref the exception classes. After this point nothing + can raise an exception. That's okay, because each Fini() method + below has been checked to make sure no exceptions are ever + raised. + */ + + _PyExc_Fini(); + /* Delete current thread */ PyThreadState_Swap(NULL); PyInterpreterState_Delete(interp); -- cgit v0.12